Mercurial > octave
changeset 25104:1fdd1b211ed4
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 03 Apr 2018 13:52:40 -0700 |
| parents | b8ffceb06354 (current diff) 078b795c5219 (diff) |
| children | 68039183fac4 |
| files | libinterp/corefcn/graphics.in.h |
| diffstat | 176 files changed, 1944 insertions(+), 1514 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/ButtonGroup.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/ButtonGroup.cc Tue Apr 03 13:52:40 2018 -0700 @@ -489,7 +489,7 @@ octave_value selectionChangedEventObject = octave_value (new octave_struct ( eventData)); gh_manager::post_callback (m_handle, "selectionchangedfcn", - selectionChangedEventObject); + selectionChangedEventObject); } }
--- a/libgui/graphics/Canvas.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/Canvas.cc Tue Apr 03 13:52:40 2018 -0700 @@ -996,7 +996,7 @@ && mode != "horizontal") ap.pan ("vertical", factor); else if (event->modifiers () == Qt::ShiftModifier - && mode != "vertical") + && mode != "vertical") ap.pan ("horizontal", factor); } break;
--- a/libgui/graphics/Figure.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/Figure.cc Tue Apr 03 13:52:40 2018 -0700 @@ -914,7 +914,7 @@ tr ("Octave Figure File (*.ofig);;Vector Image Formats (*.eps *.epsc *.pdf *.svg *.ps *.tikz);;Bitmap Image Formats (*.gif *.jpg *.png *.tiff)"), nullptr, QFileDialog::DontUseNativeDialog); - } + } if (! file.isEmpty ()) {
--- a/libgui/graphics/GLCanvas.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/GLCanvas.cc Tue Apr 03 13:52:40 2018 -0700 @@ -78,7 +78,7 @@ { uint8NDArray retval; graphics_object go = gh_manager::get_object (gh); - + if (go && go.isa ("figure")) { Matrix pos = go.get ("position").matrix_value (); @@ -94,15 +94,15 @@ || go.get ("__printing__").string_value () == "on") { OCTAVE_QT_OPENGL_FBO - fbo (pos(2), pos(3),OCTAVE_QT_OPENGL_FBO::Attachment::Depth); - + fbo (pos(2), pos(3),OCTAVE_QT_OPENGL_FBO::Attachment::Depth); + fbo.bind (); - + octave::opengl_renderer r; r.set_viewport (pos(2), pos(3)); r.draw (go); retval = r.get_pixels (pos(2), pos(3)); - + fbo.release (); } else @@ -110,7 +110,7 @@ octave::opengl_renderer r; r.set_viewport (pos(2), pos(3)); r.draw (go); - retval = r.get_pixels (pos(2), pos(3)); + retval = r.get_pixels (pos(2), pos(3)); } end_rendering (); @@ -118,7 +118,7 @@ return retval; } - + void GLCanvas::do_print (const QString& file_cmd, const QString& term, const graphics_handle& handle) @@ -134,7 +134,7 @@ // Make sure we have a valid current context if (! begin_rendering ()) error ("print: no valid OpenGL offscreen context"); - + octave::gl2ps_print (figObj, file_cmd.toStdString (), term.toStdString ()); } @@ -280,7 +280,7 @@ GLCanvas::begin_rendering (void) { bool retval = true; - + if (! isValid ()) { # if defined (HAVE_QT_OFFSCREEN) @@ -295,21 +295,21 @@ return false; } } - + retval = m_os_context.makeCurrent (&m_os_surface); -# else +# else retval = false; # endif } else makeCurrent (); - + return retval; } - + void GLCanvas::end_rendering (void) - { + { doneCurrent (); } }
--- a/libgui/graphics/GLCanvas.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/GLCanvas.h Tue Apr 03 13:52:40 2018 -0700 @@ -31,7 +31,7 @@ # if defined (HAVE_QT_OFFSCREEN) # include <QOpenGLContext> # include <QOffscreenSurface> -# endif +# endif #elif defined (HAVE_QGLWIDGET) # include <QGLWidget> # define OCTAVE_QT_OPENGL_WIDGET QGLWidget @@ -74,14 +74,14 @@ void wheelEvent (QWheelEvent *event); void keyPressEvent (QKeyEvent *event); void keyReleaseEvent (QKeyEvent *event); - + private: - + bool begin_rendering (void); void end_rendering (void); # if defined (HAVE_QT_OFFSCREEN) - QOpenGLContext m_os_context; + QOpenGLContext m_os_context; QOffscreenSurface m_os_surface; # endif };
--- a/libgui/graphics/ListBoxControl.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/ListBoxControl.cc Tue Apr 03 13:52:40 2018 -0700 @@ -118,7 +118,7 @@ connect (list, SIGNAL (activated (const QModelIndex &)), SLOT (itemActivated (const QModelIndex &))); connect (list, SIGNAL (itemPressed (QListWidgetItem*)), - SLOT (itemPressed (QListWidgetItem*))); + SLOT (itemPressed (QListWidgetItem*))); } ListBoxControl::~ListBoxControl (void) @@ -179,7 +179,7 @@ gh_manager::post_callback (m_handle, "callback"); } - m_selectionChanged = false; + m_selectionChanged = false; } void @@ -208,14 +208,14 @@ { switch (e->type ()) { - case QEvent::KeyRelease: - if (m_selectionChanged) - sendSelectionChange (); - m_selectionChanged = false; - break; + case QEvent::KeyRelease: + if (m_selectionChanged) + sendSelectionChange (); + m_selectionChanged = false; + break; - default: - break; + default: + break; } return Object::eventFilter (watched, e); @@ -228,41 +228,41 @@ switch (e->type ()) { - case QEvent::MouseButtonPress: - { - QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); + case QEvent::MouseButtonPress: + { + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - if (m->button () & Qt::RightButton) - override_return = true; - else - { - if (! list->indexAt (m->pos ()).isValid ()) - override_return = true; - m_selectionChanged = true; - } - break; - } - case QEvent::MouseButtonRelease: - { - QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); + if (m->button () & Qt::RightButton) + override_return = true; + else + { + if (! list->indexAt (m->pos ()).isValid ()) + override_return = true; + m_selectionChanged = true; + } + break; + } + case QEvent::MouseButtonRelease: + { + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - if (m->button () & Qt::RightButton) - override_return = true; + if (m->button () & Qt::RightButton) + override_return = true; - else if (! list->indexAt (m->pos ()).isValid ()) - { - list->setCurrentRow (list->count () - 1); - override_return = true; - } + else if (! list->indexAt (m->pos ()).isValid ()) + { + list->setCurrentRow (list->count () - 1); + override_return = true; + } - if (m_selectionChanged) - sendSelectionChange (); - m_selectionChanged = false; + if (m_selectionChanged) + sendSelectionChange (); + m_selectionChanged = false; - break; - } - default: break; + } + default: + break; } return BaseControl::eventFilter (watched, e) || override_return;
--- a/libgui/graphics/ObjectProxy.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/graphics/ObjectProxy.cc Tue Apr 03 13:52:40 2018 -0700 @@ -145,8 +145,8 @@ error ("getframe: unable to retrieve figure pixels"); } } - - return retval; - } + + return retval; + } };
--- a/libgui/qterminal/libqterminal/QTerminal.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/qterminal/libqterminal/QTerminal.h Tue Apr 03 13:52:40 2018 -0700 @@ -62,7 +62,7 @@ virtual void has_extra_interrupt (bool extra) = 0; virtual QList<QAction*> get_hotspot_actions (const QPoint&) - { return QList<QAction*> (); } + { return QList<QAction*> (); } enum CursorType { @@ -135,16 +135,16 @@ tr ("Copy"), this, SLOT (copyClipboard ())); _paste_action = _contextMenu->addAction ( - resource_manager::icon ("edit-paste"), + resource_manager::icon ("edit-paste"), tr ("Paste"), this, SLOT (pasteClipboard ())); _contextMenu->addSeparator (); _selectall_action = _contextMenu->addAction ( - tr ("Select All"), this, SLOT (selectAll ())); + tr ("Select All"), this, SLOT (selectAll ())); _edit_action = _contextMenu->addAction ( - tr (""), this, SLOT (edit_file ())); + tr (""), this, SLOT (edit_file ())); _contextMenu->addSeparator (); @@ -180,17 +180,17 @@ addAction (_interrupt_action); _interrupt_action->setShortcut ( - QKeySequence (Qt::ControlModifier + Qt::Key_C)); + QKeySequence (Qt::ControlModifier + Qt::Key_C)); connect (_interrupt_action, SIGNAL (triggered ()), - this, SLOT (terminal_interrupt ())); + this, SLOT (terminal_interrupt ())); // dummy (nop) action catching Ctrl-D in terminal, no connection _nop_action = new QAction (this); addAction (_nop_action); _nop_action->setShortcut ( - QKeySequence (Qt::ControlModifier + Qt::Key_D)); + QKeySequence (Qt::ControlModifier + Qt::Key_D)); } private:
--- a/libgui/src/dialog.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/dialog.cc Tue Apr 03 13:52:40 2018 -0700 @@ -261,7 +261,7 @@ #if RICH_TEXT prompt_string.append ("<br>"); #else - prompt_string.append ("\n"); + prompt_string.append ("\n"); #endif prompt_string.append (prompt.at (j)); }
--- a/libgui/src/documentation.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/documentation.cc Tue Apr 03 13:52:40 2018 -0700 @@ -57,16 +57,17 @@ QString collection = getenv ("OCTAVE_QTHELP_COLLECTION"); if (collection.isEmpty ()) collection = QString::fromStdString (octave::config::oct_doc_dir () - + octave::sys::file_ops::dir_sep_str () - + "octave_interpreter.qhc"); + + octave::sys::file_ops::dir_sep_str () + + "octave_interpreter.qhc"); // Setup the help engine with the original collection, use a writable copy // of the original collection and load the help data m_help_engine = new QHelpEngine (collection, this); - std::string tmpdir (octave::sys::env::getenv ("TMPDIR")); + QString tmpdir = QDir::tempPath(); m_collection - = QString::fromStdString (octave::sys::tempnam (tmpdir, "oct-qhelp-")); + = QString::fromStdString (octave::sys::tempnam (tmpdir.toStdString (), + "oct-qhelp-")); if (m_help_engine->copyCollectionFile (m_collection)) m_help_engine->setCollectionFile (m_collection); @@ -86,10 +87,9 @@ "documentation viewer. Only help texts in\n" "the Console Widget will be available.")); if (m_help_engine) - { - delete m_help_engine; - m_help_engine = 0; - } + delete m_help_engine; + m_help_engine = 0; + return; } // The browser @@ -142,7 +142,7 @@ connect(m_help_engine->indexWidget (), SIGNAL (linkActivated (const QUrl&, const QString&)), m_doc_browser, SLOT(handle_index_clicked (const QUrl&, - const QString&))); + const QString&))); connect (m_filter, SIGNAL (editTextChanged (const QString&)), this, SLOT(filter_update (const QString&))); @@ -187,11 +187,12 @@ documentation::~documentation (void) { if (m_help_engine) - { - delete m_help_engine; + delete m_help_engine; - // Cleanup temporary file and directory - QFile file (m_collection); + // Cleanup temporary file and directory + QFile file (m_collection); + if (file.exists ()) + { QFileInfo finfo (file); QString bname = finfo.fileName (); QDir dir = finfo.absoluteDir (); @@ -256,7 +257,7 @@ return; QString wildcard; - if (expression.contains(QLatin1Char('*'))) + if (expression.contains (QLatin1Char('*'))) wildcard = expression; m_help_engine->indexWidget ()->filterIndices(expression, wildcard); @@ -334,13 +335,12 @@ void documentation_browser::notice_settings (const QSettings *) { } - QVariant documentation_browser::loadResource (int type, - const QUrl &url) - { - if (url.scheme () == "qthelp") - return QVariant (m_help_engine->fileData(url)); - else - return QTextBrowser::loadResource(type, url); - } + QVariant documentation_browser::loadResource (int type, const QUrl &url) + { + if (url.scheme () == "qthelp") + return QVariant (m_help_engine->fileData(url)); + else + return QTextBrowser::loadResource(type, url); + } }
--- a/libgui/src/files-dock-widget.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/files-dock-widget.cc Tue Apr 03 13:52:40 2018 -0700 @@ -97,7 +97,8 @@ main_win (), SLOT (open_file (const QString&))); connect (this, SIGNAL (displayed_directory_changed (const QString&)), - main_win (), SLOT (set_current_working_directory (const QString&))); + main_win (), + SLOT (set_current_working_directory (const QString&))); // Create a toolbar m_navigation_tool_bar = new QToolBar ("", container); @@ -833,11 +834,11 @@ void files_dock_widget::popdownmenu_search_dir (bool) { - QString dir = QFileDialog::getExistingDirectory - (this, tr ("Set directory of file browser"), - m_file_system_model->rootPath (), - QFileDialog::ShowDirsOnly - | QFileDialog::DontUseNativeDialog); + QString dir = QFileDialog::getExistingDirectory (this, + tr ("Set directory of file browser"), + m_file_system_model->rootPath (), + QFileDialog::ShowDirsOnly + | QFileDialog::DontUseNativeDialog); set_current_directory (dir); } @@ -862,7 +863,8 @@ QString name = QInputDialog::getText (this, tr ("Create File"), tr ("Create file in\n","String ends with \\n!") + parent_dir, - QLineEdit::Normal, tr ("New File.txt"), &ok); + QLineEdit::Normal, + tr ("New File.txt"), &ok); if (ok && name.length () > 0) { name = parent_dir + '/' + name; @@ -879,7 +881,8 @@ QString name = QInputDialog::getText (this, tr ("Create Directory"), tr ("Create folder in\n","String ends with \\n!") + parent_dir, - QLineEdit::Normal, tr ("New Directory"), &ok); + QLineEdit::Normal, + tr ("New Directory"), &ok); if (ok && name.length () > 0) { QDir dir (parent_dir);
--- a/libgui/src/history-dock-widget.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/history-dock-widget.cc Tue Apr 03 13:52:40 2018 -0700 @@ -273,7 +273,7 @@ m_history_list_view->setAlternatingRowColors (true); m_history_list_view->setEditTriggers (QAbstractItemView::NoEditTriggers); m_history_list_view->setStatusTip ( - tr ("Double-click a command to transfer it to the terminal.")); + tr ("Double-click a command to transfer it to the terminal.")); m_history_list_view->setSelectionMode (QAbstractItemView::ExtendedSelection); m_history_list_view->setContextMenuPolicy (Qt::CustomContextMenu); connect (m_history_list_view, @@ -286,7 +286,7 @@ m_filter->setMaxCount (MaxFilterHistory); m_filter->setInsertPolicy (QComboBox::NoInsert); m_filter->setSizeAdjustPolicy ( - QComboBox::AdjustToMinimumContentsLengthWithIcon); + QComboBox::AdjustToMinimumContentsLengthWithIcon); QSizePolicy sizePol (QSizePolicy::Expanding, QSizePolicy::Preferred); m_filter->setSizePolicy (sizePol); m_filter->completer ()->setCaseSensitivity (Qt::CaseSensitive); @@ -321,7 +321,8 @@ = settings->value ("history_dock_widget/filter_shown",true).toBool (); m_filter_widget->setVisible (m_filter_shown); - m_filter->addItems (settings->value ("history_dock_widget/mru_list").toStringList ()); + m_filter->addItems ( + settings->value ("history_dock_widget/mru_list").toStringList ()); bool filter_state = settings->value ("history_dock_widget/filter_active", false).toBool ();
--- a/libgui/src/m-editor/file-editor-tab.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Tue Apr 03 13:52:40 2018 -0700 @@ -230,10 +230,10 @@ // encoding, not updated with the settings #if defined (Q_OS_WIN32) _encoding = settings->value ("editor/default_encoding", "SYSTEM") - .toString (); + .toString (); #else _encoding = settings->value ("editor/default_encoding", "UTF-8") - .toString (); + .toString (); #endif _enc_indicator->setText (_encoding); // no changes in encoding yet @@ -639,18 +639,18 @@ #if defined (HAVE_QSTANDARDPATHS) QString prep_apis_path = QStandardPaths::writableLocation (QStandardPaths::HomeLocation) - + "/.config/octave/" + QString (OCTAVE_VERSION) + "/qsci/"; + + "/.config/octave/" + QString (OCTAVE_VERSION) + "/qsci/"; #else QString prep_apis_path = QDesktopServices::storageLocation (QDesktopServices::HomeLocation) - + "/.config/octave/" + QString (OCTAVE_VERSION) + "/qsci/"; + + "/.config/octave/" + QString (OCTAVE_VERSION) + "/qsci/"; #endif // get settings which infos are used for octave bool octave_builtins = settings->value ( - "editor/codeCompletion_octave_builtins", true).toBool (); + "editor/codeCompletion_octave_builtins", true).toBool (); bool octave_functions = settings->value ( - "editor/codeCompletion_octave_functions", true).toBool (); + "editor/codeCompletion_octave_functions", true).toBool (); if (_is_octave_file) { @@ -714,7 +714,7 @@ interpreter& interp = __get_interpreter__ ( - "file_editor_tab::update_lexer_settings"); + "file_editor_tab::update_lexer_settings"); if (octave_builtins) add_octave_apis (F__builtins__ (interp)); // add new entries @@ -799,7 +799,7 @@ QFont line_numbers_font = lexer->defaultFont (); int font_size = line_numbers_font.pointSize (); font_size = font_size - + settings->value ("editor/line_numbers_size", 0).toInt (); + + settings->value ("editor/line_numbers_size", 0).toInt (); if (font_size < 4) font_size = 4; line_numbers_font.setPointSize (font_size); @@ -1441,10 +1441,10 @@ QSettings *settings = resource_manager::get_settings (); used_comment_str = QInputDialog::getText ( - this, tr ("Comment selected text"), - tr ("Comment string to use:\n"), QLineEdit::Normal, - settings->value (oct_last_comment_str, comment_str.at (0)).toString (), - &ok); + this, tr ("Comment selected text"), + tr ("Comment string to use:\n"), QLineEdit::Normal, + settings->value (oct_last_comment_str, comment_str.at (0)).toString (), + &ok); if ((! ok) || used_comment_str.isEmpty ()) return; // No input, do nothing @@ -1624,8 +1624,8 @@ // editor tab can't be made parent because it may be deleted depending // upon the response. Instead, change the _edit_area to read only. QMessageBox::StandardButtons buttons = QMessageBox::Save | - QMessageBox::Discard | - QMessageBox::Cancel; + QMessageBox::Discard | + QMessageBox::Cancel; // For now, just a warning message about closing a tab that has been // modified seems sufficient. Exit-condition-specific messages could @@ -1800,7 +1800,7 @@ #endif QSettings *settings = resource_manager::get_settings (); QsciScintilla::EolMode eol_mode = static_cast<QsciScintilla::EolMode> ( - settings->value ("editor/default_eol_mode",os_eol_mode).toInt ()); + settings->value ("editor/default_eol_mode",os_eol_mode).toInt ()); int count_max = 0; @@ -1882,8 +1882,8 @@ int eol_mode = QsciScintilla::EolUnix; #endif _edit_area->setEolMode ( - static_cast<QsciScintilla::EolMode> ( - settings->value ("editor/default_eol_mode",eol_mode).toInt ())); + static_cast<QsciScintilla::EolMode> ( + settings->value ("editor/default_eol_mode",eol_mode).toInt ())); update_eol_indicator (); @@ -2151,7 +2151,8 @@ fileDialog->selectFile (_file_name); QFileInfo file_info (_file_name); if (file_info.suffix () != "m") - { // it is not an octave file + { + // it is not an octave file fileDialog->selectNameFilter (filters.at (1)); // "All Files" fileDialog->setDefaultSuffix (""); // no default suffix } @@ -2424,9 +2425,9 @@ (settings->value ("editor/highlightCurrentLine", true).toBool ()); bool match_keywords = settings->value - ("editor/codeCompletion_keywords",true).toBool (); + ("editor/codeCompletion_keywords",true).toBool (); bool match_document = settings->value - ("editor/codeCompletion_document",true).toBool (); + ("editor/codeCompletion_document",true).toBool (); QsciScintilla::AutoCompletionSource source = QsciScintilla::AcsNone; if (match_keywords) @@ -2739,7 +2740,8 @@ if (bp != nullptr) { if ((cond == "") != (bp->get_cond () == "")) - { // can only reuse conditional bp as conditional + { + // can only reuse conditional bp as conditional emit remove_breakpoint_via_debugger_linenr (line); bp = nullptr; } @@ -2949,7 +2951,7 @@ #if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif - ); + ); // loop over all occurrences and set the related indicator int oline, ocol;
--- a/libgui/src/m-editor/file-editor.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/m-editor/file-editor.h Tue Apr 03 13:52:40 2018 -0700 @@ -100,16 +100,16 @@ void insert_global_actions (QList<QAction*>); enum shared_actions_idx - { - NEW_SCRIPT_ACTION = 0, - NEW_FUNCTION_ACTION, - OPEN_ACTION, - FIND_FILES_ACTION, - UNDO_ACTION, - COPY_ACTION, - PASTE_ACTION, - SELECTALL_ACTION - }; + { + NEW_SCRIPT_ACTION = 0, + NEW_FUNCTION_ACTION, + OPEN_ACTION, + FIND_FILES_ACTION, + UNDO_ACTION, + COPY_ACTION, + PASTE_ACTION, + SELECTALL_ACTION + }; void handle_enter_debug_mode (void); void handle_exit_debug_mode (void);
--- a/libgui/src/m-editor/find-dialog.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/m-editor/find-dialog.cc Tue Apr 03 13:52:40 2018 -0700 @@ -346,7 +346,7 @@ #if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif - ); + ); #endif } else @@ -363,7 +363,7 @@ #if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif - ); + ); } }
--- a/libgui/src/m-editor/marker.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/m-editor/marker.h Tue Apr 03 13:52:40 2018 -0700 @@ -47,15 +47,15 @@ // If multiple markers are on the same line, the first one listed // is drawn at the back, so big ones should be first. enum editor_markers - { - breakpoint, - cond_break, - unsure_breakpoint, - bookmark, - debugger_position, - unsure_debugger_position, - selection - }; + { + breakpoint, + cond_break, + unsure_breakpoint, + bookmark, + debugger_position, + unsure_debugger_position, + selection + }; marker (QsciScintilla *edit_area, int original_linenr, editor_markers marker_type, const QString& condition = "");
--- a/libgui/src/m-editor/octave-qscintilla.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Tue Apr 03 13:52:40 2018 -0700 @@ -332,10 +332,8 @@ QPoint *local_pos) { long position = SendScintilla (SCI_GETCURRENTPOS); - long point_x = SendScintilla - (SCI_POINTXFROMPOSITION,0,position); - long point_y = SendScintilla - (SCI_POINTYFROMPOSITION,0,position); + long point_x = SendScintilla (SCI_POINTXFROMPOSITION,0,position); + long point_y = SendScintilla (SCI_POINTYFROMPOSITION,0,position); *local_pos = QPoint (point_x,point_y); // local cursor position *global_pos = mapToGlobal (*local_pos); // global position of cursor } @@ -391,10 +389,12 @@ if (comment) { // The commenting string is requested - if (settings->contains (oct_comment_str)) // new version (radio buttons) + if (settings->contains (oct_comment_str)) + // new version (radio buttons) comment_string = settings->value (oct_comment_str, oct_comment_str_d).toInt (); - else // old version (combo box) + else + // old version (combo box) comment_string = settings->value (oct_comment_str_old, oct_comment_str_d).toInt (); @@ -807,7 +807,7 @@ #if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif - ); + ); while (find_result_available) { @@ -832,7 +832,7 @@ #if defined (HAVE_QSCI_VERSION_2_6_0) , true #endif - ); + ); } // restore the visible area of the file, the cursor position,
--- a/libgui/src/m-editor/octave-qscintilla.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.h Tue Apr 03 13:52:40 2018 -0700 @@ -45,11 +45,11 @@ ~octave_qscintilla (void) = default; enum - { - ST_NONE = 0, - ST_LINE_COMMENT, - ST_BLOCK_COMMENT - }; + { + ST_NONE = 0, + ST_LINE_COMMENT, + ST_BLOCK_COMMENT + }; virtual void contextMenuEvent (QContextMenuEvent *e);
--- a/libgui/src/main-window.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/main-window.cc Tue Apr 03 13:52:40 2018 -0700 @@ -984,7 +984,7 @@ QSettings *settings = resource_manager::get_settings (); bool is_internal = m_editor_window - && ! settings->value ("useCustomFileEditor",false).toBool (); + && ! settings->value ("useCustomFileEditor",false).toBool (); // Create a NonModal message. QWidget *p = this;
--- a/libgui/src/qtinfo/webinfo.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/qtinfo/webinfo.cc Tue Apr 03 13:52:40 2018 -0700 @@ -82,7 +82,7 @@ _search_line_edit = new QLineEdit (this); #if defined (HAVE_QLINEEDIT_SETPLACEHOLDERTEXT) _search_line_edit->setPlaceholderText ( - tr ("Type here and press \'Return\' to search")); + tr ("Type here and press \'Return\' to search")); #endif hbox_layout->addWidget (_search_line_edit); @@ -101,7 +101,7 @@ connect (_tab_bar, SIGNAL (close_current_tab_signal (bool)), this, SLOT (request_close_tab (bool))); connect (_tab_bar, SIGNAL (tabCloseRequested (int)), - this, SLOT (close_tab (int))); + this, SLOT (close_tab (int))); connect (_tab_bar, SIGNAL (currentChanged (int)), this, SLOT (current_tab_changed (int))); connect (_zoom_in_button, SIGNAL (clicked ()), this, SLOT (zoom_in ())); @@ -140,11 +140,11 @@ connect (a, SIGNAL (triggered ()), receiver, member); } - addAction (a); // important for shortcut context - a->setShortcutContext (Qt::WidgetWithChildrenShortcut); + addAction (a); // important for shortcut context + a->setShortcutContext (Qt::WidgetWithChildrenShortcut); - return a; - } + return a; + } // Slot for the close tab action void webinfo::request_close_tab (bool)
--- a/libgui/src/resource-manager.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/resource-manager.h Tue Apr 03 13:52:40 2018 -0700 @@ -38,7 +38,7 @@ protected: - public: + public: resource_manager (void);
--- a/libgui/src/settings-dialog.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/settings-dialog.cc Tue Apr 03 13:52:40 2018 -0700 @@ -82,7 +82,8 @@ } static void -read_lexer_settings (Ui::settings_dialog *ui, QsciLexer *lexer, QSettings *settings) +read_lexer_settings (Ui::settings_dialog *ui, QsciLexer *lexer, + QSettings *settings) { lexer->readSettings (*settings); int styles[MaxLexerStyles]; // array for saving valid styles @@ -175,10 +176,11 @@ } static void -write_lexer_settings (Ui::settings_dialog *ui, QsciLexer *lexer, QSettings *settings) +write_lexer_settings (Ui::settings_dialog *ui, QsciLexer *lexer, + QSettings *settings) { QWidget *tab = ui->tabs_editor_lexers-> - findChild <QWidget *> (QString (lexer->language ()) + "_styles"); + findChild <QWidget *> (QString (lexer->language ()) + "_styles"); int styles[MaxLexerStyles]; // array for saving valid styles // (enum is not continuous) int max_style = get_valid_lexer_styles (lexer, styles); @@ -252,7 +254,8 @@ lexer->writeSettings (*settings); - settings->setValue ("settings/last_editor_styles_tab", ui->tabs_editor_lexers->currentIndex ()); + settings->setValue ("settings/last_editor_styles_tab", + ui->tabs_editor_lexers->currentIndex ()); settings->sync (); }
--- a/libgui/src/shortcut-manager.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/shortcut-manager.cc Tue Apr 03 13:52:40 2018 -0700 @@ -644,7 +644,7 @@ if (! osc_settings) { qWarning () << tr ("Failed to open %1 as octave shortcut file") - .arg (file); + .arg (file); return false; } else
--- a/libgui/src/shortcut-manager.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/shortcut-manager.h Tue Apr 03 13:52:40 2018 -0700 @@ -61,11 +61,11 @@ public: enum - { - OSC_IMPORT = 0, - OSC_EXPORT = 1, - OSC_DEFAULT = 2 - }; + { + OSC_IMPORT = 0, + OSC_EXPORT = 1, + OSC_DEFAULT = 2 + }; shortcut_manager (void);
--- a/libgui/src/variable-editor.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/variable-editor.cc Tue Apr 03 13:52:40 2018 -0700 @@ -480,7 +480,8 @@ } void - variable_editor_view::add_edit_actions (QMenu *menu, const QString& qualifier_string) + variable_editor_view::add_edit_actions (QMenu *menu, + const QString& qualifier_string) { menu->addAction (resource_manager::icon ("edit-cut"), tr ("Cut") + qualifier_string, @@ -1036,7 +1037,8 @@ // Add an action to a menu or the widget itself. QAction* - variable_editor::add_action (QMenu *menu, const QIcon& icon, const QString& text, + variable_editor::add_action (QMenu *menu, const QIcon& icon, + const QString& text, const char *member) { QAction *a; @@ -1403,19 +1405,19 @@ if (m_table_colors.length () > 0) m_stylesheet += "QTableView::item{ foreground-color: " - + m_table_colors[0].name () +" }"; + + m_table_colors[0].name () +" }"; if (m_table_colors.length () > 1) m_stylesheet += "QTableView::item{ background-color: " - + m_table_colors[1].name () +" }"; + + m_table_colors[1].name () +" }"; if (m_table_colors.length () > 2) m_stylesheet += "QTableView::item{ selection-color: " - + m_table_colors[2].name () +" }"; + + m_table_colors[2].name () +" }"; if (m_table_colors.length () > 3) m_stylesheet += "QTableView::item:selected{ background-color: " - + m_table_colors[3].name () +" }"; + + m_table_colors[3].name () +" }"; if (m_table_colors.length () > 4 && m_alternate_rows) {
--- a/libgui/src/workspace-view.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libgui/src/workspace-view.cc Tue Apr 03 13:52:40 2018 -0700 @@ -110,7 +110,8 @@ //enable sorting (setting column and order after model was set) m_view->setSortingEnabled (true); // Initialize column order and width of the workspace - m_view->horizontalHeader ()->restoreState (settings->value ("workspaceview/column_state").toByteArray ()); + m_view->horizontalHeader ()->restoreState ( + settings->value ("workspaceview/column_state").toByteArray ()); // Set header properties for sorting #if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE)
--- a/libinterp/build-env.in.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/build-env.in.cc Tue Apr 03 13:52:40 2018 -0700 @@ -289,9 +289,11 @@ const char *SUNDIALS_IDA_LIBS = %OCTAVE_CONF_SUNDIALS_IDA_LIBS%; - const char *SUNDIALS_NVECSERIAL_CPPFLAGS = %OCTAVE_CONF_SUNDIALS_NVECSERIAL_CPPFLAGS%; + const char *SUNDIALS_NVECSERIAL_CPPFLAGS = + %OCTAVE_CONF_SUNDIALS_NVECSERIAL_CPPFLAGS%; - const char *SUNDIALS_NVECSERIAL_LDFLAGS = %OCTAVE_CONF_SUNDIALS_NVECSERIAL_LDFLAGS%; + const char *SUNDIALS_NVECSERIAL_LDFLAGS = + %OCTAVE_CONF_SUNDIALS_NVECSERIAL_LDFLAGS%; const char *SUNDIALS_NVECSERIAL_LIBS = %OCTAVE_CONF_SUNDIALS_NVECSERIAL_LIBS%;
--- a/libinterp/corefcn/__ilu__.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/__ilu__.cc Tue Apr 03 13:52:40 2018 -0700 @@ -171,7 +171,7 @@ ilu_0 <SparseComplexMatrix, Complex> (sm, milu); retval(0) = speye + - Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value (); + Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value (); retval(1) = Ftriu (ovl (sm))(0).sparse_complex_matrix_value (); }
--- a/libinterp/corefcn/cellfun.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/cellfun.cc Tue Apr 03 13:52:40 2018 -0700 @@ -219,7 +219,8 @@ } static void -get_mapper_fun_options (octave::symbol_table& symtab, const octave_value_list& args, +get_mapper_fun_options (octave::symbol_table& symtab, + const octave_value_list& args, int& nargin, bool& uniform_output, octave_value& error_handler) { @@ -499,7 +500,7 @@ } } - nevermind: +nevermind: // Extract cell arguments. @@ -2204,8 +2205,8 @@ octave_idx_type n = lb.numel (); Cell retval (1, n); if (array.isvector () && (dim == -1 - || (dim == 0 && array.columns () == 1) - || (dim == 1 && array.rows () == 1))) + || (dim == 0 && array.columns () == 1) + || (dim == 1 && array.rows () == 1))) { for (octave_idx_type i = 0; i < n; i++) retval(i) = array.index (idx_vector (lb(i) - 1, ub(i)));
--- a/libinterp/corefcn/data.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/data.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1625,7 +1625,8 @@ std::string cname = ov.class_name (); - octave::symbol_table& symtab = octave::__get_symbol_table__ ("attempt_type_conversion"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("attempt_type_conversion"); octave_value fcn = symtab.find_method (dtype, cname);
--- a/libinterp/corefcn/dirfns.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/dirfns.cc Tue Apr 03 13:52:40 2018 -0700 @@ -83,7 +83,8 @@ // FIXME: should these actions be handled as a list of functions // to call so users can add their own chdir handlers? - octave::load_path& lp = octave::__get_load_path__ ("octave_change_to_directory"); + octave::load_path& lp = + octave::__get_load_path__ ("octave_change_to_directory"); lp.update ();
--- a/libinterp/corefcn/dynamic-ld.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/dynamic-ld.h Tue Apr 03 13:52:40 2018 -0700 @@ -99,10 +99,10 @@ bool relative = false); bool remove_oct (const std::string& fcn_name, - dynamic_library& shl); + dynamic_library& shl); bool remove_mex (const std::string& fcn_name, - dynamic_library& shl); + dynamic_library& shl); private:
--- a/libinterp/corefcn/environment.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/environment.cc Tue Apr 03 13:52:40 2018 -0700 @@ -58,9 +58,9 @@ // FIXME: should we search for the elements individually, and // only append those that are missing? - std::string path_sep = octave::directory_path::path_sep_str (); + std::string path_sep = octave::directory_path::path_sep_str (); - if (shell_path.find (exec_path) == std::string::npos) + if (shell_path.find (exec_path) == std::string::npos) octave::sys::env::putenv ("PATH", shell_path + path_sep + exec_path); } }
--- a/libinterp/corefcn/error.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/error.cc Tue Apr 03 13:52:40 2018 -0700 @@ -334,7 +334,7 @@ frames.push_back (frame); } - pr_where (os, who, frames); + pr_where (os, who, frames); } octave::execution_exception
--- a/libinterp/corefcn/fcn-info.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/fcn-info.cc Tue Apr 03 13:52:40 2018 -0700 @@ -98,7 +98,7 @@ { octave_value ov_fcn = load_fcn_from_file (file_name, dir_name, name, - package_name); + package_name); if (ov_fcn.is_defined ()) { @@ -171,7 +171,7 @@ { octave_value ov_fcn = load_fcn_from_file (file_name, dir_name, - dispatch_type); + dispatch_type); if (ov_fcn.is_defined ()) { @@ -592,7 +592,8 @@ symbol_scope curr_scope = __get_current_scope__ ("fcn_info::fcn_info_rep::x_builtin_find"); - octave_user_function *current_fcn = curr_scope ? curr_scope.function () : nullptr; + octave_user_function *current_fcn = curr_scope ? curr_scope.function () + : nullptr; if (current_fcn) { @@ -719,8 +720,7 @@ std::string dir_name = file_name.substr (0, pos); octave_value ov_fcn - = load_fcn_from_file (file_name, dir_name, "", "", - name, true); + = load_fcn_from_file (file_name, dir_name, "", "", name, true); if (ov_fcn.is_defined ()) autoload_function = octave_value (ov_fcn); @@ -742,16 +742,16 @@ { std::string dir_name; - load_path& lp = __get_load_path__ ("fcn_info::fcn_info_rep::find_user_function"); + load_path& lp = + __get_load_path__ ("fcn_info::fcn_info_rep::find_user_function"); std::string file_name = lp.find_fcn (name, dir_name, package_name); if (! file_name.empty ()) { - octave_value ov_fcn - = load_fcn_from_file (file_name, dir_name, "", - package_name); + octave_value ov_fcn = + load_fcn_from_file (file_name, dir_name, "", package_name); if (ov_fcn.is_defined ()) function_on_path = ov_fcn;
--- a/libinterp/corefcn/gl-render.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/gl-render.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1066,8 +1066,8 @@ #else - // This shouldn't happen because construction of opengl_renderer - // objects is supposed to be impossible if OpenGL is not available. + // This shouldn't happen because construction of opengl_renderer + // objects is supposed to be impossible if OpenGL is not available. octave_unused_parameter (width); octave_unused_parameter (height); @@ -1217,9 +1217,9 @@ bool layer2Dtop = props.get_layer2Dtop (); bool is2d = props.get_is2D (); bool isXOrigin = props.xaxislocation_is ("origin") - && ! props.yscale_is ("log"); + && ! props.yscale_is ("log"); bool isYOrigin = props.yaxislocation_is ("origin") - && ! props.xscale_is ("log"); + && ! props.xscale_is ("log"); bool boxFull = (props.get_boxstyle () == "full"); double linewidth = props.get_linewidth (); double xPlane = props.get_xPlane (); @@ -1448,8 +1448,7 @@ double y_axis_pos = 0.; if (is_origin) { - y_axis_pos = math::max (math::min (0., y_max), - y_min); + y_axis_pos = math::max (math::min (0., y_max), y_min); glBegin (GL_LINES); set_color (props.get_ycolor_rgb ()); glVertex3d (x_min, y_axis_pos, zpTick); @@ -1632,8 +1631,7 @@ double x_axis_pos = 0.; if (is_origin) { - x_axis_pos = math::max (math::min (0., x_max), - x_min); + x_axis_pos = math::max (math::min (0., x_max), x_min); glBegin (GL_LINES); set_color (props.get_ycolor_rgb ()); glVertex3d (x_axis_pos, y_min, zpTick);
--- a/libinterp/corefcn/gl2ps-print.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/gl2ps-print.cc Tue Apr 03 13:52:40 2018 -0700 @@ -208,18 +208,18 @@ } void set_linecap (const std::string& s) - { - opengl_renderer::set_linejoin (s); + { + opengl_renderer::set_linejoin (s); #if defined (HAVE_GL2PSLINEJOIN) - if (s == "butt") - gl2psLineCap (GL2PS_LINE_CAP_BUTT); - else if (s == "square") - gl2psLineCap (GL2PS_LINE_CAP_SQUARE); - else if (s == "round") - gl2psLineCap (GL2PS_LINE_CAP_ROUND); + if (s == "butt") + gl2psLineCap (GL2PS_LINE_CAP_BUTT); + else if (s == "square") + gl2psLineCap (GL2PS_LINE_CAP_SQUARE); + else if (s == "round") + gl2psLineCap (GL2PS_LINE_CAP_ROUND); #endif - } + } void set_linejoin (const std::string& s) {
--- a/libinterp/corefcn/graphics.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/graphics.cc Tue Apr 03 13:52:40 2018 -0700 @@ -2778,7 +2778,7 @@ octave_value val = xget (0, "currentfigure"); return val.isempty () ? octave::numeric_limits<double>::NaN () - : val.double_value (); + : val.double_value (); } // This function is NOT equivalent to the scripting language function gca. @@ -2788,7 +2788,7 @@ octave_value val = xget (gcf (), "currentaxes"); return val.isempty () ? octave::numeric_limits<double>::NaN () - : val.double_value (); + : val.double_value (); } static void @@ -4836,7 +4836,7 @@ xset (title.handle_value (), "__autopos_tag__", "title"); double fs = labelfontsizemultiplier.double_value () * - fontsize.double_value (); + fontsize.double_value (); xset (xlabel.handle_value (), "fontsize", octave_value (fs)); xset (ylabel.handle_value (), "fontsize", octave_value (fs)); xset (zlabel.handle_value (), "fontsize", octave_value (fs)); @@ -6871,17 +6871,17 @@ parent_bb)), false); outerposition.set (octave_value (convert_position (get_outerposition ().matrix_value (), - old_units, new_units, - parent_bb)), - false); + old_units, new_units, + parent_bb)), + false); tightinset.set (octave_value (convert_position (get_tightinset ().matrix_value (), - old_units, new_units, - parent_bb)), - false); + old_units, new_units, + parent_bb)), + false); looseinset.set (octave_value (convert_position (get_looseinset ().matrix_value (), - old_units, new_units, - parent_bb)), - false); + old_units, new_units, + parent_bb)), + false); } void @@ -7455,7 +7455,7 @@ tmp_lims(0) = std::pow (10., lo); if (is_negative) { - double tmp = tmp_lims(0); + double tmp = tmp_lims(0); tmp_lims(0) = -tmp_lims(1); tmp_lims(1) = -tmp; } @@ -9518,7 +9518,7 @@ if (style_is ("listbox") || style_is ("popupmenu")) { Matrix v = value.get ().matrix_value (); - if(v.numel () == 1 && v (0) == 0) + if (v.numel () == 1 && v (0) == 0) value.set (octave_value (1)); } }
--- a/libinterp/corefcn/graphics.in.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/graphics.in.h Tue Apr 03 13:52:40 2018 -0700 @@ -1238,22 +1238,22 @@ get_name ().c_str (), maxval.first); } - if (finite_constraint == NO_CHECK) { /* do nothing */ } - else if (finite_constraint == FINITE) - { - if (! octave::math::isfinite (new_val)) - error (R"(set: "%s" must be finite)", get_name ().c_str ()); - } - else if (finite_constraint == NOT_NAN) - { - if (octave::math::isnan (new_val)) - error (R"(set: "%s" must not be nan)", get_name ().c_str ()); - } - else if (finite_constraint == NOT_INF) - { - if (octave::math::isinf (new_val)) - error (R"(set: "%s" must not be infinite)", get_name ().c_str ()); - } + if (finite_constraint == NO_CHECK) { /* do nothing */ } + else if (finite_constraint == FINITE) + { + if (! octave::math::isfinite (new_val)) + error (R"(set: "%s" must be finite)", get_name ().c_str ()); + } + else if (finite_constraint == NOT_NAN) + { + if (octave::math::isnan (new_val)) + error (R"(set: "%s" must not be nan)", get_name ().c_str ()); + } + else if (finite_constraint == NOT_INF) + { + if (octave::math::isinf (new_val)) + error (R"(set: "%s" must not be infinite)", get_name ().c_str ()); + } if (new_val != current_val) { @@ -2381,7 +2381,7 @@ graphics_handle __myhandle__ fhrs , mh END_PROPERTIES - virtual void update_handlevisibility (void); + virtual void update_handlevisibility (void); protected: struct cmp_caseless_str @@ -4317,10 +4317,10 @@ protected: void init (void) - { - linewidth.add_constraint ("min", 0, false); - markersize.add_constraint ("min", 0, false); - } + { + linewidth.add_constraint ("min", 0, false); + markersize.add_constraint ("min", 0, false); + } private: Matrix compute_xlim (void) const;
--- a/libinterp/corefcn/help.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/help.cc Tue Apr 03 13:52:40 2018 -0700 @@ -537,8 +537,8 @@ w = fcn->fcn_file_name (); if (w.empty ()) - w = fcn->is_user_function () - ? "command-line function" : "built-in function"; + w = fcn->is_user_function () ? "command-line function" + : "built-in function"; } }
--- a/libinterp/corefcn/interpreter.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/interpreter.cc Tue Apr 03 13:52:40 2018 -0700 @@ -946,9 +946,8 @@ // The big loop. - lexer *lxr = (application::interactive () - ? new lexer () - : new lexer (stdin)); + lexer *lxr = (application::interactive () ? new lexer () + : new lexer (stdin)); parser parser (*lxr);
--- a/libinterp/corefcn/load-path.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/load-path.cc Tue Apr 03 13:52:40 2018 -0700 @@ -708,7 +708,7 @@ { if (all_files[i] == rel_flist[j]) retlist.push_back (sys::file_ops::concat (di.dir_name, - rel_flist[j])); + rel_flist[j])); } } } @@ -1858,7 +1858,8 @@ } void - load_path::package_info::move_method_map (const std::string& dir_name, bool at_end) + load_path::package_info::move_method_map (const std::string& dir_name, + bool at_end) { for (auto& cls_fnmap : method_map) { @@ -2266,7 +2267,7 @@ // ~/.octaverc file DEFMETHOD (__pathorig__, interp, , , - doc: /* -*- texinfo -*- + doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} __pathorig__ () Undocumented internal function. @end deftypefn */)
--- a/libinterp/corefcn/load-save.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/load-save.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1333,7 +1333,8 @@ { write_header (os, fmt); - octave::symbol_table& symtab = octave::__get_symbol_table__ ("dump_octave_core"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("dump_octave_core"); octave::symbol_scope top_scope = symtab.top_scope ();
--- a/libinterp/corefcn/ls-mat5.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/ls-mat5.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1113,6 +1113,7 @@ } } // Fall-through + case MAT_FILE_STRUCT_CLASS: { octave_map m (dims);
--- a/libinterp/corefcn/mex.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/mex.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1133,8 +1133,8 @@ : mxArray_matlab (mxCHAR_CLASS, str ? (strlen (str) ? 1 : 0) : 0, str ? strlen (str) : 0), - pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), - pi (nullptr) + pr (mxArray::calloc (get_number_of_elements (), get_element_size ())), + pi (nullptr) { mxChar *cpr = static_cast<mxChar *> (pr); mwSize nel = get_number_of_elements ();
--- a/libinterp/corefcn/oct-stream.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/oct-stream.cc Tue Apr 03 13:52:40 2018 -0700 @@ -225,11 +225,11 @@ public: enum special_conversion - { - whitespace_conversion = 1, - literal_conversion = 2, - null = 3 - }; + { + whitespace_conversion = 1, + literal_conversion = 2, + null = 3 + }; scanf_format_elt (const std::string& txt = "", int w = 0, bool d = false, char typ = '\0', char mod = '\0', @@ -1344,7 +1344,7 @@ delimited_stream::delimited_stream (std::istream& is, const delimited_stream& ds) : delimited_stream (is, ds.delims, ds.longest, ds.bufsize) - {} + { } delimited_stream::~delimited_stream (void) { @@ -1583,10 +1583,10 @@ public: enum special_conversion - { - whitespace_conversion = 1, - literal_conversion = 2 - }; + { + whitespace_conversion = 1, + literal_conversion = 2 + }; textscan_format_elt (const std::string& txt, int w = 0, int p = -1, int bw = 0, bool dis = false, char typ = '\0', @@ -3074,7 +3074,7 @@ if (last != std::istream::traits_type::eof ()) { if (last == eol1 || last == eol2) - break; + break; retval = retval + static_cast<char> (last); for (int i = 0; i < delimiters.numel (); i++) @@ -6588,10 +6588,10 @@ input_buf_elts = block_size; octave_idx_type input_elt_size - = oct_data_conv::data_type_size (input_type); - - ptrdiff_t input_buf_size - = static_cast<ptrdiff_t> (input_buf_elts) * input_elt_size; + = oct_data_conv::data_type_size (input_type); + + ptrdiff_t input_buf_size = + static_cast<ptrdiff_t> (input_buf_elts) * input_elt_size; assert (input_buf_size >= 0);
--- a/libinterp/corefcn/oct-stream.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/oct-stream.h Tue Apr 03 13:52:40 2018 -0700 @@ -69,7 +69,7 @@ base_stream (std::ios::openmode arg_md = std::ios::in | std::ios::out, mach_info::float_format ff = mach_info::native_float_format ()) : count (0), md (arg_md), flt_fmt (ff), fail (false), open_state (true), - errmsg () + errmsg () { } // No copying!
--- a/libinterp/corefcn/qz.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/qz.cc Tue Apr 03 13:52:40 2018 -0700 @@ -449,7 +449,7 @@ if (comp_q == 'V') std::cout << "qz: balancing done; QQ=" << std::endl << QQ << std::endl; #endif - } + } // then right if (comp_z == 'V') @@ -507,7 +507,7 @@ F77_DBLE_CMPLX_ARG (CQ.fortran_vec ()), nn, F77_DBLE_CMPLX_ARG (CZ.fortran_vec ()), nn, F77_DBLE_CMPLX_ARG (cwork.fortran_vec ()), nn, - rwork.fortran_vec (), info + rwork.fortran_vec (), info F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); @@ -1081,7 +1081,7 @@ default: error ("qz: too many return arguments"); break; - } + } #if defined (DEBUG) std::cout << "qz: exiting (at long last)" << std::endl;
--- a/libinterp/corefcn/sighandlers.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/sighandlers.cc Tue Apr 03 13:52:40 2018 -0700 @@ -116,7 +116,7 @@ static int sigbreak; static const bool have_sigbreak - = octave_get_sig_number ("SIGBREAK", &sigbreak); + = octave_get_sig_number ("SIGBREAK", &sigbreak); // Termination signals.
--- a/libinterp/corefcn/sparse-xpow.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/sparse-xpow.cc Tue Apr 03 13:52:40 2018 -0700 @@ -670,7 +670,7 @@ if (xisint (btmp)) result.xelem (a.ridx (i), j) = std::pow (a.data (i), - static_cast<int> (btmp)); + static_cast<int> (btmp)); else result.xelem (a.ridx (i), j) = std::pow (a.data (i), btmp); }
--- a/libinterp/corefcn/svd.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/svd.cc Tue Apr 03 13:52:40 2018 -0700 @@ -44,16 +44,15 @@ return octave::math::svd<T>::Type::sigma_only; else if (nargin == 1) return octave::math::svd<T>::Type::std; + else if (! args(1).is_real_scalar ()) + return octave::math::svd<T>::Type::economy; else - if (! args(1).is_real_scalar ()) - return octave::math::svd<T>::Type::economy; - else - { - if (A.rows () > A.columns ()) - return octave::math::svd<T>::Type::economy; - else - return octave::math::svd<T>::Type::std; - } + { + if (A.rows () > A.columns ()) + return octave::math::svd<T>::Type::economy; + else + return octave::math::svd<T>::Type::std; + } } template <typename T>
--- a/libinterp/corefcn/symscope.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/symscope.h Tue Apr 03 13:52:40 2018 -0700 @@ -589,7 +589,7 @@ bool m_is_nested; //! If true then no variables can be added. - + bool m_is_static; symbol_record::context_id m_context;
--- a/libinterp/corefcn/symtab.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/symtab.cc Tue Apr 03 13:52:40 2018 -0700 @@ -387,7 +387,7 @@ octave_value symbol_table::fcn_table_find (const std::string& name, - const octave_value_list& args, bool local_funcs) + const octave_value_list& args, bool local_funcs) { fcn_table_iterator p = m_fcn_table.find (name);
--- a/libinterp/corefcn/symtab.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/symtab.h Tue Apr 03 13:52:40 2018 -0700 @@ -59,9 +59,9 @@ : m_fcn_table (), m_class_precedence_table (), m_parent_map (), m_global_scope ("global scope"), m_top_scope ("top scope"), m_current_scope (m_top_scope) - { - install_builtins (); - } + { + install_builtins (); + } // No copying! @@ -141,10 +141,10 @@ // Find a value corresponding to the given name in the table. octave_value - find (const std::string& name, - const octave_value_list& args = octave_value_list (), - bool skip_variables = false, - bool local_funcs = true); + find (const std::string& name, + const octave_value_list& args = octave_value_list (), + bool skip_variables = false, + bool local_funcs = true); void assign (const std::string& name, const octave_value& value, bool force_add) { @@ -177,8 +177,8 @@ } void - top_level_assign (const std::string& name, - const octave_value& value = octave_value ()) + top_level_assign (const std::string& name, + const octave_value& value = octave_value ()) { m_top_scope.assign (name, value); } @@ -189,7 +189,7 @@ } bool - is_built_in_function_name (const std::string& name) + is_built_in_function_name (const std::string& name) { octave_value val = find_built_in_function (name); @@ -197,7 +197,7 @@ } octave_value - find_method (const std::string& name, const std::string& dispatch_type) + find_method (const std::string& name, const std::string& dispatch_type) { fcn_table_const_iterator p = m_fcn_table.find (name); @@ -227,10 +227,10 @@ } octave_value - find_submethod (const std::string& name, const std::string& dispatch_type); + find_submethod (const std::string& name, const std::string& dispatch_type); octave_value - find_built_in_function (const std::string& name) + find_built_in_function (const std::string& name) { fcn_table_const_iterator p = m_fcn_table.find (name); @@ -239,7 +239,7 @@ } octave_value - find_autoload (const std::string& name) + find_autoload (const std::string& name) { fcn_table_iterator p = m_fcn_table.find (name); @@ -255,9 +255,9 @@ bool local_funcs = true); octave_value - find_function (const std::string& name, - const octave_value_list& args = octave_value_list (), - bool local_funcs = true); + find_function (const std::string& name, + const octave_value_list& args = octave_value_list (), + bool local_funcs = true); octave_value find_user_function (const std::string& name) { @@ -636,7 +636,7 @@ } std::list<std::string> - parent_classes (const std::string& dispatch_type) + parent_classes (const std::string& dispatch_type) { std::list<std::string> retval;
--- a/libinterp/corefcn/sysdep.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/sysdep.cc Tue Apr 03 13:52:40 2018 -0700 @@ -738,14 +738,14 @@ DWORD length = 0; result = RegQueryValueExA (h_subkey, name.c_str (), nullptr, nullptr, nullptr, - &length); + &length); if (result != ERROR_SUCCESS) return result; DWORD type = 0; OCTAVE_LOCAL_BUFFER (BYTE, data, length); result = RegQueryValueExA (h_subkey, name.c_str (), nullptr, &type, data, - &length); + &length); if (result != ERROR_SUCCESS) return result; @@ -880,7 +880,7 @@ { if (args.length () < 3) error ("winqueryreg: if the first argument is 'name', " - "ROOTKEY and SUBKEY must be given"); + "ROOTKEY and SUBKEY must be given"); get_names = true; rootkey_name = args(1).xstring_value ("winqueryreg: ROOTKEY must be a string");
--- a/libinterp/corefcn/url-handle-manager.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/url-handle-manager.h Tue Apr 03 13:52:40 2018 -0700 @@ -61,7 +61,8 @@ url_handle lookup (double val) { - iterator p = (math::isnan (val) ? handle_map.end () : handle_map.find (val)); + iterator p = (math::isnan (val) ? handle_map.end () + : handle_map.find (val)); return (p != handle_map.end ()) ? p->first : url_handle (); } @@ -69,7 +70,7 @@ url_handle lookup (const octave_value& val) { return val.is_real_scalar () ? lookup (val.double_value ()) - : url_handle (); + : url_handle (); } url_transfer get_object (double val)
--- a/libinterp/corefcn/utils.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/utils.cc Tue Apr 03 13:52:40 2018 -0700 @@ -455,7 +455,8 @@ if (! local_file_ok) { - octave::load_path& lp = octave::__get_load_path__ ("find_data_file_in_load_path"); + octave::load_path& lp = + octave::__get_load_path__ ("find_data_file_in_load_path"); // Not directly found; search load path. std::string tmp
--- a/libinterp/corefcn/variables.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/corefcn/variables.cc Tue Apr 03 13:52:40 2018 -0700 @@ -248,7 +248,7 @@ octave::symbol_table& symtab = octave::__get_symbol_table__ ("generate_struct_completions"); - if (is_variable (symtab, base_name)) + if (is_variable (symtab, base_name)) { int parse_status; @@ -2708,7 +2708,8 @@ void clear_mex_functions (void) { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("clear_mex_functions"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("clear_mex_functions"); symtab.clear_mex_functions (); } @@ -2753,7 +2754,8 @@ octave_value get_global_value (const std::string& nm, bool silent) { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("get_global_value"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("get_global_value"); octave_value val = symtab.global_varval (nm); @@ -2766,7 +2768,8 @@ void set_global_value (const std::string& nm, const octave_value& val) { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("set_global_value"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("set_global_value"); symtab.global_assign (nm, val); } @@ -2774,7 +2777,8 @@ octave_value get_top_level_value (const std::string& nm, bool silent) { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("get_top_level_value"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("get_top_level_value"); octave_value val = symtab.top_level_varval (nm); @@ -2787,7 +2791,8 @@ void set_top_level_value (const std::string& nm, const octave_value& val) { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("set_top_level_value"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("set_top_level_value"); symtab.top_level_assign (nm, val); }
--- a/libinterp/dldfcn/__init_fltk__.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/dldfcn/__init_fltk__.cc Tue Apr 03 13:52:40 2018 -0700 @@ -820,7 +820,7 @@ int toolbar_y = m_menu_h + hh + 1; m_status = new Fl_Output (5 * m_status_h, toolbar_y, - ww - 5 * m_status_h, m_status_h, ""); + ww - 5 * m_status_h, m_status_h, ""); m_status->textcolor (FL_BLACK); m_status->color (FL_GRAY); @@ -1032,7 +1032,7 @@ m_rotate->position (3 * m_status_h, toolbar_y); m_help->position (4 * m_status_h, toolbar_y); m_status->resize (5 * m_status_h, toolbar_y, - w () - 5 * m_status_h, m_status_h); + w () - 5 * m_status_h, m_status_h); init_sizes (); redraw (); }
--- a/libinterp/dldfcn/__ode15__.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/dldfcn/__ode15__.cc Tue Apr 03 13:52:40 2018 -0700 @@ -566,7 +566,7 @@ //main loop while (((posdirection == 1 && tsol < tend) - || (posdirection == 0 && tsol > tend)) + || (posdirection == 0 && tsol > tend)) && status == 0) { if (IDASolve (mem, tend, &tsol, yy, yyp, IDA_ONE_STEP) != 0) @@ -691,7 +691,7 @@ // Linear interpolation ie(0) = index(0); te(0) = tsol - val (index(0)) * (tsol - told) - / (val (index(0)) - oldval (index(0))); + / (val (index(0)) - oldval (index(0))); ColumnVector ytemp = y - ((tsol - te(0)) * (y - yold) / (tsol - told)); @@ -716,7 +716,7 @@ // Linear interpolation ie(temp+i) = index(i); te(temp+i) = tsol - val(index(i)) * (tsol - told) - / (val(index(i)) - oldval(index(i))); + / (val(index(i)) - oldval(index(i))); ColumnVector ytemp = y - (tsol - te (temp + i)) * (y - yold) / (tsol - told); @@ -846,7 +846,8 @@ status = val(0).bool_value (); } else - { // Cleanup plotter + { + // Cleanup plotter output(0) = tend; feval (output_fcn, output, 0); }
--- a/libinterp/dldfcn/gzip.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/dldfcn/gzip.cc Tue Apr 03 13:52:40 2018 -0700 @@ -442,8 +442,8 @@ } while (flush != Z_FINISH); - if (status != Z_STREAM_END) - throw std::runtime_error ("failed to write file"); + if (status != Z_STREAM_END) + throw std::runtime_error ("failed to write file"); } void close (void)
--- a/libinterp/octave-value/ov-base.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-base.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1481,7 +1481,8 @@ { INSTALL_ASSIGNCONV_TI (ti, octave_base_value, octave_scalar, octave_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_base_value, octave_matrix, octave_matrix); - INSTALL_ASSIGNCONV_TI (ti, octave_base_value, octave_complex, octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_base_value, octave_complex, + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_base_value, octave_complex_matrix, octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_base_value, octave_range, octave_matrix);
--- a/libinterp/octave-value/ov-builtin.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-builtin.h Tue Apr 03 13:52:40 2018 -0700 @@ -50,7 +50,9 @@ { public: - octave_builtin (void) : octave_function (), f (nullptr), file (), jtype (nullptr) { } + octave_builtin (void) : octave_function (), f (nullptr), file (), + jtype (nullptr) + { } typedef octave_value_list (*meth) (octave::interpreter&, const octave_value_list&, int); @@ -59,19 +61,23 @@ octave_builtin (fcn ff, const std::string& nm = "", const std::string& ds = "") - : octave_function (nm, ds), f (ff), m (nullptr), file (), jtype (nullptr) { } + : octave_function (nm, ds), f (ff), m (nullptr), file (), jtype (nullptr) + { } octave_builtin (meth mm, const std::string& nm = "", const std::string& ds = "") - : octave_function (nm, ds), f (nullptr), m (mm), file (), jtype (nullptr) { } + : octave_function (nm, ds), f (nullptr), m (mm), file (), jtype (nullptr) + { } octave_builtin (fcn ff, const std::string& nm, const std::string& fnm, const std::string& ds) - : octave_function (nm, ds), f (ff), m (nullptr), file (fnm), jtype (nullptr) { } + : octave_function (nm, ds), f (ff), m (nullptr), file (fnm), jtype (nullptr) + { } octave_builtin (meth mm, const std::string& nm, const std::string& fnm, const std::string& ds) - : octave_function (nm, ds), f (nullptr), m (mm), file (fnm), jtype (nullptr) { } + : octave_function (nm, ds), f (nullptr), m (mm), file (fnm), jtype (nullptr) + { } // No copying!
--- a/libinterp/octave-value/ov-cell.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-cell.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1317,7 +1317,7 @@ string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array"); return ovl (s.isempty () ? Cell (octave_value ("")) - : Cell (s, true)); + : Cell (s, true)); } }
--- a/libinterp/octave-value/ov-class.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-class.cc Tue Apr 03 13:52:40 2018 -0700 @@ -298,7 +298,8 @@ Matrix retval (1, 2, 1.0); - octave::symbol_table& symtab = octave::__get_symbol_table__ ("octave_class::size"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("octave_class::size"); octave_value meth = symtab.find_method ("size", class_name ()); @@ -338,7 +339,8 @@ octave_idx_type retval = -1; const std::string cn = class_name (); - octave::symbol_table& symtab = octave::__get_symbol_table__ ("octave_class::numel"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("octave_class::numel"); octave_value meth = symtab.find_method ("numel", cn); @@ -433,7 +435,8 @@ } else { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("octave_class::subsref"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("octave_class::subsref"); octave_value meth = symtab.find_method ("subsref", class_name ()); @@ -811,7 +814,8 @@ idx_vector octave_class::index_vector (bool require_integers) const { - octave::symbol_table& symtab = octave::__get_symbol_table__ ("octave_class::index_vector"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("octave_class::index_vector"); octave_value meth = symtab.find_method ("subsindex", class_name ()); @@ -859,7 +863,8 @@ { bool retval = false; - octave::symbol_table& symtab = octave::__get_symbol_table__ ("octave_class::is_true"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("octave_class::is_true"); octave_value meth = symtab.find_method ("logical", class_name ());
--- a/libinterp/octave-value/ov-dld-fcn.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-dld-fcn.h Tue Apr 03 13:52:40 2018 -0700 @@ -48,11 +48,13 @@ : sh_lib (), t_checked (), system_fcn_file () { } - octave_dld_function (octave_builtin::fcn ff, const octave::dynamic_library& shl, + octave_dld_function (octave_builtin::fcn ff, + const octave::dynamic_library& shl, const std::string& nm = "", const std::string& ds = ""); - octave_dld_function (octave_builtin::meth mm, const octave::dynamic_library& shl, + octave_dld_function (octave_builtin::meth mm, + const octave::dynamic_library& shl, const std::string& nm = "", const std::string& ds = "");
--- a/libinterp/octave-value/ov-fcn-handle.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Tue Apr 03 13:52:40 2018 -0700 @@ -284,7 +284,8 @@ names.push_back (nm + ".mex"); names.push_back (nm + ".m"); - octave::load_path& lp = octave::__get_load_path__ ("octave_fcn_handle::set_fcn"); + octave::load_path& lp = + octave::__get_load_path__ ("octave_fcn_handle::set_fcn"); octave::directory_path p (lp.system_path ());
--- a/libinterp/octave-value/ov-java.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-java.cc Tue Apr 03 13:52:40 2018 -0700 @@ -545,7 +545,7 @@ (lib.search ("JNI_GetCreatedJavaVMs")); if (! create_vm || ! get_vm) - { + { #if defined (OCTAVE_USE_WINDOWS_API) // In windows, find the location of the JRE from the registry // and load the symbol from the dll.
--- a/libinterp/octave-value/ov-re-diag.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/octave-value/ov-re-diag.cc Tue Apr 03 13:52:40 2018 -0700 @@ -231,7 +231,8 @@ return DiagMatrix (matrix.rows (), matrix.cols (), 0.0); case umap_sqrt: { - ComplexColumnVector tmp = matrix.extract_diag ().map<Complex> (octave::math::rc_sqrt); + ComplexColumnVector tmp; + tmp = matrix.extract_diag ().map<Complex> (octave::math::rc_sqrt); ComplexDiagMatrix retval (tmp); retval.resize (matrix.rows (), matrix.columns ()); return retval;
--- a/libinterp/operators/op-b-sbm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-b-sbm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -94,8 +94,8 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_sparse_bool_matrix, s_sbm); INSTALL_ASSIGNCONV_TI (ti, octave_bool, octave_sparse_bool_matrix, - octave_bool_matrix); + octave_bool_matrix); INSTALL_WIDENOP_TI (ti, octave_bool, octave_sparse_bool_matrix, - sparse_bool_matrix_conv); + sparse_bool_matrix_conv); }
--- a/libinterp/operators/op-bm-b.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-bm-b.cc Tue Apr 03 13:52:40 2018 -0700 @@ -98,23 +98,23 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_bool, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int8_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int16_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int32_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int64_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint8_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint16_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint32_scalar, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint64_scalar, - conv_and_assign); + conv_and_assign); }
--- a/libinterp/operators/op-bm-bm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-bm-bm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -139,13 +139,13 @@ INSTALL_BINOP_TI (ti, op_el_and, octave_bool_matrix, octave_bool_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_bool_matrix, octave_bool_matrix, el_or); INSTALL_BINOP_TI (ti, op_el_not_and, octave_bool_matrix, octave_bool_matrix, - el_not_and); + el_not_and); INSTALL_BINOP_TI (ti, op_el_not_or, octave_bool_matrix, octave_bool_matrix, - el_not_or); + el_not_or); INSTALL_BINOP_TI (ti, op_el_and_not, octave_bool_matrix, octave_bool_matrix, - el_and_not); + el_and_not); INSTALL_BINOP_TI (ti, op_el_or_not, octave_bool_matrix, octave_bool_matrix, - el_or_not); + el_or_not); INSTALL_CATOP_TI (ti, octave_bool_matrix, octave_bool_matrix, bm_bm); INSTALL_CATOP_TI (ti, octave_bool_matrix, octave_matrix, bm_m); @@ -153,48 +153,50 @@ INSTALL_CATOP_TI (ti, octave_bool_matrix, octave_float_matrix, bm_fm); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_bool_matrix, fm_bm); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_bool_matrix, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_bool_matrix, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_char_matrix_str, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_char_matrix_sq_str, - conv_and_assign); + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, + octave_char_matrix_sq_str, + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_range, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_sparse_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int8_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int16_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int32_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_int64_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint8_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint16_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint32_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint64_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_null_matrix, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_null_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_null_sq_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_el_and_eq, octave_bool_matrix, octave_bool_matrix, - assign_and); + assign_and); INSTALL_ASSIGNOP_TI (ti, op_el_or_eq, octave_bool_matrix, octave_bool_matrix, - assign_or); + assign_or); }
--- a/libinterp/operators/op-bm-sbm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-bm-sbm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -90,19 +90,20 @@ INSTALL_BINOP_TI (ti, op_ne, octave_bool_matrix, octave_sparse_bool_matrix, ne); INSTALL_BINOP_TI (ti, op_el_and, octave_bool_matrix, octave_sparse_bool_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_bool_matrix, octave_sparse_bool_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_bool_matrix, octave_sparse_bool_matrix, bm_sbm); INSTALL_CATOP_TI (ti, octave_bool_matrix, octave_sparse_matrix, bm_sm); INSTALL_CATOP_TI (ti, octave_matrix, octave_sparse_bool_matrix, m_sbm); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_sparse_bool_matrix, - assign) + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, + octave_sparse_bool_matrix, + assign) INSTALL_ASSIGNCONV_TI (ti, octave_bool_matrix, octave_sparse_bool_matrix, - octave_bool_matrix); + octave_bool_matrix); INSTALL_WIDENOP_TI (ti, octave_bool_matrix, octave_sparse_bool_matrix, - sparse_bool_matrix_conv); + sparse_bool_matrix_conv); }
--- a/libinterp/operators/op-cdm-cdm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cdm-cdm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -98,19 +98,23 @@ INSTALL_UNOP_TI (ti, op_transpose, octave_complex_diag_matrix, transpose); INSTALL_UNOP_TI (ti, op_hermitian, octave_complex_diag_matrix, hermitian); - INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix, octave_complex_diag_matrix, - add); - INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix, octave_complex_diag_matrix, - sub); - INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix, octave_complex_diag_matrix, - mul); - INSTALL_BINOP_TI (ti, op_div, octave_complex_diag_matrix, octave_complex_diag_matrix, - div); + INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix, + octave_complex_diag_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix, + octave_complex_diag_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix, + octave_complex_diag_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_complex_diag_matrix, + octave_complex_diag_matrix, + div); INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix, - octave_complex_diag_matrix, ldiv); + octave_complex_diag_matrix, ldiv); INSTALL_ASSIGNCONV_TI (ti, octave_complex_diag_matrix, octave_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_complex_diag_matrix, octave_complex_matrix, - complex_diag_matrix_to_complex_matrix); + complex_diag_matrix_to_complex_matrix); }
--- a/libinterp/operators/op-cell.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cell.cc Tue Apr 03 13:52:40 2018 -0700 @@ -62,7 +62,9 @@ INSTALL_ASSIGNANYOP_TI (ti, op_asn_eq, octave_cell, assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_cell, octave_null_matrix, null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_cell, octave_null_matrix, + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_cell, octave_null_str, null_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_cell, octave_null_sq_str, null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_cell, octave_null_sq_str, + null_assign); }
--- a/libinterp/operators/op-cm-cm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cm-cm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -249,24 +249,34 @@ INSTALL_NCUNOP_TI (ti, op_decr, octave_complex_matrix, decr); INSTALL_NCUNOP_TI (ti, op_uminus, octave_complex_matrix, changesign); - INSTALL_BINOP_TI (ti, op_add, octave_complex_matrix, octave_complex_matrix, add); - INSTALL_BINOP_TI (ti, op_sub, octave_complex_matrix, octave_complex_matrix, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_complex_matrix, octave_complex_matrix, mul); - INSTALL_BINOP_TI (ti, op_div, octave_complex_matrix, octave_complex_matrix, div); - INSTALL_BINOP_TI (ti, op_pow, octave_complex_matrix, octave_complex_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, octave_complex_matrix, ldiv); - INSTALL_BINOP_TI (ti, op_trans_mul, octave_complex_matrix, octave_complex_matrix, - trans_mul); - INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, octave_complex_matrix, - mul_trans); + INSTALL_BINOP_TI (ti, op_add, octave_complex_matrix, octave_complex_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_complex_matrix, octave_complex_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_complex_matrix, octave_complex_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_complex_matrix, octave_complex_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_complex_matrix, octave_complex_matrix, + pow); + INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, octave_complex_matrix, + ldiv); + INSTALL_BINOP_TI (ti, op_trans_mul, octave_complex_matrix, + octave_complex_matrix, + trans_mul); + INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, + octave_complex_matrix, + mul_trans); INSTALL_BINOP_TI (ti, op_herm_mul, octave_complex_matrix, octave_complex_matrix, - herm_mul); + herm_mul); INSTALL_BINOP_TI (ti, op_mul_herm, octave_complex_matrix, octave_complex_matrix, - mul_herm); - INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_complex_matrix, octave_complex_matrix, - trans_ldiv); - INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_complex_matrix, octave_complex_matrix, - herm_ldiv); + mul_herm); + INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_complex_matrix, + octave_complex_matrix, + trans_ldiv); + INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_complex_matrix, + octave_complex_matrix, + herm_ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_complex_matrix, octave_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_complex_matrix, octave_complex_matrix, le); @@ -275,35 +285,41 @@ INSTALL_BINOP_TI (ti, op_gt, octave_complex_matrix, octave_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_complex_matrix, octave_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_complex_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_complex_matrix, - el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_complex_matrix, el_or); + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_complex_matrix, + el_or); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_complex_matrix, cm_cm); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_complex_matrix, - assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, + octave_complex_matrix, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_null_matrix, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_null_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_null_sq_str, - null_assign); + null_assign); - INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_complex_matrix, octave_complex_matrix, - assign_add); - INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_complex_matrix, octave_complex_matrix, - assign_sub); - INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_complex_matrix, octave_complex_matrix, - assign_el_mul); - INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_complex_matrix, octave_complex_matrix, - assign_el_div); + INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_complex_matrix, + octave_complex_matrix, + assign_add); + INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_complex_matrix, + octave_complex_matrix, + assign_sub); + INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_complex_matrix, + octave_complex_matrix, + assign_el_mul); + INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_complex_matrix, + octave_complex_matrix, + assign_el_div); }
--- a/libinterp/operators/op-cm-cs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cm-cs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -148,22 +148,28 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_complex, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_complex, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_complex, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_complex, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_complex, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_complex, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_complex, el_or); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_complex, cm_cs); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_complex, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_complex, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, octave_complex, - sgl_assign); + sgl_assign); - INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_complex_matrix, octave_complex_scalar, - assign_add); - INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_complex_matrix, octave_complex_scalar, - assign_sub); - INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_complex_matrix, octave_complex_scalar, - assign_mul); - INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_complex_matrix, octave_complex_scalar, - assign_div); + INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_complex_matrix, + octave_complex_scalar, + assign_add); + INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_complex_matrix, + octave_complex_scalar, + assign_sub); + INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_complex_matrix, + octave_complex_scalar, + assign_mul); + INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_complex_matrix, + octave_complex_scalar, + assign_div); }
--- a/libinterp/operators/op-cm-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cm-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -137,13 +137,17 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_matrix, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_matrix, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_matrix, el_or); - INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, octave_matrix, mul_trans); - INSTALL_BINOP_TI (ti, op_mul_herm, octave_complex_matrix, octave_matrix, mul_trans); + INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, octave_matrix, + mul_trans); + INSTALL_BINOP_TI (ti, op_mul_herm, octave_complex_matrix, octave_matrix, + mul_trans); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_matrix, cm_m); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_matrix, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_matrix, + assign); }
--- a/libinterp/operators/op-cm-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cm-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -138,16 +138,18 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_scalar, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_scalar, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_scalar, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_scalar, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_scalar, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_scalar, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_scalar, el_or); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_scalar, cm_s); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_scalar, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_scalar, + assign); INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_complex_matrix, octave_scalar, - assign_mul); + assign_mul); INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_complex_matrix, octave_scalar, - assign_div); + assign_div); }
--- a/libinterp/operators/op-cm-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cm-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -159,54 +159,54 @@ install_cm_scm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_add, octave_complex_matrix, - octave_sparse_complex_matrix, add); + octave_sparse_complex_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_complex_matrix, - octave_sparse_complex_matrix, sub); + octave_sparse_complex_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_complex_matrix, - octave_sparse_complex_matrix, mul); + octave_sparse_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_complex_matrix, - octave_sparse_complex_matrix, div); + octave_sparse_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_complex_matrix, - octave_sparse_complex_matrix, pow); + octave_sparse_complex_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, - octave_sparse_complex_matrix, ldiv); + octave_sparse_complex_matrix, ldiv); INSTALL_BINOP_TI (ti, op_mul_trans, octave_complex_matrix, - octave_sparse_complex_matrix, mul_trans); + octave_sparse_complex_matrix, mul_trans); INSTALL_BINOP_TI (ti, op_mul_herm, octave_complex_matrix, - octave_sparse_complex_matrix, mul_herm); + octave_sparse_complex_matrix, mul_herm); INSTALL_BINOP_TI (ti, op_lt, octave_complex_matrix, - octave_sparse_complex_matrix, lt); + octave_sparse_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_complex_matrix, - octave_sparse_complex_matrix, le); + octave_sparse_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_complex_matrix, - octave_sparse_complex_matrix, eq); + octave_sparse_complex_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_complex_matrix, - octave_sparse_complex_matrix, ge); + octave_sparse_complex_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_complex_matrix, - octave_sparse_complex_matrix, gt); + octave_sparse_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_complex_matrix, - octave_sparse_complex_matrix, ne); + octave_sparse_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, - octave_sparse_complex_matrix, el_mul); + octave_sparse_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, - octave_sparse_complex_matrix, el_div); + octave_sparse_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, - octave_sparse_complex_matrix, el_pow); + octave_sparse_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, - octave_sparse_complex_matrix, el_ldiv); + octave_sparse_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, - octave_sparse_complex_matrix, el_and); + octave_sparse_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, - octave_sparse_complex_matrix, el_or); + octave_sparse_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_complex_matrix, - octave_sparse_complex_matrix, cm_scm); + octave_sparse_complex_matrix, cm_scm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, - octave_sparse_complex_matrix, assign) + octave_sparse_complex_matrix, assign) INSTALL_ASSIGNCONV_TI (ti, octave_complex_matrix, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_complex_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); }
--- a/libinterp/operators/op-cm-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cm-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -148,7 +148,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_complex_matrix, octave_sparse_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_complex_matrix, octave_sparse_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_complex_matrix, octave_sparse_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, octave_sparse_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_matrix, octave_sparse_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_complex_matrix, octave_sparse_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_complex_matrix, octave_sparse_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_complex_matrix, octave_sparse_matrix, eq); @@ -156,23 +157,23 @@ INSTALL_BINOP_TI (ti, op_gt, octave_complex_matrix, octave_sparse_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_complex_matrix, octave_sparse_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_complex_matrix, octave_sparse_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex_matrix, octave_sparse_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex_matrix, octave_sparse_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex_matrix, octave_sparse_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex_matrix, octave_sparse_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex_matrix, octave_sparse_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_sparse_matrix, cm_sm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_sparse_matrix, - assign); + assign); INSTALL_ASSIGNCONV_TI (ti, octave_complex_matrix, octave_sparse_matrix, - octave_complex_matrix) + octave_complex_matrix) }
--- a/libinterp/operators/op-cs-cm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cs-cm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -138,14 +138,16 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_complex, octave_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex, octave_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex, octave_complex_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex, octave_complex_matrix, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex, octave_complex_matrix, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex, octave_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex, octave_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_complex, octave_complex_matrix, cs_cm); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); - INSTALL_WIDENOP_TI (ti, octave_complex, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP_TI (ti, octave_complex, octave_complex_matrix, + complex_matrix_conv); }
--- a/libinterp/operators/op-cs-cs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cs-cs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -186,11 +186,13 @@ INSTALL_CATOP_TI (ti, octave_complex, octave_complex, cs_cs); - INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_complex, octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_complex, + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_null_matrix, - octave_complex_matrix); - INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_null_str, octave_complex_matrix); + octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_null_str, + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_null_sq_str, - octave_complex_matrix); + octave_complex_matrix); }
--- a/libinterp/operators/op-cs-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cs-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -129,5 +129,6 @@ INSTALL_CATOP_TI (ti, octave_complex, octave_matrix, cs_m); - INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_matrix, octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_matrix, + octave_complex_matrix); }
--- a/libinterp/operators/op-cs-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cs-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -148,5 +148,6 @@ INSTALL_CATOP_TI (ti, octave_complex, octave_scalar, cs_s); - INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_scalar, octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_scalar, + octave_complex_matrix); }
--- a/libinterp/operators/op-cs-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cs-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -145,13 +145,18 @@ void install_cs_scm_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_complex, octave_sparse_complex_matrix, add); - INSTALL_BINOP_TI (ti, op_sub, octave_complex, octave_sparse_complex_matrix, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_complex, octave_sparse_complex_matrix, mul); - INSTALL_BINOP_TI (ti, op_div, octave_complex, octave_sparse_complex_matrix, div); - INSTALL_BINOP_TI (ti, op_pow, octave_complex, octave_sparse_complex_matrix, pow); + INSTALL_BINOP_TI (ti, op_add, octave_complex, octave_sparse_complex_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_complex, octave_sparse_complex_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_complex, octave_sparse_complex_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_complex, octave_sparse_complex_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_complex, octave_sparse_complex_matrix, + pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_complex, octave_sparse_complex_matrix, - ldiv); + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_complex, octave_sparse_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_complex, octave_sparse_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_complex, octave_sparse_complex_matrix, eq); @@ -159,23 +164,23 @@ INSTALL_BINOP_TI (ti, op_gt, octave_complex, octave_sparse_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_complex, octave_sparse_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_complex, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_complex, octave_sparse_complex_matrix, cs_scm); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_complex, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); }
--- a/libinterp/operators/op-cs-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-cs-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -158,14 +158,16 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_complex, octave_sparse_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_complex, octave_sparse_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_complex, octave_sparse_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex, octave_sparse_matrix, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_complex, octave_sparse_matrix, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_complex, octave_sparse_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_complex, octave_sparse_matrix, el_or); INSTALL_CATOP_TI (ti, octave_complex, octave_sparse_matrix, cs_sm); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_sparse_matrix, - octave_complex_matrix); + octave_complex_matrix); - INSTALL_WIDENOP_TI (ti, octave_complex, octave_sparse_matrix, sparse_matrix_conv); + INSTALL_WIDENOP_TI (ti, octave_complex, octave_sparse_matrix, + sparse_matrix_conv); }
--- a/libinterp/operators/op-dm-dm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-dm-dm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -92,5 +92,6 @@ INSTALL_BINOP_TI (ti, op_ldiv, octave_diag_matrix, octave_diag_matrix, ldiv); INSTALL_ASSIGNCONV_TI (ti, octave_diag_matrix, octave_matrix, octave_matrix); - INSTALL_WIDENOP_TI (ti, octave_diag_matrix, octave_matrix, diag_matrix_to_matrix); + INSTALL_WIDENOP_TI (ti, octave_diag_matrix, octave_matrix, + diag_matrix_to_matrix); }
--- a/libinterp/operators/op-dm-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-dm-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -552,55 +552,55 @@ install_dm_scm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_mul, octave_diag_matrix, octave_sparse_complex_matrix, - mul_dm_scm); + mul_dm_scm); INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix, octave_sparse_matrix, - mul_cdm_sm); + mul_cdm_sm); INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix, - octave_sparse_complex_matrix, mul_cdm_scm); + octave_sparse_complex_matrix, mul_cdm_scm); INSTALL_BINOP_TI (ti, op_ldiv, octave_diag_matrix, octave_sparse_complex_matrix, - ldiv_dm_scm); + ldiv_dm_scm); INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix, octave_sparse_matrix, - ldiv_cdm_sm); + ldiv_cdm_sm); INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix, - octave_sparse_complex_matrix, ldiv_cdm_scm); + octave_sparse_complex_matrix, ldiv_cdm_scm); INSTALL_BINOP_TI (ti, op_add, octave_diag_matrix, octave_sparse_complex_matrix, - add_dm_scm); + add_dm_scm); INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix, octave_sparse_matrix, - add_cdm_sm); + add_cdm_sm); INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix, - octave_sparse_complex_matrix, add_cdm_scm); + octave_sparse_complex_matrix, add_cdm_scm); INSTALL_BINOP_TI (ti, op_sub, octave_diag_matrix, octave_sparse_complex_matrix, - sub_dm_scm); + sub_dm_scm); INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix, octave_sparse_matrix, - sub_cdm_sm); + sub_cdm_sm); INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix, - octave_sparse_complex_matrix, sub_cdm_scm); + octave_sparse_complex_matrix, sub_cdm_scm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_diag_matrix, - mul_scm_dm); + mul_scm_dm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_complex_diag_matrix, - mul_sm_cdm); + mul_sm_cdm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, - octave_complex_diag_matrix, mul_scm_cdm); + octave_complex_diag_matrix, mul_scm_cdm); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_diag_matrix, - div_scm_dm); + div_scm_dm); INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_complex_diag_matrix, - div_sm_cdm); + div_sm_cdm); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, - octave_complex_diag_matrix, div_scm_cdm); + octave_complex_diag_matrix, div_scm_cdm); INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, octave_diag_matrix, - add_scm_dm); + add_scm_dm); INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_complex_diag_matrix, - add_sm_cdm); + add_sm_cdm); INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, - octave_complex_diag_matrix, add_scm_cdm); + octave_complex_diag_matrix, add_scm_cdm); INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_diag_matrix, - sub_scm_dm); + sub_scm_dm); INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_complex_diag_matrix, - sub_sm_cdm); + sub_sm_cdm); INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, - octave_complex_diag_matrix, sub_scm_cdm); + octave_complex_diag_matrix, sub_scm_cdm); }
--- a/libinterp/operators/op-dm-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-dm-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -189,16 +189,22 @@ install_dm_sm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_mul, octave_diag_matrix, octave_sparse_matrix, - mul_dm_sm); + mul_dm_sm); - INSTALL_BINOP_TI (ti, op_add, octave_diag_matrix, octave_sparse_matrix, add_dm_sm); - INSTALL_BINOP_TI (ti, op_sub, octave_diag_matrix, octave_sparse_matrix, sub_dm_sm); - INSTALL_BINOP_TI (ti, op_ldiv, octave_diag_matrix, octave_sparse_matrix, ldiv_dm_sm); + INSTALL_BINOP_TI (ti, op_add, octave_diag_matrix, octave_sparse_matrix, + add_dm_sm); + INSTALL_BINOP_TI (ti, op_sub, octave_diag_matrix, octave_sparse_matrix, + sub_dm_sm); + INSTALL_BINOP_TI (ti, op_ldiv, octave_diag_matrix, octave_sparse_matrix, + ldiv_dm_sm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_diag_matrix, - mul_sm_dm); + mul_sm_dm); - INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_diag_matrix, add_sm_dm); - INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_diag_matrix, sub_sm_dm); - INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_diag_matrix, div_sm_dm); + INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_diag_matrix, + add_sm_dm); + INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_diag_matrix, + sub_sm_dm); + INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_diag_matrix, + div_sm_dm); }
--- a/libinterp/operators/op-fcdm-fcdm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcdm-fcdm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -99,18 +99,19 @@ INSTALL_UNOP_TI (ti, op_hermitian, octave_float_complex_diag_matrix, hermitian); INSTALL_BINOP_TI (ti, op_add, octave_float_complex_diag_matrix, - octave_float_complex_diag_matrix, add); + octave_float_complex_diag_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_diag_matrix, - octave_float_complex_diag_matrix, sub); + octave_float_complex_diag_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_diag_matrix, - octave_float_complex_diag_matrix, mul); + octave_float_complex_diag_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_float_complex_diag_matrix, - octave_float_complex_diag_matrix, div); + octave_float_complex_diag_matrix, div); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex_diag_matrix, - octave_float_complex_diag_matrix, ldiv); + octave_float_complex_diag_matrix, ldiv); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex_diag_matrix, - octave_float_complex_matrix, octave_float_complex_matrix); - INSTALL_WIDENOP_TI (ti, octave_float_complex_diag_matrix, octave_complex_diag_matrix, - float_complex_diag_matrix_to_complex_diag_matrix); + octave_float_complex_matrix, octave_float_complex_matrix); + INSTALL_WIDENOP_TI (ti, octave_float_complex_diag_matrix, + octave_complex_diag_matrix, + float_complex_diag_matrix_to_complex_diag_matrix); }
--- a/libinterp/operators/op-fcm-fcm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcm-fcm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -266,84 +266,84 @@ INSTALL_NCUNOP_TI (ti, op_uminus, octave_float_complex_matrix, changesign); INSTALL_BINOP_TI (ti, op_add, octave_float_complex_matrix, - octave_float_complex_matrix, add); + octave_float_complex_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_matrix, - octave_float_complex_matrix, sub); + octave_float_complex_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_matrix, - octave_float_complex_matrix, mul); + octave_float_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_float_complex_matrix, - octave_float_complex_matrix, div); + octave_float_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_float_complex_matrix, - octave_float_complex_matrix, pow); + octave_float_complex_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex_matrix, - octave_float_complex_matrix, ldiv); + octave_float_complex_matrix, ldiv); INSTALL_BINOP_TI (ti, op_trans_mul, octave_float_complex_matrix, - octave_float_complex_matrix, trans_mul); + octave_float_complex_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_mul_trans, octave_float_complex_matrix, - octave_float_complex_matrix, mul_trans); + octave_float_complex_matrix, mul_trans); INSTALL_BINOP_TI (ti, op_herm_mul, octave_float_complex_matrix, - octave_float_complex_matrix, herm_mul); + octave_float_complex_matrix, herm_mul); INSTALL_BINOP_TI (ti, op_mul_herm, octave_float_complex_matrix, - octave_float_complex_matrix, mul_herm); + octave_float_complex_matrix, mul_herm); INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_float_complex_matrix, - octave_float_complex_matrix, trans_ldiv); + octave_float_complex_matrix, trans_ldiv); INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_float_complex_matrix, - octave_float_complex_matrix, herm_ldiv); + octave_float_complex_matrix, herm_ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, - octave_float_complex_matrix, lt); + octave_float_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, - octave_float_complex_matrix, le); + octave_float_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, - octave_float_complex_matrix, eq); + octave_float_complex_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, - octave_float_complex_matrix, ge); + octave_float_complex_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, - octave_float_complex_matrix, gt); + octave_float_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, - octave_float_complex_matrix, ne); + octave_float_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex_matrix, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex_matrix, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex_matrix, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex_matrix, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex_matrix, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex_matrix, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, - octave_float_complex_matrix, fcm_fcm); + octave_float_complex_matrix, fcm_fcm); INSTALL_CATOP_TI (ti, octave_complex_matrix, - octave_float_complex_matrix, cm_fcm); + octave_float_complex_matrix, cm_fcm); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, - octave_complex_matrix, fcm_cm); + octave_complex_matrix, fcm_cm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_float_complex_matrix, assign); + octave_float_complex_matrix, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_complex_matrix, sgl_clx_assign); + octave_complex_matrix, sgl_clx_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_matrix, sgl_assign); + octave_matrix, sgl_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, - octave_float_complex_matrix, dbl_assign); + octave_float_complex_matrix, dbl_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_null_matrix, null_assign); + octave_null_matrix, null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_null_str, null_assign); + octave_null_str, null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_null_sq_str, null_assign); + octave_null_sq_str, null_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_float_complex_matrix, - octave_float_complex_matrix, assign_add); + octave_float_complex_matrix, assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_float_complex_matrix, - octave_float_complex_matrix, assign_sub); + octave_float_complex_matrix, assign_sub); INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_float_complex_matrix, - octave_float_complex_matrix, assign_el_mul); + octave_float_complex_matrix, assign_el_mul); INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_float_complex_matrix, - octave_float_complex_matrix, assign_el_div); + octave_float_complex_matrix, assign_el_div); }
--- a/libinterp/operators/op-fcm-fcs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcm-fcs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -154,51 +154,58 @@ install_fcm_fcs_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_add, octave_float_complex_matrix, - octave_float_complex, add); + octave_float_complex, add); INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_matrix, - octave_float_complex, sub); + octave_float_complex, sub); INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_matrix, - octave_float_complex, mul); + octave_float_complex, mul); INSTALL_BINOP_TI (ti, op_div, octave_float_complex_matrix, - octave_float_complex, div); + octave_float_complex, div); INSTALL_BINOP_TI (ti, op_pow, octave_float_complex_matrix, - octave_float_complex, pow); + octave_float_complex, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex_matrix, - octave_float_complex, ldiv); - INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, octave_float_complex, lt); - INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, octave_float_complex, le); - INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, octave_float_complex, eq); - INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, octave_float_complex, ge); - INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, octave_float_complex, gt); - INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, octave_float_complex, ne); + octave_float_complex, ldiv); + INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, octave_float_complex, + lt); + INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, octave_float_complex, + le); + INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, octave_float_complex, + eq); + INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, octave_float_complex, + ge); + INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, octave_float_complex, + gt); + INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, octave_float_complex, + ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex_matrix, - octave_float_complex, el_mul); + octave_float_complex, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex_matrix, - octave_float_complex, el_div); + octave_float_complex, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex_matrix, - octave_float_complex, el_pow); + octave_float_complex, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex_matrix, - octave_float_complex, el_ldiv); + octave_float_complex, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex_matrix, - octave_float_complex, el_and); + octave_float_complex, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex_matrix, - octave_float_complex, el_or); + octave_float_complex, el_or); - INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_float_complex, fcm_fcs); + INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_float_complex, + fcm_fcs); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_float_complex, cm_fcs); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_complex, fcm_cs); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_float_complex, assign); + octave_float_complex, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, - octave_float_complex, dbl_assign); + octave_float_complex, dbl_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_float_complex_matrix, - octave_float_complex_scalar, assign_add); + octave_float_complex_scalar, assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_float_complex_matrix, - octave_float_complex_scalar, assign_sub); + octave_float_complex_scalar, assign_sub); INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_float_complex_matrix, - octave_float_complex_scalar, assign_mul); + octave_float_complex_scalar, assign_mul); INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_float_complex_matrix, - octave_float_complex_scalar, assign_div); + octave_float_complex_scalar, assign_div); }
--- a/libinterp/operators/op-fcm-fm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcm-fm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -151,42 +151,53 @@ void install_fcm_fm_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_float_complex_matrix, octave_float_matrix, add); - INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_matrix, octave_float_matrix, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_matrix, octave_float_matrix, mul); - INSTALL_BINOP_TI (ti, op_div, octave_float_complex_matrix, octave_float_matrix, div); - INSTALL_BINOP_TI (ti, op_pow, octave_float_complex_matrix, octave_float_matrix, pow); + INSTALL_BINOP_TI (ti, op_add, octave_float_complex_matrix, octave_float_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_matrix, octave_float_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_matrix, octave_float_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_float_complex_matrix, octave_float_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_float_complex_matrix, octave_float_matrix, + pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex_matrix, - octave_float_matrix, ldiv); - INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, octave_float_matrix, lt); - INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, octave_float_matrix, le); - INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, octave_float_matrix, eq); - INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, octave_float_matrix, ge); - INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, octave_float_matrix, gt); - INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, octave_float_matrix, ne); + octave_float_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, octave_float_matrix, + lt); + INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, octave_float_matrix, + le); + INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, octave_float_matrix, + eq); + INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, octave_float_matrix, + ge); + INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, octave_float_matrix, + gt); + INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, octave_float_matrix, + ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex_matrix, - octave_float_matrix, el_mul); + octave_float_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex_matrix, - octave_float_matrix, el_div); + octave_float_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex_matrix, - octave_float_matrix, el_pow); + octave_float_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex_matrix, - octave_float_matrix, el_ldiv); + octave_float_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex_matrix, - octave_float_matrix, el_and); + octave_float_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex_matrix, - octave_float_matrix, el_or); + octave_float_matrix, el_or); INSTALL_BINOP_TI (ti, op_mul_trans, octave_float_complex_matrix, - octave_float_matrix, mul_trans); + octave_float_matrix, mul_trans); INSTALL_BINOP_TI (ti, op_mul_herm, octave_float_complex_matrix, - octave_float_matrix, mul_trans); + octave_float_matrix, mul_trans); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_float_matrix, fcm_fm); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_float_matrix, cm_fm); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_matrix, fcm_m); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_float_matrix, assign); + octave_float_matrix, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, - octave_float_matrix, dbl_assign); + octave_float_matrix, dbl_assign); }
--- a/libinterp/operators/op-fcm-fs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcm-fs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -153,43 +153,60 @@ void install_fcm_fs_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_float_complex_matrix, octave_float_scalar, add); - INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_matrix, octave_float_scalar, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_matrix, octave_float_scalar, mul); - INSTALL_BINOP_TI (ti, op_div, octave_float_complex_matrix, octave_float_scalar, div); - INSTALL_BINOP_TI (ti, op_pow, octave_float_complex_matrix, octave_float_scalar, pow); + INSTALL_BINOP_TI (ti, op_add, octave_float_complex_matrix, octave_float_scalar, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_float_complex_matrix, octave_float_scalar, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_float_complex_matrix, octave_float_scalar, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_float_complex_matrix, octave_float_scalar, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_float_complex_matrix, octave_float_scalar, + pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex_matrix, octave_float_scalar, - ldiv); - INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, octave_float_scalar, lt); - INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, octave_float_scalar, le); - INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, octave_float_scalar, eq); - INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, octave_float_scalar, ge); - INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, octave_float_scalar, gt); - INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, octave_float_scalar, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex_matrix, octave_float_scalar, - el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex_matrix, octave_float_scalar, - el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex_matrix, octave_float_scalar, - el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex_matrix, octave_float_scalar, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex_matrix, octave_float_scalar, - el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex_matrix, octave_float_scalar, - el_or); + ldiv); + INSTALL_BINOP_TI (ti, op_lt, octave_float_complex_matrix, octave_float_scalar, + lt); + INSTALL_BINOP_TI (ti, op_le, octave_float_complex_matrix, octave_float_scalar, + le); + INSTALL_BINOP_TI (ti, op_eq, octave_float_complex_matrix, octave_float_scalar, + eq); + INSTALL_BINOP_TI (ti, op_ge, octave_float_complex_matrix, octave_float_scalar, + ge); + INSTALL_BINOP_TI (ti, op_gt, octave_float_complex_matrix, octave_float_scalar, + gt); + INSTALL_BINOP_TI (ti, op_ne, octave_float_complex_matrix, octave_float_scalar, + ne); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex_matrix, + octave_float_scalar, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex_matrix, + octave_float_scalar, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex_matrix, + octave_float_scalar, + el_pow); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex_matrix, + octave_float_scalar, + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex_matrix, + octave_float_scalar, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex_matrix, + octave_float_scalar, + el_or); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_float_scalar, fcm_fs); INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_float_scalar, cm_fs); INSTALL_CATOP_TI (ti, octave_float_complex_matrix, octave_scalar, fcm_s); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, - octave_float_scalar, assign); + octave_float_scalar, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, - octave_float_scalar, dbl_assign); + octave_float_scalar, dbl_assign); INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_float_complex_matrix, - octave_float_scalar, assign_mul); + octave_float_scalar, assign_mul); INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_float_complex_matrix, - octave_float_scalar, assign_div); + octave_float_scalar, assign_div); }
--- a/libinterp/operators/op-fcs-fcm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcs-fcm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -140,46 +140,60 @@ install_fcs_fcm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_add, octave_float_complex, octave_float_complex_matrix, - add); + add); INSTALL_BINOP_TI (ti, op_sub, octave_float_complex, octave_float_complex_matrix, - sub); + sub); INSTALL_BINOP_TI (ti, op_mul, octave_float_complex, octave_float_complex_matrix, - mul); + mul); INSTALL_BINOP_TI (ti, op_div, octave_float_complex, octave_float_complex_matrix, - div); + div); INSTALL_BINOP_TI (ti, op_pow, octave_float_complex, octave_float_complex_matrix, - pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex, octave_float_complex_matrix, - ldiv); - INSTALL_BINOP_TI (ti, op_lt, octave_float_complex, octave_float_complex_matrix, lt); - INSTALL_BINOP_TI (ti, op_le, octave_float_complex, octave_float_complex_matrix, le); - INSTALL_BINOP_TI (ti, op_eq, octave_float_complex, octave_float_complex_matrix, eq); - INSTALL_BINOP_TI (ti, op_ge, octave_float_complex, octave_float_complex_matrix, ge); - INSTALL_BINOP_TI (ti, op_gt, octave_float_complex, octave_float_complex_matrix, gt); - INSTALL_BINOP_TI (ti, op_ne, octave_float_complex, octave_float_complex_matrix, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_complex_matrix, - el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_complex_matrix, - el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_complex_matrix, - el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex, octave_float_complex_matrix, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_complex_matrix, - el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_complex_matrix, - el_or); + pow); + INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex, + octave_float_complex_matrix, + ldiv); + INSTALL_BINOP_TI (ti, op_lt, octave_float_complex, octave_float_complex_matrix, + lt); + INSTALL_BINOP_TI (ti, op_le, octave_float_complex, octave_float_complex_matrix, + le); + INSTALL_BINOP_TI (ti, op_eq, octave_float_complex, octave_float_complex_matrix, + eq); + INSTALL_BINOP_TI (ti, op_ge, octave_float_complex, octave_float_complex_matrix, + ge); + INSTALL_BINOP_TI (ti, op_gt, octave_float_complex, octave_float_complex_matrix, + gt); + INSTALL_BINOP_TI (ti, op_ne, octave_float_complex, octave_float_complex_matrix, + ne); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, + octave_float_complex_matrix, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, + octave_float_complex_matrix, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, + octave_float_complex_matrix, + el_pow); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex, + octave_float_complex_matrix, + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, + octave_float_complex_matrix, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, + octave_float_complex_matrix, + el_or); - INSTALL_CATOP_TI (ti, octave_float_complex, octave_float_complex_matrix, fcs_fcm); + INSTALL_CATOP_TI (ti, octave_float_complex, octave_float_complex_matrix, + fcs_fcm); INSTALL_CATOP_TI (ti, octave_complex, octave_float_complex_matrix, cs_fcm); INSTALL_CATOP_TI (ti, octave_float_complex, octave_complex_matrix, fcs_cm); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_float_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_float_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_float_complex, octave_float_complex_matrix, - float_complex_matrix_conv); + float_complex_matrix_conv); }
--- a/libinterp/operators/op-fcs-fcs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcs-fcs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -177,35 +177,41 @@ INSTALL_BINOP_TI (ti, op_mul, octave_float_complex, octave_float_complex, mul); INSTALL_BINOP_TI (ti, op_div, octave_float_complex, octave_float_complex, div); INSTALL_BINOP_TI (ti, op_pow, octave_float_complex, octave_float_complex, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex, octave_float_complex, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_float_complex, octave_float_complex, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_float_complex, octave_float_complex, lt); INSTALL_BINOP_TI (ti, op_le, octave_float_complex, octave_float_complex, le); INSTALL_BINOP_TI (ti, op_eq, octave_float_complex, octave_float_complex, eq); INSTALL_BINOP_TI (ti, op_ge, octave_float_complex, octave_float_complex, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_complex, octave_float_complex, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_complex, octave_float_complex, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_complex, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_complex, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_complex, el_pow); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_complex, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_complex, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_complex, + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex, octave_float_complex, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_complex, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_complex, el_or); + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_complex, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_complex, + el_or); INSTALL_CATOP_TI (ti, octave_float_complex, octave_float_complex, fcs_fcs); INSTALL_CATOP_TI (ti, octave_complex, octave_float_complex, cs_fcs); INSTALL_CATOP_TI (ti, octave_float_complex, octave_complex, fcs_cs); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_float_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_float_complex, - octave_complex_matrix); + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_null_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_null_str, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_null_sq_str, - octave_float_complex_matrix); + octave_float_complex_matrix); }
--- a/libinterp/operators/op-fcs-fm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcs-fm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -139,20 +139,25 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_complex, octave_float_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_complex, octave_float_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_complex, octave_float_matrix, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_matrix, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_matrix, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_matrix, el_pow); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_matrix, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_matrix, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_matrix, + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex, octave_float_matrix, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_matrix, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_matrix, el_or); + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_matrix, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_matrix, + el_or); INSTALL_CATOP_TI (ti, octave_float_complex, octave_float_matrix, fcs_fm); INSTALL_CATOP_TI (ti, octave_complex, octave_float_matrix, cs_fm); INSTALL_CATOP_TI (ti, octave_float_complex, octave_matrix, fcs_m); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_float_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_float_matrix, - octave_complex_matrix); + octave_complex_matrix); }
--- a/libinterp/operators/op-fcs-fs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fcs-fs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -149,23 +149,28 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_complex, octave_float_scalar, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_complex, octave_float_scalar, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_complex, octave_float_scalar, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_scalar, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_scalar, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_scalar, el_pow); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_complex, octave_float_scalar, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_complex, octave_float_scalar, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_complex, octave_float_scalar, + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_complex, octave_float_scalar, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_scalar, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_scalar, el_or); + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_complex, octave_float_scalar, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_complex, octave_float_scalar, + el_or); INSTALL_CATOP_TI (ti, octave_float_complex, octave_float_scalar, fcs_fs); INSTALL_CATOP_TI (ti, octave_complex, octave_float_scalar, cs_fs); INSTALL_CATOP_TI (ti, octave_float_complex, octave_scalar, fcs_s); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_float_scalar, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_float_scalar, - octave_complex_matrix); + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_scalar, - octave_float_complex_matrix); + octave_float_complex_matrix); }
--- a/libinterp/operators/op-fdm-fdm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fdm-fdm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -91,19 +91,24 @@ INSTALL_UNOP_TI (ti, op_transpose, octave_float_diag_matrix, transpose); INSTALL_UNOP_TI (ti, op_hermitian, octave_float_diag_matrix, transpose); - INSTALL_BINOP_TI (ti, op_add, octave_float_diag_matrix, octave_float_diag_matrix, - add); - INSTALL_BINOP_TI (ti, op_sub, octave_float_diag_matrix, octave_float_diag_matrix, - sub); - INSTALL_BINOP_TI (ti, op_mul, octave_float_diag_matrix, octave_float_diag_matrix, - mul); - INSTALL_BINOP_TI (ti, op_div, octave_float_diag_matrix, octave_float_diag_matrix, - div); - INSTALL_BINOP_TI (ti, op_ldiv, octave_float_diag_matrix, octave_float_diag_matrix, - ldiv); + INSTALL_BINOP_TI (ti, op_add, octave_float_diag_matrix, + octave_float_diag_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_float_diag_matrix, + octave_float_diag_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_float_diag_matrix, + octave_float_diag_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_float_diag_matrix, + octave_float_diag_matrix, + div); + INSTALL_BINOP_TI (ti, op_ldiv, octave_float_diag_matrix, + octave_float_diag_matrix, + ldiv); INSTALL_ASSIGNCONV_TI (ti, octave_float_diag_matrix, octave_float_matrix, - octave_float_matrix); + octave_float_matrix); INSTALL_WIDENOP_TI (ti, octave_float_diag_matrix, octave_float_matrix, - float_diag_matrix_to_float_matrix); + float_diag_matrix_to_float_matrix); }
--- a/libinterp/operators/op-fm-fcm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fm-fcm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -170,49 +170,60 @@ void install_fm_fcm_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_float_matrix, octave_float_complex_matrix, add); - INSTALL_BINOP_TI (ti, op_sub, octave_float_matrix, octave_float_complex_matrix, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_float_matrix, octave_float_complex_matrix, mul); - INSTALL_BINOP_TI (ti, op_div, octave_float_matrix, octave_float_complex_matrix, div); - INSTALL_BINOP_TI (ti, op_pow, octave_float_matrix, octave_float_complex_matrix, pow); + INSTALL_BINOP_TI (ti, op_add, octave_float_matrix, octave_float_complex_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_float_matrix, octave_float_complex_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_float_matrix, octave_float_complex_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_float_matrix, octave_float_complex_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_float_matrix, octave_float_complex_matrix, + pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_matrix, - octave_float_complex_matrix, ldiv); - INSTALL_BINOP_TI (ti, op_lt, octave_float_matrix, octave_float_complex_matrix, lt); - INSTALL_BINOP_TI (ti, op_le, octave_float_matrix, octave_float_complex_matrix, le); - INSTALL_BINOP_TI (ti, op_eq, octave_float_matrix, octave_float_complex_matrix, eq); - INSTALL_BINOP_TI (ti, op_ge, octave_float_matrix, octave_float_complex_matrix, ge); - INSTALL_BINOP_TI (ti, op_gt, octave_float_matrix, octave_float_complex_matrix, gt); - INSTALL_BINOP_TI (ti, op_ne, octave_float_matrix, octave_float_complex_matrix, ne); + octave_float_complex_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_lt, octave_float_matrix, octave_float_complex_matrix, + lt); + INSTALL_BINOP_TI (ti, op_le, octave_float_matrix, octave_float_complex_matrix, + le); + INSTALL_BINOP_TI (ti, op_eq, octave_float_matrix, octave_float_complex_matrix, + eq); + INSTALL_BINOP_TI (ti, op_ge, octave_float_matrix, octave_float_complex_matrix, + ge); + INSTALL_BINOP_TI (ti, op_gt, octave_float_matrix, octave_float_complex_matrix, + gt); + INSTALL_BINOP_TI (ti, op_ne, octave_float_matrix, octave_float_complex_matrix, + ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_matrix, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_BINOP_TI (ti, op_trans_mul, octave_float_matrix, - octave_float_complex_matrix, trans_mul); + octave_float_complex_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_herm_mul, octave_float_matrix, - octave_float_complex_matrix, trans_mul); + octave_float_complex_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_float_matrix, - octave_float_complex_matrix, trans_ldiv); + octave_float_complex_matrix, trans_ldiv); INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_float_matrix, - octave_float_complex_matrix, trans_ldiv); + octave_float_complex_matrix, trans_ldiv); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_float_complex_matrix, fm_fcm); INSTALL_CATOP_TI (ti, octave_matrix, octave_float_complex_matrix, m_fcm); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_complex_matrix, fm_cm); INSTALL_ASSIGNCONV_TI (ti, octave_float_matrix, octave_float_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_float_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_float_matrix, octave_float_complex_matrix, - float_complex_matrix_conv); + float_complex_matrix_conv); }
--- a/libinterp/operators/op-fm-fcs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fm-fcs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -148,20 +148,25 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_matrix, octave_float_complex, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_matrix, octave_float_complex, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_matrix, octave_float_complex, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, octave_float_complex, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, octave_float_complex, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, octave_float_complex, el_pow); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, octave_float_complex, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, octave_float_complex, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, octave_float_complex, + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_matrix, octave_float_complex, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, octave_float_complex, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, octave_float_complex, el_or); + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, octave_float_complex, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, octave_float_complex, + el_or); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_float_complex, fm_fcs); INSTALL_CATOP_TI (ti, octave_matrix, octave_float_complex, m_fcs); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_complex, fm_cs); INSTALL_ASSIGNCONV_TI (ti, octave_float_matrix, octave_float_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_float_complex, - octave_complex_matrix); + octave_complex_matrix); }
--- a/libinterp/operators/op-fm-fm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fm-fm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -211,55 +211,61 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_matrix, octave_float_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_matrix, octave_float_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_matrix, octave_float_matrix, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, octave_float_matrix, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, octave_float_matrix, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, octave_float_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_matrix, octave_float_matrix, el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, octave_float_matrix, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, octave_float_matrix, el_or); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, octave_float_matrix, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, octave_float_matrix, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, octave_float_matrix, + el_pow); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_matrix, octave_float_matrix, + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, octave_float_matrix, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, octave_float_matrix, + el_or); INSTALL_BINOP_TI (ti, op_el_and_not, octave_float_matrix, octave_float_matrix, - el_and_not); + el_and_not); INSTALL_BINOP_TI (ti, op_el_or_not, octave_float_matrix, octave_float_matrix, - el_or_not); + el_or_not); INSTALL_BINOP_TI (ti, op_el_not_and, octave_float_matrix, octave_float_matrix, - el_not_and); + el_not_and); INSTALL_BINOP_TI (ti, op_el_not_or, octave_float_matrix, octave_float_matrix, - el_not_or); + el_not_or); INSTALL_BINOP_TI (ti, op_trans_mul, octave_float_matrix, octave_float_matrix, - trans_mul); + trans_mul); INSTALL_BINOP_TI (ti, op_mul_trans, octave_float_matrix, octave_float_matrix, - mul_trans); + mul_trans); INSTALL_BINOP_TI (ti, op_herm_mul, octave_float_matrix, octave_float_matrix, - trans_mul); + trans_mul); INSTALL_BINOP_TI (ti, op_mul_herm, octave_float_matrix, octave_float_matrix, - mul_trans); + mul_trans); INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_float_matrix, octave_float_matrix, - trans_ldiv); + trans_ldiv); INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_float_matrix, octave_float_matrix, - trans_ldiv); + trans_ldiv); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_float_matrix, fm_fm); INSTALL_CATOP_TI (ti, octave_matrix, octave_float_matrix, m_fm); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_matrix, fm_m); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, - octave_float_matrix, assign); + octave_float_matrix, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, - octave_float_matrix, dbl_assign); + octave_float_matrix, dbl_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_null_matrix, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_null_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_null_sq_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_float_matrix, octave_float_matrix, - assign_add); + assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_float_matrix, octave_float_matrix, - assign_sub); + assign_sub); INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_float_matrix, octave_float_matrix, - assign_el_mul); + assign_el_mul); INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_float_matrix, octave_float_matrix, - assign_el_div); + assign_el_div); }
--- a/libinterp/operators/op-fm-fs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fm-fs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -145,27 +145,34 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_matrix, octave_float_scalar, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_matrix, octave_float_scalar, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_matrix, octave_float_scalar, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, octave_float_scalar, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, octave_float_scalar, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, octave_float_scalar, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_matrix, octave_float_scalar, el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, octave_float_scalar, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, octave_float_scalar, el_or); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_matrix, octave_float_scalar, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_matrix, octave_float_scalar, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_matrix, octave_float_scalar, + el_pow); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_matrix, octave_float_scalar, + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_matrix, octave_float_scalar, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_matrix, octave_float_scalar, + el_or); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_float_scalar, fm_fs); INSTALL_CATOP_TI (ti, octave_matrix, octave_float_scalar, m_fs); INSTALL_CATOP_TI (ti, octave_float_matrix, octave_scalar, fm_s); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_float_scalar, - assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_float_scalar, dbl_assign); + assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_float_scalar, + dbl_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_float_matrix, octave_float_scalar, - assign_add); + assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_float_matrix, octave_float_scalar, - assign_sub); + assign_sub); INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_float_matrix, octave_float_scalar, - assign_mul); + assign_mul); INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_float_matrix, octave_float_scalar, - assign_div); + assign_div); }
--- a/libinterp/operators/op-fs-fcm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fs-fcm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -145,41 +145,52 @@ void install_fs_fcm_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_float_scalar, octave_float_complex_matrix, add); - INSTALL_BINOP_TI (ti, op_sub, octave_float_scalar, octave_float_complex_matrix, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_float_scalar, octave_float_complex_matrix, mul); - INSTALL_BINOP_TI (ti, op_div, octave_float_scalar, octave_float_complex_matrix, div); - INSTALL_BINOP_TI (ti, op_pow, octave_float_scalar, octave_float_complex_matrix, pow); + INSTALL_BINOP_TI (ti, op_add, octave_float_scalar, octave_float_complex_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_float_scalar, octave_float_complex_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_float_scalar, octave_float_complex_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_float_scalar, octave_float_complex_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_float_scalar, octave_float_complex_matrix, + pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_float_scalar, - octave_float_complex_matrix, ldiv); - INSTALL_BINOP_TI (ti, op_lt, octave_float_scalar, octave_float_complex_matrix, lt); - INSTALL_BINOP_TI (ti, op_le, octave_float_scalar, octave_float_complex_matrix, le); - INSTALL_BINOP_TI (ti, op_eq, octave_float_scalar, octave_float_complex_matrix, eq); - INSTALL_BINOP_TI (ti, op_ge, octave_float_scalar, octave_float_complex_matrix, ge); - INSTALL_BINOP_TI (ti, op_gt, octave_float_scalar, octave_float_complex_matrix, gt); - INSTALL_BINOP_TI (ti, op_ne, octave_float_scalar, octave_float_complex_matrix, ne); + octave_float_complex_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_lt, octave_float_scalar, octave_float_complex_matrix, + lt); + INSTALL_BINOP_TI (ti, op_le, octave_float_scalar, octave_float_complex_matrix, + le); + INSTALL_BINOP_TI (ti, op_eq, octave_float_scalar, octave_float_complex_matrix, + eq); + INSTALL_BINOP_TI (ti, op_ge, octave_float_scalar, octave_float_complex_matrix, + ge); + INSTALL_BINOP_TI (ti, op_gt, octave_float_scalar, octave_float_complex_matrix, + gt); + INSTALL_BINOP_TI (ti, op_ne, octave_float_scalar, octave_float_complex_matrix, + ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_scalar, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_float_complex_matrix, fs_fcm); INSTALL_CATOP_TI (ti, octave_scalar, octave_float_complex_matrix, s_fcm); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_complex_matrix, fs_cm); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_float_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_float_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_float_scalar, octave_float_complex_matrix, - float_complex_matrix_conv); + float_complex_matrix_conv); }
--- a/libinterp/operators/op-fs-fcs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fs-fcs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -151,20 +151,25 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_scalar, octave_float_complex, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_scalar, octave_float_complex, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_scalar, octave_float_complex, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, octave_float_complex, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, octave_float_complex, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, octave_float_complex, el_pow); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, octave_float_complex, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, octave_float_complex, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, octave_float_complex, + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_scalar, octave_float_complex, - el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, octave_float_complex, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, octave_float_complex, el_or); + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, octave_float_complex, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, octave_float_complex, + el_or); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_float_complex, fs_fcs); INSTALL_CATOP_TI (ti, octave_scalar, octave_float_complex, s_fcs); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_complex, fs_cs); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_float_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_float_complex, - octave_complex_matrix); + octave_complex_matrix); }
--- a/libinterp/operators/op-fs-fm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fs-fm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -139,19 +139,25 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_scalar, octave_float_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_scalar, octave_float_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_scalar, octave_float_matrix, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, octave_float_matrix, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, octave_float_matrix, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, octave_float_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_scalar, octave_float_matrix, el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, octave_float_matrix, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, octave_float_matrix, el_or); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, octave_float_matrix, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, octave_float_matrix, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, octave_float_matrix, + el_pow); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_scalar, octave_float_matrix, + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, octave_float_matrix, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, octave_float_matrix, + el_or); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_float_matrix, fs_fm); INSTALL_CATOP_TI (ti, octave_scalar, octave_float_matrix, s_fm); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_matrix, fs_m); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_float_matrix, - octave_float_matrix); + octave_float_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_float_matrix, octave_matrix); INSTALL_WIDENOP_TI (ti, octave_float_scalar, octave_float_matrix, matrix_conv);
--- a/libinterp/operators/op-fs-fs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-fs-fs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -161,25 +161,31 @@ INSTALL_BINOP_TI (ti, op_ge, octave_float_scalar, octave_float_scalar, ge); INSTALL_BINOP_TI (ti, op_gt, octave_float_scalar, octave_float_scalar, gt); INSTALL_BINOP_TI (ti, op_ne, octave_float_scalar, octave_float_scalar, ne); - INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, octave_float_scalar, el_mul); - INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, octave_float_scalar, el_div); - INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, octave_float_scalar, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_scalar, octave_float_scalar, el_ldiv); - INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, octave_float_scalar, el_and); - INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, octave_float_scalar, el_or); + INSTALL_BINOP_TI (ti, op_el_mul, octave_float_scalar, octave_float_scalar, + el_mul); + INSTALL_BINOP_TI (ti, op_el_div, octave_float_scalar, octave_float_scalar, + el_div); + INSTALL_BINOP_TI (ti, op_el_pow, octave_float_scalar, octave_float_scalar, + el_pow); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_float_scalar, octave_float_scalar, + el_ldiv); + INSTALL_BINOP_TI (ti, op_el_and, octave_float_scalar, octave_float_scalar, + el_and); + INSTALL_BINOP_TI (ti, op_el_or, octave_float_scalar, octave_float_scalar, + el_or); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_float_scalar, fs_fs); INSTALL_CATOP_TI (ti, octave_scalar, octave_float_scalar, s_fs); INSTALL_CATOP_TI (ti, octave_float_scalar, octave_scalar, fs_s); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_float_scalar, - octave_float_matrix); + octave_float_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_float_scalar, octave_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_null_matrix, - octave_float_matrix); + octave_float_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_null_str, - octave_float_matrix); + octave_float_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_null_sq_str, - octave_float_matrix); + octave_float_matrix); }
--- a/libinterp/operators/op-m-cm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-m-cm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -158,22 +158,26 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_matrix, octave_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_matrix, octave_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_matrix, octave_complex_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_matrix, octave_complex_matrix, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_matrix, octave_complex_matrix, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_matrix, octave_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_matrix, octave_complex_matrix, el_or); - INSTALL_BINOP_TI (ti, op_trans_mul, octave_matrix, octave_complex_matrix, trans_mul); - INSTALL_BINOP_TI (ti, op_herm_mul, octave_matrix, octave_complex_matrix, trans_mul); + INSTALL_BINOP_TI (ti, op_trans_mul, octave_matrix, octave_complex_matrix, + trans_mul); + INSTALL_BINOP_TI (ti, op_herm_mul, octave_matrix, octave_complex_matrix, + trans_mul); INSTALL_BINOP_TI (ti, op_trans_ldiv, octave_matrix, octave_complex_matrix, - trans_ldiv); + trans_ldiv); INSTALL_BINOP_TI (ti, op_herm_ldiv, octave_matrix, octave_complex_matrix, - trans_ldiv); + trans_ldiv); INSTALL_CATOP_TI (ti, octave_matrix, octave_complex_matrix, m_cm); INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_matrix, octave_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); - INSTALL_WIDENOP_TI (ti, octave_matrix, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP_TI (ti, octave_matrix, octave_complex_matrix, + complex_matrix_conv); }
--- a/libinterp/operators/op-m-cs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-m-cs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -139,7 +139,8 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_complex, m_cs); - INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_complex, octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_complex, + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_matrix, octave_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); }
--- a/libinterp/operators/op-m-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-m-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -203,14 +203,20 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_matrix, m_m); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_matrix, assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_matrix, sgl_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_matrix, + sgl_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_null_matrix, null_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_null_str, null_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_null_sq_str, null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_null_matrix, + null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_null_str, + null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_null_sq_str, + null_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_matrix, octave_matrix, assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_matrix, octave_matrix, assign_sub); - INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_matrix, octave_matrix, assign_el_mul); - INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_matrix, octave_matrix, assign_el_div); + INSTALL_ASSIGNOP_TI (ti, op_el_mul_eq, octave_matrix, octave_matrix, + assign_el_mul); + INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_matrix, octave_matrix, + assign_el_div); }
--- a/libinterp/operators/op-m-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-m-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -145,9 +145,10 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_scalar, m_s); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_scalar, assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_matrix, octave_scalar, + sgl_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_float_complex_matrix, octave_scalar, - clx_sgl_assign); + clx_sgl_assign); INSTALL_ASSIGNOP_TI (ti, op_add_eq, octave_matrix, octave_scalar, assign_add); INSTALL_ASSIGNOP_TI (ti, op_sub_eq, octave_matrix, octave_scalar, assign_sub);
--- a/libinterp/operators/op-m-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-m-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -151,7 +151,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_matrix, octave_sparse_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_matrix, octave_sparse_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_matrix, octave_sparse_complex_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_matrix, octave_sparse_complex_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_matrix, octave_sparse_complex_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_matrix, octave_sparse_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_matrix, octave_sparse_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_matrix, octave_sparse_complex_matrix, eq); @@ -159,23 +160,23 @@ INSTALL_BINOP_TI (ti, op_gt, octave_matrix, octave_sparse_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_matrix, octave_sparse_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_matrix, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_matrix, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_matrix, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_matrix, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_matrix, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_matrix, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_matrix, octave_sparse_complex_matrix, m_scm); INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); }
--- a/libinterp/operators/op-m-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-m-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -146,8 +146,10 @@ INSTALL_BINOP_TI (ti, op_div, octave_matrix, octave_sparse_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_matrix, octave_sparse_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_matrix, octave_sparse_matrix, ldiv); - INSTALL_BINOP_TI (ti, op_mul_trans, octave_matrix, octave_sparse_matrix, mul_trans); - INSTALL_BINOP_TI (ti, op_mul_herm, octave_matrix, octave_sparse_matrix, mul_trans); + INSTALL_BINOP_TI (ti, op_mul_trans, octave_matrix, octave_sparse_matrix, + mul_trans); + INSTALL_BINOP_TI (ti, op_mul_herm, octave_matrix, octave_sparse_matrix, + mul_trans); INSTALL_BINOP_TI (ti, op_lt, octave_matrix, octave_sparse_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_matrix, octave_sparse_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_matrix, octave_sparse_matrix, eq); @@ -167,5 +169,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_sparse_matrix, octave_matrix) INSTALL_WIDENOP_TI (ti, octave_matrix, octave_sparse_matrix, - sparse_matrix_conv); + sparse_matrix_conv); }
--- a/libinterp/operators/op-pm-pm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-pm-pm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -85,5 +85,6 @@ INSTALL_BINOP_TI (ti, op_pow, octave_perm_matrix, octave_scalar, pow); INSTALL_ASSIGNCONV_TI (ti, octave_perm_matrix, octave_matrix, octave_matrix); - INSTALL_WIDENOP_TI (ti, octave_perm_matrix, octave_matrix, perm_matrix_to_matrix); + INSTALL_WIDENOP_TI (ti, octave_perm_matrix, octave_matrix, + perm_matrix_to_matrix); }
--- a/libinterp/operators/op-pm-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-pm-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -95,11 +95,11 @@ install_pm_scm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_mul, octave_perm_matrix, octave_sparse_complex_matrix, - mul_pm_scm); + mul_pm_scm); INSTALL_BINOP_TI (ti, op_ldiv, octave_perm_matrix, octave_sparse_complex_matrix, - ldiv_pm_scm); + ldiv_pm_scm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_perm_matrix, - mul_scm_pm); + mul_scm_pm); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_perm_matrix, - div_scm_pm); + div_scm_pm); }
--- a/libinterp/operators/op-pm-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-pm-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -91,11 +91,11 @@ install_pm_sm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_mul, octave_perm_matrix, octave_sparse_matrix, - mul_pm_sm); + mul_pm_sm); INSTALL_BINOP_TI (ti, op_ldiv, octave_perm_matrix, octave_sparse_matrix, - ldiv_pm_sm); + ldiv_pm_sm); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_perm_matrix, - mul_sm_pm); + mul_sm_pm); INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_perm_matrix, - div_sm_pm); + div_sm_pm); }
--- a/libinterp/operators/op-range.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-range.cc Tue Apr 03 13:52:40 2018 -0700 @@ -108,7 +108,7 @@ INSTALL_BINOP_TI (ti, op_sub, octave_scalar, octave_range, subsr); INSTALL_BINOP_TI (ti, op_mul, octave_range, octave_scalar, mulrs); INSTALL_BINOP_TI (ti, op_mul, octave_scalar, octave_range, mulsr); - + INSTALL_BINOP_TI (ti, op_el_mul, octave_range, octave_scalar, mulrs); INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_range, mulsr); INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_range, el_powsr);
--- a/libinterp/operators/op-s-cm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-s-cm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -135,16 +135,18 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_scalar, octave_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_complex_matrix, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_scalar, octave_complex_matrix, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_scalar, octave_complex_matrix, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_scalar, octave_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_scalar, octave_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_scalar, octave_complex_matrix, s_cm); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); - INSTALL_WIDENOP_TI (ti, octave_scalar, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP_TI (ti, octave_scalar, octave_complex_matrix, + complex_matrix_conv); }
--- a/libinterp/operators/op-s-cs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-s-cs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -150,7 +150,8 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_complex, s_cs); - INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_complex, octave_complex_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_complex, + octave_complex_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); }
--- a/libinterp/operators/op-s-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-s-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -133,7 +133,8 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_matrix, s_m); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_matrix, octave_matrix); - INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_matrix, octave_float_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_matrix, + octave_float_matrix); INSTALL_WIDENOP_TI (ti, octave_scalar, octave_matrix, matrix_conv); }
--- a/libinterp/operators/op-s-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-s-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -169,7 +169,8 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_scalar, s_s); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_scalar, octave_matrix); - INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_scalar, octave_float_matrix); + INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_scalar, + octave_float_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_null_matrix, octave_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_null_str, octave_matrix);
--- a/libinterp/operators/op-s-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-s-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -155,7 +155,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_scalar, octave_sparse_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_scalar, octave_sparse_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_scalar, octave_sparse_complex_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_scalar, octave_sparse_complex_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_scalar, octave_sparse_complex_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_scalar, octave_sparse_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_scalar, octave_sparse_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_scalar, octave_sparse_complex_matrix, eq); @@ -163,23 +164,23 @@ INSTALL_BINOP_TI (ti, op_gt, octave_scalar, octave_sparse_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_scalar, octave_sparse_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_scalar, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_scalar, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_scalar, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_scalar, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_scalar, octave_sparse_complex_matrix, s_scm); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); }
--- a/libinterp/operators/op-s-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-s-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -162,5 +162,6 @@ INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_sparse_matrix, octave_matrix); - INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_matrix, sparse_matrix_conv); + INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_matrix, + sparse_matrix_conv); }
--- a/libinterp/operators/op-sbm-b.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sbm-b.cc Tue Apr 03 13:52:40 2018 -0700 @@ -112,33 +112,43 @@ INSTALL_BINOP_TI (ti, op_eq, octave_sparse_bool_matrix, octave_bool, eq); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_bool_matrix, octave_bool, ne); - INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_bool_matrix, octave_bool, el_and); + INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_bool_matrix, octave_bool, + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_bool_matrix, octave_bool, el_or); INSTALL_CATOP_TI (ti, octave_sparse_bool_matrix, octave_bool, sbm_b); INSTALL_CATOP_TI (ti, octave_sparse_bool_matrix, octave_scalar, sbm_s); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_bool, sm_b); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_bool, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_bool, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_scalar, - conv_and_assign); + conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int8_scalar, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int16_scalar, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int32_scalar, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int64_scalar, - conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int8_scalar, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int16_scalar, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int32_scalar, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int64_scalar, + conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint8_scalar, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint16_scalar, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint32_scalar, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint64_scalar, - conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint8_scalar, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint16_scalar, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint32_scalar, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint64_scalar, + conv_and_assign); }
--- a/libinterp/operators/op-sbm-bm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sbm-bm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -119,52 +119,63 @@ INSTALL_BINOP_TI (ti, op_ne, octave_sparse_bool_matrix, octave_bool_matrix, ne); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_bool_matrix, octave_bool_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_bool_matrix, octave_bool_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_sparse_bool_matrix, octave_bool_matrix, sbm_bm); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_bool_matrix, sm_bm); INSTALL_CATOP_TI (ti, octave_sparse_bool_matrix, octave_matrix, sbm_m); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, - octave_bool_matrix, assign); + octave_bool_matrix, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_matrix, - conv_and_assign); + conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, - octave_char_matrix_str, conv_and_assign); + octave_char_matrix_str, conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, - octave_char_matrix_sq_str, conv_and_assign); + octave_char_matrix_sq_str, conv_and_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_range, - conv_and_assign); + conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_sparse_matrix, - conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_sparse_matrix, + conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int8_matrix, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int16_matrix, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int32_matrix, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_int64_matrix, - conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int8_matrix, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int16_matrix, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int32_matrix, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_int64_matrix, + conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint8_matrix, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint16_matrix, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint32_matrix, - conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_uint64_matrix, - conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint8_matrix, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint16_matrix, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint32_matrix, + conv_and_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_uint64_matrix, + conv_and_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_null_matrix, - null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_null_matrix, + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_null_str, - null_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_null_sq_str, - null_assign); + null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, + octave_null_sq_str, + null_assign); }
--- a/libinterp/operators/op-sbm-sbm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sbm-sbm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -88,20 +88,20 @@ INSTALL_UNOP_TI (ti, op_hermitian, octave_sparse_bool_matrix, transpose); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, eq); + octave_sparse_bool_matrix, eq); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, ne); + octave_sparse_bool_matrix, ne); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, el_and); + octave_sparse_bool_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, el_or); + octave_sparse_bool_matrix, el_or); INSTALL_CATOP_TI (ti, octave_sparse_bool_matrix, octave_sparse_bool_matrix, - sbm_sbm); + sbm_sbm); INSTALL_CATOP_TI (ti, octave_sparse_bool_matrix, octave_sparse_matrix, sbm_sm); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_sparse_bool_matrix, sm_sbm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, assign); + octave_sparse_bool_matrix, assign); }
--- a/libinterp/operators/op-scm-cm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-scm-cm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -160,49 +160,49 @@ install_scm_cm_ops (octave::type_info& ti) { INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, - octave_complex_matrix, add); + octave_complex_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, - octave_complex_matrix, sub); + octave_complex_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, - octave_complex_matrix, mul); + octave_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, - octave_complex_matrix, div); + octave_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, - octave_complex_matrix, pow); + octave_complex_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, - octave_complex_matrix, ldiv); + octave_complex_matrix, ldiv); INSTALL_BINOP_TI (ti, op_trans_mul, octave_sparse_complex_matrix, - octave_complex_matrix, trans_mul); + octave_complex_matrix, trans_mul); INSTALL_BINOP_TI (ti, op_herm_mul, octave_sparse_complex_matrix, - octave_complex_matrix, herm_mul); + octave_complex_matrix, herm_mul); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_complex_matrix, - octave_complex_matrix, lt); + octave_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_complex_matrix, - octave_complex_matrix, le); + octave_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_complex_matrix, - octave_complex_matrix, eq); + octave_complex_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_sparse_complex_matrix, - octave_complex_matrix, ge); + octave_complex_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_sparse_complex_matrix, - octave_complex_matrix, gt); + octave_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_complex_matrix, - octave_complex_matrix, ne); + octave_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_complex_matrix, - octave_complex_matrix, el_mul); + octave_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_complex_matrix, - octave_complex_matrix, el_div); + octave_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_complex_matrix, - octave_complex_matrix, el_pow); + octave_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_complex_matrix, - octave_complex_matrix, el_ldiv); + octave_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_complex_matrix, - octave_complex_matrix, el_and); + octave_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_complex_matrix, - octave_complex_matrix, el_or); + octave_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, - octave_complex_matrix, scm_cm); + octave_complex_matrix, scm_cm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, - octave_complex_matrix, assign); + octave_complex_matrix, assign); }
--- a/libinterp/operators/op-scm-cs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-scm-cs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -161,13 +161,18 @@ void install_scm_cs_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, octave_complex, add); - INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_complex, sub); - INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_complex, mul); - INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_complex, div); - INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, octave_complex, pow); + INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, octave_complex, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_complex, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_complex, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_complex, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, octave_complex, + pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, octave_complex, - ldiv); + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_complex_matrix, octave_complex, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_complex_matrix, octave_complex, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_complex_matrix, octave_complex, eq); @@ -175,20 +180,21 @@ INSTALL_BINOP_TI (ti, op_gt, octave_sparse_complex_matrix, octave_complex, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_complex_matrix, octave_complex, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_complex_matrix, octave_complex, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_complex_matrix, octave_complex, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_complex_matrix, octave_complex, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_complex_matrix, octave_complex, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_complex_matrix, octave_complex, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_complex_matrix, octave_complex, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, octave_complex, scm_cs); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_complex, - assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, + octave_complex, + assign); }
--- a/libinterp/operators/op-scm-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-scm-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -156,7 +156,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, octave_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, octave_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, octave_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_complex_matrix, octave_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_complex_matrix, octave_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_complex_matrix, octave_matrix, eq); @@ -164,20 +165,20 @@ INSTALL_BINOP_TI (ti, op_gt, octave_sparse_complex_matrix, octave_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_complex_matrix, octave_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_complex_matrix, octave_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_complex_matrix, octave_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_complex_matrix, octave_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_complex_matrix, octave_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_complex_matrix, octave_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_complex_matrix, octave_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, octave_matrix, scm_m); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_matrix, - assign); + assign); }
--- a/libinterp/operators/op-scm-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-scm-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -173,7 +173,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_scalar, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_scalar, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, octave_scalar, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, octave_scalar, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, octave_scalar, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_complex_matrix, octave_scalar, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_complex_matrix, octave_scalar, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_complex_matrix, octave_scalar, eq); @@ -181,20 +182,20 @@ INSTALL_BINOP_TI (ti, op_gt, octave_sparse_complex_matrix, octave_scalar, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_complex_matrix, octave_scalar, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_complex_matrix, octave_scalar, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_complex_matrix, octave_scalar, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_complex_matrix, octave_scalar, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_complex_matrix, octave_scalar, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_complex_matrix, octave_scalar, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_complex_matrix, octave_scalar, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, octave_scalar, scm_s); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_scalar, - assign); + assign); }
--- a/libinterp/operators/op-scm-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-scm-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -202,52 +202,52 @@ #endif INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, add); + octave_sparse_complex_matrix, add); INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, sub); + octave_sparse_complex_matrix, sub); INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, mul); + octave_sparse_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, div); + octave_sparse_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, pow); + octave_sparse_complex_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, ldiv); + octave_sparse_complex_matrix, ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, lt); + octave_sparse_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, le); + octave_sparse_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, eq); + octave_sparse_complex_matrix, eq); INSTALL_BINOP_TI (ti, op_ge, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, ge); + octave_sparse_complex_matrix, ge); INSTALL_BINOP_TI (ti, op_gt, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, gt); + octave_sparse_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, ne); + octave_sparse_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_mul); + octave_sparse_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_div); + octave_sparse_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_pow); + octave_sparse_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_ldiv); + octave_sparse_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_and); + octave_sparse_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_or); + octave_sparse_complex_matrix, el_or); INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, scm_scm); + octave_sparse_complex_matrix, scm_scm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, assign); + octave_sparse_complex_matrix, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, - octave_null_matrix, null_assign); + octave_null_matrix, null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, - octave_null_str, null_assign); + octave_null_str, null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, - octave_null_sq_str, null_assign); + octave_null_sq_str, null_assign); }
--- a/libinterp/operators/op-scm-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-scm-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -137,45 +137,52 @@ void install_scm_sm_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, octave_sparse_matrix, - add); - INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_sparse_matrix, - sub); - INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_sparse_matrix, - mul); - INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_sparse_matrix, - div); - INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, octave_sparse_matrix, - pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, octave_sparse_matrix, - ldiv); + INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, + octave_sparse_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, + octave_sparse_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, + octave_sparse_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, + octave_sparse_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_sparse_complex_matrix, + octave_sparse_matrix, + pow); + INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_complex_matrix, + octave_sparse_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_complex_matrix, octave_sparse_matrix, - lt); + lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_complex_matrix, octave_sparse_matrix, - le); + le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_complex_matrix, octave_sparse_matrix, - eq); + eq); INSTALL_BINOP_TI (ti, op_ge, octave_sparse_complex_matrix, octave_sparse_matrix, - ge); + ge); INSTALL_BINOP_TI (ti, op_gt, octave_sparse_complex_matrix, octave_sparse_matrix, - gt); + gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_complex_matrix, octave_sparse_matrix, - ne); + ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_complex_matrix, - octave_sparse_matrix, el_mul); + octave_sparse_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_complex_matrix, - octave_sparse_matrix, el_div); + octave_sparse_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_complex_matrix, - octave_sparse_matrix, el_pow); + octave_sparse_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_complex_matrix, - octave_sparse_matrix, el_ldiv); + octave_sparse_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_complex_matrix, - octave_sparse_matrix, el_and); + octave_sparse_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_complex_matrix, - octave_sparse_matrix, el_or); + octave_sparse_matrix, el_or); - INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, octave_sparse_matrix, scm_sm); + INSTALL_CATOP_TI (ti, octave_sparse_complex_matrix, octave_sparse_matrix, + scm_sm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, - octave_sparse_matrix, assign); + octave_sparse_matrix, assign); }
--- a/libinterp/operators/op-sm-cm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sm-cm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -154,7 +154,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_complex_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_complex_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_complex_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_complex_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_complex_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_matrix, octave_complex_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_matrix, octave_complex_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_matrix, octave_complex_matrix, eq); @@ -162,23 +163,23 @@ INSTALL_BINOP_TI (ti, op_gt, octave_sparse_matrix, octave_complex_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_matrix, octave_complex_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_matrix, octave_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_matrix, octave_complex_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_matrix, octave_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_matrix, octave_complex_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, octave_complex_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_complex_matrix, sm_cm); INSTALL_ASSIGNCONV_TI (ti, octave_sparse_matrix, octave_complex_matrix, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_sparse_matrix, octave_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); }
--- a/libinterp/operators/op-sm-cs.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sm-cs.cc Tue Apr 03 13:52:40 2018 -0700 @@ -160,12 +160,13 @@ INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_matrix, octave_complex, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_matrix, octave_complex, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_matrix, octave_complex, el_pow); - INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_complex, el_ldiv); + INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_complex, + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_matrix, octave_complex, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, octave_complex, el_or); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_complex, sm_cs); INSTALL_ASSIGNCONV_TI (ti, octave_sparse_matrix, octave_complex, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); }
--- a/libinterp/operators/op-sm-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sm-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -149,8 +149,10 @@ INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_matrix, pow); INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_matrix, ldiv); - INSTALL_BINOP_TI (ti, op_trans_mul, octave_sparse_matrix, octave_matrix, trans_mul); - INSTALL_BINOP_TI (ti, op_herm_mul, octave_sparse_matrix, octave_matrix, trans_mul); + INSTALL_BINOP_TI (ti, op_trans_mul, octave_sparse_matrix, octave_matrix, + trans_mul); + INSTALL_BINOP_TI (ti, op_herm_mul, octave_sparse_matrix, octave_matrix, + trans_mul); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_matrix, octave_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_matrix, octave_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_matrix, octave_matrix, eq); @@ -166,5 +168,6 @@ INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_matrix, sm_m); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_matrix, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_matrix, + assign); }
--- a/libinterp/operators/op-sm-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sm-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -178,5 +178,6 @@ INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_scalar, sm_s); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_scalar, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_scalar, + assign); }
--- a/libinterp/operators/op-sm-scm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sm-scm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -143,48 +143,55 @@ void install_sm_scm_ops (octave::type_info& ti) { - INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_sparse_complex_matrix, - add); - INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_sparse_complex_matrix, - sub); - INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_sparse_complex_matrix, - mul); - INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_sparse_complex_matrix, - div); - INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_sparse_complex_matrix, - pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_sparse_complex_matrix, - ldiv); + INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, + octave_sparse_complex_matrix, + add); + INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, + octave_sparse_complex_matrix, + sub); + INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, + octave_sparse_complex_matrix, + mul); + INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, + octave_sparse_complex_matrix, + div); + INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, + octave_sparse_complex_matrix, + pow); + INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, + octave_sparse_complex_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_matrix, octave_sparse_complex_matrix, - lt); + lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_matrix, octave_sparse_complex_matrix, - le); + le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_matrix, octave_sparse_complex_matrix, - eq); + eq); INSTALL_BINOP_TI (ti, op_ge, octave_sparse_matrix, octave_sparse_complex_matrix, - ge); + ge); INSTALL_BINOP_TI (ti, op_gt, octave_sparse_matrix, octave_sparse_complex_matrix, - gt); + gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_matrix, octave_sparse_complex_matrix, - ne); + ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_matrix, - octave_sparse_complex_matrix, el_mul); + octave_sparse_complex_matrix, el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_matrix, - octave_sparse_complex_matrix, el_div); + octave_sparse_complex_matrix, el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_matrix, - octave_sparse_complex_matrix, el_pow); + octave_sparse_complex_matrix, el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, - octave_sparse_complex_matrix, el_ldiv); + octave_sparse_complex_matrix, el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_matrix, - octave_sparse_complex_matrix, el_and); + octave_sparse_complex_matrix, el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, - octave_sparse_complex_matrix, el_or); + octave_sparse_complex_matrix, el_or); - INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_sparse_complex_matrix, sm_scm); + INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_sparse_complex_matrix, + sm_scm); INSTALL_ASSIGNCONV_TI (ti, octave_sparse_matrix, octave_sparse_complex_matrix, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); INSTALL_WIDENOP_TI (ti, octave_sparse_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); }
--- a/libinterp/operators/op-sm-sm.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-sm-sm.cc Tue Apr 03 13:52:40 2018 -0700 @@ -169,7 +169,8 @@ INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_sparse_matrix, mul); INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_sparse_matrix, div); INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_sparse_matrix, pow); - INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_sparse_matrix, ldiv); + INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_sparse_matrix, + ldiv); INSTALL_BINOP_TI (ti, op_lt, octave_sparse_matrix, octave_sparse_matrix, lt); INSTALL_BINOP_TI (ti, op_le, octave_sparse_matrix, octave_sparse_matrix, le); INSTALL_BINOP_TI (ti, op_eq, octave_sparse_matrix, octave_sparse_matrix, eq); @@ -177,27 +178,27 @@ INSTALL_BINOP_TI (ti, op_gt, octave_sparse_matrix, octave_sparse_matrix, gt); INSTALL_BINOP_TI (ti, op_ne, octave_sparse_matrix, octave_sparse_matrix, ne); INSTALL_BINOP_TI (ti, op_el_mul, octave_sparse_matrix, octave_sparse_matrix, - el_mul); + el_mul); INSTALL_BINOP_TI (ti, op_el_div, octave_sparse_matrix, octave_sparse_matrix, - el_div); + el_div); INSTALL_BINOP_TI (ti, op_el_pow, octave_sparse_matrix, octave_sparse_matrix, - el_pow); + el_pow); INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_sparse_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP_TI (ti, op_el_and, octave_sparse_matrix, octave_sparse_matrix, - el_and); + el_and); INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, octave_sparse_matrix, - el_or); + el_or); INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_sparse_matrix, sm_sm); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_sparse_matrix, - assign); + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_null_matrix, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_null_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_null_sq_str, - null_assign); + null_assign); }
--- a/libinterp/operators/op-str-m.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-str-m.cc Tue Apr 03 13:52:40 2018 -0700 @@ -53,9 +53,10 @@ void install_str_m_ops (octave::type_info& ti) { - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_matrix, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_matrix, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, octave_matrix, - assign); + assign); INSTALL_CATOP_TI (ti, octave_char_matrix_str, octave_matrix, str_m); INSTALL_CATOP_TI (ti, octave_char_matrix_sq_str, octave_matrix, str_m);
--- a/libinterp/operators/op-str-s.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-str-s.cc Tue Apr 03 13:52:40 2018 -0700 @@ -53,9 +53,10 @@ void install_str_s_ops (octave::type_info& ti) { - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_scalar, assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_scalar, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, octave_scalar, - assign); + assign); INSTALL_CATOP_TI (ti, octave_char_matrix_str, octave_scalar, str_s); INSTALL_CATOP_TI (ti, octave_char_matrix_sq_str, octave_scalar, str_s);
--- a/libinterp/operators/op-str-str.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/operators/op-str-str.cc Tue Apr 03 13:52:40 2018 -0700 @@ -118,69 +118,99 @@ INSTALL_UNOP_TI (ti, op_hermitian, octave_char_matrix_str, transpose); INSTALL_UNOP_TI (ti, op_hermitian, octave_char_matrix_sq_str, transpose); - INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_str, octave_char_matrix_str, lt); - INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_str, octave_char_matrix_sq_str, lt); - INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_sq_str, octave_char_matrix_str, lt); - INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_sq_str, octave_char_matrix_sq_str, - lt); + INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_str, octave_char_matrix_str, + lt); + INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_str, octave_char_matrix_sq_str, + lt); + INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_sq_str, octave_char_matrix_str, + lt); + INSTALL_BINOP_TI (ti, op_lt, octave_char_matrix_sq_str, + octave_char_matrix_sq_str, + lt); - INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_str, octave_char_matrix_str, le); - INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_str, octave_char_matrix_sq_str, le); - INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_sq_str, octave_char_matrix_str, le); - INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_sq_str, octave_char_matrix_sq_str, - le); + INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_str, octave_char_matrix_str, + le); + INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_str, octave_char_matrix_sq_str, + le); + INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_sq_str, octave_char_matrix_str, + le); + INSTALL_BINOP_TI (ti, op_le, octave_char_matrix_sq_str, + octave_char_matrix_sq_str, + le); - INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_str, octave_char_matrix_str, eq); - INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_str, octave_char_matrix_sq_str, eq); - INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_sq_str, octave_char_matrix_str, eq); - INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_sq_str, octave_char_matrix_sq_str, - eq); + INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_str, octave_char_matrix_str, + eq); + INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_str, octave_char_matrix_sq_str, + eq); + INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_sq_str, octave_char_matrix_str, + eq); + INSTALL_BINOP_TI (ti, op_eq, octave_char_matrix_sq_str, + octave_char_matrix_sq_str, + eq); - INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_str, octave_char_matrix_str, ge); - INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_str, octave_char_matrix_sq_str, ge); - INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_sq_str, octave_char_matrix_str, ge); - INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_sq_str, octave_char_matrix_sq_str, - ge); + INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_str, octave_char_matrix_str, + ge); + INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_str, octave_char_matrix_sq_str, + ge); + INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_sq_str, octave_char_matrix_str, + ge); + INSTALL_BINOP_TI (ti, op_ge, octave_char_matrix_sq_str, + octave_char_matrix_sq_str, + ge); - INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_str, octave_char_matrix_str, gt); - INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_str, octave_char_matrix_sq_str, gt); - INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_sq_str, octave_char_matrix_str, gt); - INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_sq_str, octave_char_matrix_sq_str, - gt); + INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_str, octave_char_matrix_str, + gt); + INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_str, octave_char_matrix_sq_str, + gt); + INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_sq_str, octave_char_matrix_str, + gt); + INSTALL_BINOP_TI (ti, op_gt, octave_char_matrix_sq_str, + octave_char_matrix_sq_str, + gt); - INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_str, octave_char_matrix_str, ne); - INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_str, octave_char_matrix_sq_str, ne); - INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_sq_str, octave_char_matrix_str, ne); - INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_sq_str, octave_char_matrix_sq_str, - ne); + INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_str, octave_char_matrix_str, + ne); + INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_str, octave_char_matrix_sq_str, + ne); + INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_sq_str, octave_char_matrix_str, + ne); + INSTALL_BINOP_TI (ti, op_ne, octave_char_matrix_sq_str, + octave_char_matrix_sq_str, + ne); INSTALL_CATOP_TI (ti, octave_char_matrix_str, octave_char_matrix_str, str_str); - INSTALL_CATOP_TI (ti, octave_char_matrix_str, octave_char_matrix_sq_str, str_str); - INSTALL_CATOP_TI (ti, octave_char_matrix_sq_str, octave_char_matrix_str, str_str); - INSTALL_CATOP_TI (ti, octave_char_matrix_sq_str, octave_char_matrix_sq_str, str_str); + INSTALL_CATOP_TI (ti, octave_char_matrix_str, octave_char_matrix_sq_str, + str_str); + INSTALL_CATOP_TI (ti, octave_char_matrix_sq_str, octave_char_matrix_str, + str_str); + INSTALL_CATOP_TI (ti, octave_char_matrix_sq_str, octave_char_matrix_sq_str, + str_str); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_char_matrix_str, - assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, - octave_char_matrix_sq_str, - assign); + octave_char_matrix_str, + assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, + octave_char_matrix_sq_str, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, - octave_char_matrix_str, - assign); + octave_char_matrix_str, + assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, - octave_char_matrix_sq_str, assign); + octave_char_matrix_sq_str, assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_null_matrix, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_null_str, - null_assign); + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_str, octave_null_sq_str, - null_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, octave_null_matrix, - null_assign); + null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, + octave_null_matrix, + null_assign); INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, octave_null_str, - null_assign); - INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, octave_null_sq_str, - null_assign); + null_assign); + INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_char_matrix_sq_str, + octave_null_sq_str, + null_assign); }
--- a/libinterp/parse-tree/bp-table.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/bp-table.cc Tue Apr 03 13:52:40 2018 -0700 @@ -243,12 +243,12 @@ } enum dbstop_args - { - dbstop_in, - dbstop_at, - dbstop_if, - dbstop_none - }; + { + dbstop_in, + dbstop_at, + dbstop_if, + dbstop_none + }; // Parse parameters (args) of dbstop and dbclear commands. // For dbstop, who=="dbstop"; for dbclear, who=="dbclear". @@ -587,7 +587,7 @@ } octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () - || Vdebugging; + || Vdebugging; return retval; } @@ -684,7 +684,7 @@ } octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () - || Vdebugging; + || Vdebugging; return retval; } @@ -719,7 +719,7 @@ "unable to find function %s\n", fname.c_str ()); octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () - || Vdebugging; + || Vdebugging; return retval; } @@ -736,7 +736,7 @@ } octave::tree_evaluator::debug_mode = bp_table::have_breakpoints () - || Vdebugging; + || Vdebugging; } std::string find_bkpt_list (octave_value_list slist, std::string match)
--- a/libinterp/parse-tree/comment-list.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/comment-list.h Tue Apr 03 13:52:40 2018 -0700 @@ -43,14 +43,14 @@ public: enum comment_type - { - unknown, - block, - full_line, - end_of_line, - doc_string, - copyright - }; + { + unknown, + block, + full_line, + end_of_line, + doc_string, + copyright + }; comment_elt (const std::string& s = "", comment_type t = unknown) : m_text (s), m_type (t) { }
--- a/libinterp/parse-tree/jit-ir.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/jit-ir.h Tue Apr 03 13:52:40 2018 -0700 @@ -1186,7 +1186,7 @@ jit_call (const jit_operation& aoperation, jit_value * arg1, Args... other_args) : jit_instruction (arg1, other_args...), m_operation (aoperation) - { } + { } template <typename ...Args> jit_call (const jit_operation& (*aoperation) (void), @@ -1249,10 +1249,10 @@ // Which variable is the error check for? enum variable - { - var_error_state, - var_interrupt - }; + { + var_error_state, + var_interrupt + }; static std::string variable_to_string (variable v);
--- a/libinterp/parse-tree/jit-typeinfo.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/jit-typeinfo.cc Tue Apr 03 13:52:40 2018 -0700 @@ -303,7 +303,7 @@ { // this code is similar to idx_vector::fill, but we avoid allocating an // idx_vector and its associated rep - octave_idx_type start = static_cast<octave_idx_type> (index->m_base) - 1; + octave_idx_type start = static_cast<octave_idx_type> (index->m_base)-1; octave_idx_type step = static_cast<octave_idx_type> (index->m_inc); octave_idx_type nelem = index->m_nelem; octave_idx_type final = start + nelem * step; @@ -500,18 +500,18 @@ std::ostream& operator<< (std::ostream& os, const jit_matrix& mat) { - return os << "Matrix[" << mat.m_ref_count << ", " << mat.m_slice_data << ", " - << mat.m_slice_len << ", " << mat.m_dimensions << ", " - << mat.m_array << ']'; + return os << "Matrix[" << mat.m_ref_count << ", " + << mat.m_slice_data << ", " << mat.m_slice_len << ", " + << mat.m_dimensions << ", " << mat.m_array << ']'; } // -------------------- jit_type -------------------- jit_type::jit_type (const std::string& aname, jit_type *aparent, - llvm::Type *allvm_type, bool askip_paren, int aid) : - m_name (aname), m_parent (aparent), m_llvm_type (allvm_type), m_id (aid), - m_depth (aparent ? aparent->m_depth + 1 : 0), m_skip_paren (askip_paren) + llvm::Type *allvm_type, bool askip_paren, int aid) + : m_name (aname), m_parent (aparent), m_llvm_type (allvm_type), m_id (aid), + m_depth (aparent ? aparent->m_depth + 1 : 0), m_skip_paren (askip_paren) { std::memset (m_sret, 0, sizeof (m_sret)); std::memset (m_pointer_arg, 0, sizeof (m_pointer_arg)); @@ -570,8 +570,8 @@ jit_convention::type acall_conv, const llvm::Twine& aname, jit_type *aresult, const std::vector<jit_type *>& aargs) - : m_module (amodule), m_result (aresult), m_args (aargs), m_call_conv (acall_conv), - m_can_error (false) + : m_module (amodule), m_result (aresult), m_args (aargs), + m_call_conv (acall_conv), m_can_error (false) { llvm::SmallVector<llvm::Type *, 15> llvm_args; @@ -617,19 +617,21 @@ #if defined (FUNCTION_ADDFNATTR_ARG_IS_ATTRIBUTES) m_llvm_function->addFnAttr (llvm::Attributes::AlwaysInline); #else - m_llvm_function->addFnAttr (llvm::Attribute::AlwaysInline); + m_llvm_function->addFnAttr (llvm::Attribute::AlwaysInline); #endif } jit_function::jit_function (const jit_function& fn, jit_type *aresult, const std::vector<jit_type *>& aargs) - : m_module (fn.m_module), m_llvm_function (fn.m_llvm_function), m_result (aresult), - m_args (aargs), m_call_conv (fn.m_call_conv), m_can_error (fn.m_can_error) + : m_module (fn.m_module), m_llvm_function (fn.m_llvm_function), + m_result (aresult), m_args (aargs), m_call_conv (fn.m_call_conv), + m_can_error (fn.m_can_error) { } jit_function::jit_function (const jit_function& fn) - : m_module (fn.m_module), m_llvm_function (fn.m_llvm_function), m_result (fn.m_result), - m_args (fn.m_args), m_call_conv (fn.m_call_conv), m_can_error (fn.m_can_error) + : m_module (fn.m_module), m_llvm_function (fn.m_llvm_function), + m_result (fn.m_result), m_args (fn.m_args), m_call_conv (fn.m_call_conv), + m_can_error (fn.m_can_error) { } void @@ -686,7 +688,7 @@ llvm::Function *parent = insert_block->getParent (); assert (parent); - // we insert allocas inside the prelude block to prevent stack overflows + // Insert allocas inside the prelude block to prevent stack overflows llvm::BasicBlock& prelude = parent->getEntryBlock (); llvm::IRBuilder<> pre_builder (&prelude, prelude.begin ()); @@ -879,7 +881,8 @@ numel = std::max (numel, static_cast<octave_idx_type>(2)); Array<octave_idx_type> idx (dim_vector (1, numel)); - for (octave_idx_type i = 0; i < static_cast<octave_idx_type> (types.size ()); + for (octave_idx_type i = 0; + i < static_cast<octave_idx_type> (types.size ()); ++i) idx(i) = types[i]->type_id (); @@ -961,7 +964,8 @@ llvm::Value * jit_index_operation::create_arg_array (llvm::IRBuilderD& builder, - const jit_function& fn, size_t start_idx, + const jit_function& fn, + size_t start_idx, size_t end_idx) const { size_t n = end_idx - start_idx; @@ -982,10 +986,8 @@ // -------------------- jit_paren_subsref -------------------- jit_paren_subsref::jit_paren_subsref (const jit_typeinfo& ti) - : jit_index_operation (ti, "()subsref"), - m_paren_scalar (nullptr) - { - } + : jit_index_operation (ti, "()subsref"), m_paren_scalar (nullptr) + { } jit_paren_subsref::~jit_paren_subsref (void) { @@ -1037,8 +1039,7 @@ // -------------------- jit_paren_subsasgn -------------------- jit_paren_subsasgn::jit_paren_subsasgn (const jit_typeinfo& ti) - : jit_index_operation (ti, "()subsasgn"), - m_paren_scalar (nullptr) + : jit_index_operation (ti, "()subsasgn"), m_paren_scalar (nullptr) { } jit_paren_subsasgn::~jit_paren_subsasgn (void) @@ -1143,7 +1144,8 @@ m_create_undef_fn ("create_undef"), m_base_jit_module (new jit_module ("octaveJITBaseModule")), m_builder_ptr (new llvm::IRBuilderD (context)), - m_builder (*m_builder_ptr) // FIXME: Use a pointer directly in the constructor, and get rid of this + // FIXME: Use a pointer directly in the constructor, and get rid of this + m_builder (*m_builder_ptr) { s_in_construction = true; @@ -1157,7 +1159,8 @@ m_any_t = llvm::StructType::create (context, "octave_base_value"); m_any_t = m_any_t->getPointerTo (); m_any = do_register_new_type ("any", nullptr, m_any_t); - m_any_ptr = do_register_new_type ("any_ptr", nullptr, m_any_t->getPointerTo ()); + m_any_ptr = do_register_new_type ("any_ptr", nullptr, + m_any_t->getPointerTo ()); // jit_types: "scalar" < "complex" < "any" // and: "scalar_ptr" < (nullptr) @@ -1167,17 +1170,22 @@ m_complex_t = llvm::ArrayType::get (m_scalar_t, 2); m_complex = do_register_new_type ("complex", m_any, m_complex_t); m_scalar = do_register_new_type ("scalar", m_complex, m_scalar_t); - m_scalar_ptr = do_register_new_type ("scalar_ptr", nullptr, m_scalar_t->getPointerTo ()); + m_scalar_ptr = do_register_new_type ("scalar_ptr", nullptr, + m_scalar_t->getPointerTo ()); // jit_type: "bool" < "any" m_bool_t = llvm::Type::getInt1Ty (context); m_boolean = do_register_new_type ("bool", m_any, m_bool_t); // jit_types: "int8", "int16", "int32", "int64" < "any" - m_ints[ 8] = do_register_new_type ("int8", m_any, llvm::Type::getIntNTy (context, 8)); - m_ints[16] = do_register_new_type ("int16", m_any, llvm::Type::getIntNTy (context, 16)); - m_ints[32] = do_register_new_type ("int32", m_any, llvm::Type::getIntNTy (context, 32)); - m_ints[64] = do_register_new_type ("int64", m_any, llvm::Type::getIntNTy (context, 64)); + m_ints[ 8] = do_register_new_type ("int8", m_any, + llvm::Type::getIntNTy (context, 8)); + m_ints[16] = do_register_new_type ("int16", m_any, + llvm::Type::getIntNTy (context, 16)); + m_ints[32] = do_register_new_type ("int32", m_any, + llvm::Type::getIntNTy (context, 32)); + m_ints[64] = do_register_new_type ("int64", m_any, + llvm::Type::getIntNTy (context, 64)); // jit_type: "string" < "any" m_string_t = llvm::Type::getInt8Ty (context); @@ -1231,8 +1239,10 @@ m_range->mark_sret (jit_convention::external); m_range->mark_pointer_arg (jit_convention::external); - m_complex->set_pack (jit_convention::external, &jit_typeinfo::pack_complex); - m_complex->set_unpack (jit_convention::external, &jit_typeinfo::unpack_complex); + m_complex->set_pack (jit_convention::external, + &jit_typeinfo::pack_complex); + m_complex->set_unpack (jit_convention::external, + &jit_typeinfo::unpack_complex); m_complex->set_packed_type (jit_convention::external, m_complex_ret); if (sizeof (void *) == 4) @@ -1248,7 +1258,8 @@ m_base_jit_module->add_global_mapping (m_lerror_state, &error_state); // sig_atomic_type is going to be some sort of integer - m_sig_atomic_type = llvm::Type::getIntNTy (context, sizeof(sig_atomic_t) * 8); + m_sig_atomic_type = llvm::Type::getIntNTy (context, + sizeof(sig_atomic_t) * 8); m_loctave_interrupt_state = m_base_jit_module->create_global_variable (m_sig_atomic_type, false, "octave_interrupt_state"); @@ -1259,8 +1270,8 @@ // generic call function { jit_type *int_t = do_get_intN (sizeof (octave_builtin::fcn) * 8); - m_any_call = create_external (JIT_FN (octave_jit_call), m_any, int_t, int_t, - m_any_ptr, int_t); + m_any_call = create_external (JIT_FN (octave_jit_call), m_any, int_t, + int_t, m_any_ptr, int_t); } // any with anything is an any op @@ -1268,7 +1279,8 @@ jit_type *binary_op_type = do_get_intN (sizeof (octave_value::binary_op) * 8); llvm::Type *llvm_bo_type = binary_op_type->to_llvm (); jit_function any_binary = create_external (JIT_FN (octave_jit_binary_any_any), - m_any, binary_op_type, m_any, m_any); + m_any, binary_op_type, + m_any, m_any); any_binary.mark_can_error (); for (size_t i = 0; i < octave_value::num_binary_ops; ++i) @@ -1319,7 +1331,8 @@ m_release_fn.add_overload (fn); // release matrix - fn = create_external (JIT_FN (octave_jit_release_matrix), nullptr, m_matrix); + fn = create_external (JIT_FN (octave_jit_release_matrix), nullptr, + m_matrix); m_release_fn.add_overload (fn); // destroy @@ -1344,11 +1357,13 @@ add_binary_fcmp (m_scalar, octave_value::op_gt, llvm::CmpInst::FCMP_UGT); add_binary_fcmp (m_scalar, octave_value::op_ne, llvm::CmpInst::FCMP_UNE); - jit_function gripe_div0 = create_external (JIT_FN (warn_divide_by_zero), nullptr); + jit_function gripe_div0 = create_external (JIT_FN (warn_divide_by_zero), + nullptr); gripe_div0.mark_can_error (); // divide is annoying because it might error - fn = create_internal ("octave_jit_div_scalar_scalar", m_scalar, m_scalar, m_scalar); + fn = create_internal ("octave_jit_div_scalar_scalar", m_scalar, m_scalar, + m_scalar); fn.mark_can_error (); llvm::BasicBlock *body = fn.new_block (); @@ -1358,7 +1373,8 @@ llvm::BasicBlock *normal_block = fn.new_block ("normal"); llvm::Value *zero = llvm::ConstantFP::get (m_scalar_t, 0); - llvm::Value *check = m_builder.CreateFCmpUEQ (zero, fn.argument (m_builder, 1)); + llvm::Value *check = m_builder.CreateFCmpUEQ (zero, + fn.argument (m_builder, 1)); m_builder.CreateCondBr (check, warn_block, normal_block); m_builder.SetInsertPoint (warn_block); @@ -1381,8 +1397,8 @@ // In general, the result of scalar ^ scalar is a complex number. We might // be able to improve on this if we keep track of the range of values // variables can take on. - fn = create_external (JIT_FN (octave_jit_pow_scalar_scalar), m_complex, m_scalar, - m_scalar); + fn = create_external (JIT_FN (octave_jit_pow_scalar_scalar), m_complex, + m_scalar, m_scalar); m_binary_ops[octave_value::op_pow].add_overload (fn); m_binary_ops[octave_value::op_el_pow].add_overload (fn); @@ -1545,8 +1561,8 @@ } m_binary_ops[octave_value::op_sub].add_overload (fn); - fn = create_external (JIT_FN (octave_jit_pow_scalar_complex), m_complex, m_scalar, - m_complex); + fn = create_external (JIT_FN (octave_jit_pow_scalar_complex), m_complex, + m_scalar, m_complex); m_binary_ops[octave_value::op_pow].add_overload (fn); m_binary_ops[octave_value::op_el_pow].add_overload (fn); @@ -1577,7 +1593,8 @@ m_for_init_fn.add_overload (fn); // bounds check for for loop - fn = create_internal ("octave_jit_for_range_check", m_boolean, m_range, m_index); + fn = create_internal ("octave_jit_for_range_check", m_boolean, m_range, + m_index); body = fn.new_block (); m_builder.SetInsertPoint (body); { @@ -1590,7 +1607,8 @@ m_for_check_fn.add_overload (fn); // index variabe for for loop - fn = create_internal ("octave_jit_for_range_idx", m_scalar, m_range, m_index); + fn = create_internal ("octave_jit_for_range_idx", m_scalar, m_range, + m_index); body = fn.new_block (); m_builder.SetInsertPoint (body); { @@ -1608,9 +1626,11 @@ // logically true jit_function gripe_nantl - = create_external (JIT_FN (octave_jit_err_nan_to_logical_conversion), nullptr); + = create_external (JIT_FN (octave_jit_err_nan_to_logical_conversion), + nullptr); gripe_nantl.mark_can_error (); - fn = create_internal ("octave_jit_logically_true_scalar", m_boolean, m_scalar); + fn = create_internal ("octave_jit_logically_true_scalar", m_boolean, + m_scalar); fn.mark_can_error (); body = fn.new_block (); m_builder.SetInsertPoint (body); @@ -1642,7 +1662,8 @@ jit_function compute_nelem = create_external (JIT_FN (octave_jit_compute_nelem), m_index, m_scalar, m_scalar, m_scalar); - fn = create_internal ("octave_jit_make_range", m_range, m_scalar, m_scalar, m_scalar); + fn = create_internal ("octave_jit_make_range", m_range, m_scalar, m_scalar, + m_scalar); body = fn.new_block (); m_builder.SetInsertPoint (body); { @@ -1653,8 +1674,8 @@ llvm::Value *dzero = llvm::ConstantFP::get (m_scalar_t, 0); llvm::Value *izero = llvm::ConstantInt::get (m_index_t, 0); - llvm::Value *rng = llvm::ConstantStruct::get (m_range_t, dzero, dzero, dzero, - izero, NULL); + llvm::Value *rng = llvm::ConstantStruct::get (m_range_t, dzero, dzero, + dzero, izero, NULL); rng = m_builder.CreateInsertValue (rng, base, 0); rng = m_builder.CreateInsertValue (rng, limit, 1); rng = m_builder.CreateInsertValue (rng, inc, 2); @@ -1669,8 +1690,8 @@ jit_function ginvalid_index = create_external (JIT_FN (octave_jit_ginvalid_index), nullptr); jit_function gindex_range = create_external (JIT_FN (octave_jit_gindex_range), - nullptr, jit_int, jit_int, m_index, - m_index); + nullptr, jit_int, jit_int, + m_index, m_index); fn = create_internal ("()subsref", m_scalar, m_matrix, m_scalar); fn.mark_can_error (); @@ -1734,10 +1755,10 @@ // paren subsasgn jit_function resize_paren_subsasgn - = create_external (JIT_FN (octave_jit_paren_subsasgn_impl), m_matrix, m_matrix, - m_index, m_scalar); - fn = create_internal ("octave_jit_paren_subsasgn", m_matrix, m_matrix, m_scalar, - m_scalar); + = create_external (JIT_FN (octave_jit_paren_subsasgn_impl), m_matrix, + m_matrix, m_index, m_scalar); + fn = create_internal ("octave_jit_paren_subsasgn", m_matrix, m_matrix, + m_scalar, m_scalar); fn.mark_can_error (); body = fn.new_block (); m_builder.SetInsertPoint (body); @@ -1801,12 +1822,13 @@ } paren_subsasgn_fn.add_overload (fn); - fn = create_external (JIT_FN (octave_jit_paren_subsasgn_matrix_range), m_matrix, - m_matrix, m_range, m_scalar); + fn = create_external (JIT_FN (octave_jit_paren_subsasgn_matrix_range), + m_matrix, m_matrix, m_range, m_scalar); fn.mark_can_error (); paren_subsasgn_fn.add_overload (fn); - fn = create_internal ("octave_jit_end1_matrix", m_scalar, m_matrix, m_index, m_index); + fn = create_internal ("octave_jit_end1_matrix", m_scalar, m_matrix, + m_index, m_index); body = fn.new_block (); m_builder.SetInsertPoint (body); { @@ -1816,8 +1838,8 @@ } m_end1_fn.add_overload (fn); - fn = create_external (JIT_FN (octave_jit_end_matrix),m_scalar, m_matrix, m_index, - m_index); + fn = create_external (JIT_FN (octave_jit_end_matrix),m_scalar, m_matrix, + m_index, m_index); m_end_fn.add_overload (fn); // -------------------- create_undef -------------------- @@ -1831,11 +1853,13 @@ m_casts[m_range->type_id ()].stash_name ("(range)"); // cast m_any <- matrix - fn = create_external (JIT_FN (octave_jit_cast_any_matrix), m_any, m_matrix); + fn = create_external (JIT_FN (octave_jit_cast_any_matrix), m_any, + m_matrix); m_casts[m_any->type_id ()].add_overload (fn); // cast matrix <- any - fn = create_external (JIT_FN (octave_jit_cast_matrix_any), m_matrix, m_any); + fn = create_external (JIT_FN (octave_jit_cast_matrix_any), m_matrix, + m_any); m_casts[m_matrix->type_id ()].add_overload (fn); // cast any <- range @@ -1847,23 +1871,28 @@ m_casts[m_range->type_id ()].add_overload (fn); // cast any <- scalar - fn = create_external (JIT_FN (octave_jit_cast_any_scalar), m_any, m_scalar); + fn = create_external (JIT_FN (octave_jit_cast_any_scalar), m_any, + m_scalar); m_casts[m_any->type_id ()].add_overload (fn); // cast scalar <- any - fn = create_external (JIT_FN (octave_jit_cast_scalar_any), m_scalar, m_any); + fn = create_external (JIT_FN (octave_jit_cast_scalar_any), m_scalar, + m_any); m_casts[m_scalar->type_id ()].add_overload (fn); // cast any <- complex - fn = create_external (JIT_FN (octave_jit_cast_any_complex), m_any, m_complex); + fn = create_external (JIT_FN (octave_jit_cast_any_complex), m_any, + m_complex); m_casts[m_any->type_id ()].add_overload (fn); // cast complex <- any - fn = create_external (JIT_FN (octave_jit_cast_complex_any), m_complex, m_any); + fn = create_external (JIT_FN (octave_jit_cast_complex_any), m_complex, + m_any); m_casts[m_complex->type_id ()].add_overload (fn); // cast complex <- scalar - fn = create_internal ("octave_jit_cast_complex_scalar", m_complex, m_scalar); + fn = create_internal ("octave_jit_cast_complex_scalar", m_complex, + m_scalar); body = fn.new_block (); m_builder.SetInsertPoint (body); { @@ -1873,7 +1902,8 @@ m_casts[m_complex->type_id ()].add_overload (fn); // cast scalar <- complex - fn = create_internal ("octave_jit_cast_scalar_complex", m_scalar, m_complex); + fn = create_internal ("octave_jit_cast_scalar_complex", m_scalar, + m_complex); body = fn.new_block (); m_builder.SetInsertPoint (body); fn.do_return (m_builder, complex_real (fn.argument (m_builder, 0))); @@ -1925,7 +1955,8 @@ add_builtin ("magic"); register_generic ("magic", m_matrix, m_scalar); - register_generic ("magic", m_matrix, std::vector<jit_type *> (2, m_scalar)); + register_generic ("magic", m_matrix, + std::vector<jit_type *> (2, m_scalar)); add_builtin ("eye"); register_generic ("eye", m_matrix, m_scalar); @@ -1952,7 +1983,8 @@ m_grab_fn.add_overload (jit_function (grab_any, btype, args)); m_release_fn.add_overload (jit_function (release_any, 0, args)); - m_casts[m_any->type_id ()].add_overload (jit_function (any_id, m_any, args)); + m_casts[m_any->type_id ()].add_overload (jit_function (any_id, m_any, + args)); args[0] = m_any; m_casts[btype->type_id ()].add_overload (jit_function (any_id, btype, @@ -1990,7 +2022,8 @@ assert ((name == "any") || (name == "any_ptr") || (name == "scalar_ptr") || (parent != nullptr)); - jit_type *ret = new jit_type (name, parent, llvm_type, skip_paren, m_next_id++); + jit_type *ret = new jit_type (name, parent, llvm_type, skip_paren, + m_next_id++); m_id_to_type.push_back (ret); m_casts.push_back (jit_operation ("(" + name + ")")); @@ -2159,8 +2192,8 @@ std::copy (args.begin (), args.end (), args1.begin () + 1); // The first argument will be the Octave function, but we already know that - // the function call is the equivalent of the intrinsic, so we ignore it and - // call the intrinsic with the remaining arguments. + // the function call is the equivalent of the intrinsic, so we ignore it + // and call the intrinsic with the remaining arguments. jit_function fn = create_internal (fn_name.str (), result, args1); llvm::BasicBlock *body = fn.new_block (); m_builder.SetInsertPoint (body); @@ -2179,8 +2212,8 @@ { symbol_table& symtab = __get_symbol_table__ ("jit_typeinfo::find_builtin"); - // FIXME: Finalize what we want to store in octave_builtin, then add functions - // to access these values in octave_value + // FIXME: Finalize what we want to store in octave_builtin, then add + // functions to access these values in octave_value octave_value ov_builtin = symtab.find (name); return dynamic_cast<octave_builtin *> (ov_builtin.internal_rep ()); } @@ -2209,7 +2242,8 @@ if (agrab.valid ()) arg = agrab.call (m_builder, arg); jit_function acast = do_cast (m_any, args[i]); - array = m_builder.CreateInsertValue (array, acast.call (m_builder, arg), i); + array = m_builder.CreateInsertValue (array, + acast.call (m_builder, arg), i); } llvm::Value *array_mem = m_builder.CreateAlloca (array_t); @@ -2223,7 +2257,8 @@ llvm::Value *nargin = llvm::ConstantInt::get (intTy, args.size ()); size_t result_int = reinterpret_cast<size_t> (result); llvm::Value *res_llvm = llvm::ConstantInt::get (intTy, result_int); - llvm::Value *ret = m_any_call.call (m_builder, fcn, nargin, array, res_llvm); + llvm::Value *ret = m_any_call.call (m_builder, fcn, nargin, array, + res_llvm); jit_function cast_result = do_cast (result, m_any); fn.do_return (m_builder, cast_result.call (m_builder, ret)); @@ -2316,12 +2351,12 @@ { if (ov.is_function ()) { - // FIXME: This is ugly, we need to finalize how we want to do this, then - // have octave_value fully support the needed functionality + // FIXME: This is ugly, we need to finalize how we want to do this, + // then have octave_value fully support the needed functionality octave_builtin *builtin = dynamic_cast<octave_builtin *> (ov.internal_rep ()); return builtin && builtin->to_jit () ? builtin->to_jit () - : m_unknown_function; + : m_unknown_function; } if (ov.is_range ())
--- a/libinterp/parse-tree/jit-typeinfo.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/jit-typeinfo.h Tue Apr 03 13:52:40 2018 -0700 @@ -120,15 +120,15 @@ { enum type - { - // internal to jit - internal, + { + // internal to jit + internal, - // an external C call - external, + // an external C call + external, - length - }; + length + }; } // Used to keep track of estimated (infered) types during JIT. This is a
--- a/libinterp/parse-tree/lex.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/lex.h Tue Apr 03 13:52:40 2018 -0700 @@ -514,7 +514,7 @@ // Handle buffering of input for lexer. - class input_buffer + class input_buffer { public:
--- a/libinterp/parse-tree/parse.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/parse.h Tue Apr 03 13:52:40 2018 -0700 @@ -665,7 +665,8 @@ OCTAVE_DEPRECATED (4.4, "use 'octave::eval_string' instead") static inline octave_value_list -eval_string (const std::string& str, bool silent, int& parse_status, int nargout) +eval_string (const std::string& str, bool silent, int& parse_status, + int nargout) { return octave::eval_string (str, silent, parse_status, nargout); }
--- a/libinterp/parse-tree/pt-binop.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/pt-binop.h Tue Apr 03 13:52:40 2018 -0700 @@ -142,11 +142,11 @@ public: enum type - { - unknown, - bool_and, - bool_or - }; + { + unknown, + bool_and, + bool_or + }; tree_boolean_expression (int l = -1, int c = -1, type t = unknown) : tree_binary_expression (l, c), m_etype (t) { }
--- a/libinterp/parse-tree/pt-decl.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/pt-decl.h Tue Apr 03 13:52:40 2018 -0700 @@ -49,11 +49,11 @@ public: enum decl_type - { - unknown, - global, - persistent - }; + { + unknown, + global, + persistent + }; tree_decl_elt (tree_identifier *i = nullptr, tree_expression *e = nullptr) : type (unknown), m_id (i), m_expr (e) { } @@ -160,12 +160,12 @@ std::list<std::string> retval; for (const tree_decl_elt *elt : *this) - { - std::string nm = elt->name (); + { + std::string nm = elt->name (); - if (! nm.empty ()) - retval.push_back (nm); - } + if (! nm.empty ()) + retval.push_back (nm); + } return retval; }
--- a/libinterp/parse-tree/pt-eval.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1176,7 +1176,8 @@ e.set_var (var); - octave::symbol_table& symtab = octave::__get_symbol_table__ ("final_index_error"); + octave::symbol_table& symtab = + octave::__get_symbol_table__ ("final_index_error"); octave_value fcn = symtab.find_function (var);
--- a/libinterp/parse-tree/pt-jit.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/pt-jit.cc Tue Apr 03 13:52:40 2018 -0700 @@ -154,7 +154,8 @@ m_block->append (m_factory.create<jit_branch> (m_final_block)); m_blocks.push_back (m_final_block); - for (variable_map::iterator iter = m_vmap.begin (); iter != m_vmap.end (); ++iter) + for (variable_map::iterator iter = m_vmap.begin (); iter != m_vmap.end (); + ++iter) { jit_variable *var = iter->second; const std::string& name = var->name (); @@ -245,15 +246,17 @@ return_value = get_variable (elt->name ()); } - // FIXME: We should use live range analysis to delete variables where needed. - // For now we just delete everything at the end of the function. - for (variable_map::iterator iter = m_vmap.begin (); iter != m_vmap.end (); ++iter) + // FIXME: We should use live range analysis to delete variables where + // needed. For now we just delete everything at the end of the function. + for (variable_map::iterator iter = m_vmap.begin (); + iter != m_vmap.end (); + ++iter) { if (iter->second != return_value) { jit_call *call; call = m_factory.create<jit_call> (&jit_typeinfo::destroy, - iter->second); + iter->second); m_final_block->append (call); } } @@ -368,12 +371,12 @@ } void -jit_convert::visit_decl_command (tree_decl_command&) -{ - throw jit_fail_exception ("No visit_decl_command implementation"); -} - -void + jit_convert::visit_decl_command (tree_decl_command&) + { + throw jit_fail_exception ("No visit_decl_command implementation"); + } + + void jit_convert::visit_decl_elt (tree_decl_elt&) { throw jit_fail_exception ("No visit_decl_elt implementation"); @@ -399,7 +402,7 @@ m_breaks.clear (); m_continues.clear (); - // we need a variable for our iterator, because it is used in multiple blocks + // Need a variable for our iterator, because it is used in multiple blocks std::string iter_name = next_iterator (); jit_variable *iterator = m_factory.create<jit_variable> (iter_name); m_factory.create<jit_variable> (iter_name); @@ -408,18 +411,19 @@ jit_block *body = m_factory.create<jit_block> ("for_body"); jit_block *tail = m_factory.create<jit_block> ("for_tail"); - // do control expression, iter init, and condition check in prev_block (block) + // Do control expression, iter init, and condition check in prev_block + // (block). // if we are the top level for loop, the bounds is an input argument. jit_value *control = find_variable (next_for_bounds ()); if (! control) control = visit (cmd.control_expr ()); jit_call *init_iter = m_factory.create<jit_call> (jit_typeinfo::for_init, - control); + control); m_block->append (init_iter); m_block->append (m_factory.create<jit_assign> (iterator, init_iter)); - jit_call *check = m_factory.create<jit_call> (jit_typeinfo::for_check, control, - iterator); + jit_call *check = m_factory.create<jit_call> (jit_typeinfo::for_check, + control, iterator); m_block->append (check); m_block->append (m_factory.create<jit_cond_branch> (check, body, tail)); @@ -428,7 +432,7 @@ // compute the syntactical iterator jit_call *idx_rhs = m_factory.create<jit_call> (jit_typeinfo::for_index, - control, iterator); + control, iterator); m_block->append (idx_rhs); do_assign (cmd.left_hand_side (), idx_rhs); @@ -443,8 +447,8 @@ { if (m_continues.empty ()) { - // WTF are you doing user? Every branch was a break, why did you have - // a loop??? Users are silly people... + // WTF are you doing user? Every branch was a break, why did you + // have a loop??? Users are silly people... finish_breaks (tail, m_breaks); m_blocks.push_back (tail); m_block = tail; @@ -472,14 +476,14 @@ m_block->append (iter_inc); m_block->append (m_factory.create<jit_assign> (iterator, iter_inc)); check = m_block->append (m_factory.create<jit_call> (jit_typeinfo::for_check, - control, iterator)); + control, iterator)); m_block->append (m_factory.create<jit_cond_branch> (check, interrupt_check, - tail)); + tail)); m_block = interrupt_check; jit_error_check *ec = m_factory.create<jit_error_check> (jit_error_check::var_interrupt, - body, m_final_block); + body, m_final_block); m_block->append (ec); // breaks will go to our tail @@ -568,7 +572,7 @@ std::vector<jit_block *> entry_blocks (lst.size () + 1 - last_else); entry_blocks[0] = m_block; - // we need to construct blocks first, because they have jumps to each other. + // Need to construct blocks first, because they have jumps to each other. tree_if_command_list::iterator iter = lst.begin (); ++iter; for (size_t i = 1; iter != lst.end (); ++iter, ++i) @@ -611,8 +615,9 @@ : "ifelse_body"); m_blocks.push_back (body); - jit_instruction *br = m_factory.create<jit_cond_branch> (check, body, - entry_blocks[i + 1]); + jit_instruction *br = m_factory.create<jit_cond_branch> (check, + body, + entry_blocks[i + 1]); m_block->append (br); m_block = body; } @@ -816,7 +821,8 @@ const jit_operation& fn = jit_typeinfo::print_value (); jit_const_string *name = m_factory.create<jit_const_string> (expr->name ()); - m_block->append (m_factory.create<jit_call> (fn, name, expr_result)); + m_block->append (m_factory.create<jit_call> (fn, name, + expr_result)); } } } @@ -868,7 +874,7 @@ if (last->is_default_case ()) has_otherwise = 1; - std::vector<jit_block *> entry_blocks (case_blocks_num + 1 - has_otherwise); + std::vector<jit_block *> entry_blocks (case_blocks_num+1 - has_otherwise); // the first entry point is always the actual block. Afterward, new blocks // are created for every case and the otherwise branch @@ -935,7 +941,8 @@ catch (const jit_break_exception&) { } - // each branch in the case statement will have different breaks/continues + // each branch in the case statement will have different + // breaks/continues current_breaks.splice (current_breaks.end (), m_breaks); current_continues.splice (current_continues.end (), m_continues); } @@ -1019,7 +1026,7 @@ m_block = interrupt_check; jit_error_check *ec = m_factory.create<jit_error_check> (jit_error_check::var_interrupt, - cond_check, m_final_block); + cond_check, m_final_block); m_block->append (ec); } @@ -1072,7 +1079,7 @@ m_block = interrupt_check; jit_error_check *ec = m_factory.create<jit_error_check> (jit_error_check::var_interrupt, - cond_check, m_final_block); + cond_check, m_final_block); m_block->append (ec); m_blocks.push_back (cond_check); @@ -1083,7 +1090,8 @@ jit_value *check = visit (expr); check = create_checked (&jit_typeinfo::logically_true, check); - m_block->append (m_factory.create<jit_cond_branch> (check, tail, body)); + m_block->append (m_factory.create<jit_cond_branch> (check, tail, + body)); } m_blocks.push_back (tail); @@ -1113,8 +1121,8 @@ jit_block *normal = m_factory.create<jit_block> (m_block->name ()); jit_error_check *check - = m_factory.create<jit_error_check> (jit_error_check::var_error_state, ret, - normal, m_final_block); + = m_factory.create<jit_error_check> (jit_error_check::var_error_state, + ret, normal, m_final_block); m_block->append (check); m_blocks.push_back (normal); m_block = normal; @@ -1250,7 +1258,8 @@ } jit_value * - jit_convert::do_assign (tree_expression *exp, jit_value *rhs, bool artificial) + jit_convert::do_assign (tree_expression *exp, jit_value *rhs, bool + artificial) { if (! exp) throw jit_fail_exception ("NULL lhs in assign"); @@ -1275,7 +1284,8 @@ bool print, bool artificial) { jit_variable *var = get_variable (lhs); - jit_assign *assign = m_block->append (m_factory.create<jit_assign> (var, rhs)); + jit_assign *assign = m_block->append (m_factory.create<jit_assign> (var, + rhs)); if (artificial) assign->mark_artificial (); @@ -1320,11 +1330,12 @@ { m_converting_function = false; - // for now just init arguments from entry, later we will have to do something - // more interesting + // for now just init arguments from entry, later we will have to do + // something more interesting jit_block *m_entry_block = blocks.front (); for (jit_block::iterator iter = m_entry_block->begin (); - iter != m_entry_block->end (); ++iter) + iter != m_entry_block->end (); + ++iter) if (jit_extract_argument *extract = dynamic_cast<jit_extract_argument *> (*iter)) m_argument_vec.push_back (std::make_pair (extract->name (), true)); @@ -1343,7 +1354,8 @@ m_prelude = llvm::BasicBlock::Create (context, "prelude", m_function); builder.SetInsertPoint (m_prelude); - // The jitted function will have only one function argument, of octave_base_value** type + // The jitted function will have only one function argument, of + // octave_base_value** type llvm::Value *arg = &*(m_function->arg_begin ()); for (size_t i = 0; i < m_argument_vec.size (); ++i) @@ -1379,7 +1391,7 @@ assert (ret); m_creating = jit_function (&module, jit_convention::internal, - "foobar", ret->result_type (), args); + "foobar", ret->result_type (), args); m_function = m_creating.to_llvm (); try @@ -1662,7 +1674,8 @@ const jit_function& ol = me.overload (); jit_magic_end::context ctx = me.resolve_context (); - llvm::Value *ret = ol.call (builder, ctx.m_value, ctx.m_index, ctx.m_count); + llvm::Value *ret = ol.call (builder, ctx.m_value, ctx.m_index, + ctx.m_count); me.stash_llvm (ret); } @@ -1744,7 +1757,8 @@ entry_block ().create_dom_tree (); // insert phi nodes where needed, this is done on a per variable basis - for (variable_map::const_iterator iter = m_vmap.begin (); iter != m_vmap.end (); + for (variable_map::const_iterator iter = m_vmap.begin (); + iter != m_vmap.end (); ++iter) { jit_block::df_set visited, added_phi; @@ -1765,7 +1779,7 @@ if (! added_phi.count (dblock)) { jit_phi *phi = m_factory.create<jit_phi> (iter->second, - dblock->use_count ()); + dblock->use_count ()); dblock->prepend (phi); added_phi.insert (dblock); } @@ -1789,7 +1803,8 @@ return; // replace variables with their current SSA value - for (jit_block::iterator iter = ablock.begin (); iter != ablock.end (); + for (jit_block::iterator iter = ablock.begin (); + iter != ablock.end (); ++iter) { jit_instruction *instr = *iter; @@ -1813,7 +1828,8 @@ phi->add_incoming (&ablock, var->top ()); else { - // temporaries may have extranious phi nodes which can be removed + // temporaries may have extraneous phi nodes which can be + // removed assert (! phi->use_count ()); assert (var->name ().size () && var->name ()[0] == '#'); phi->remove (); @@ -1831,7 +1847,8 @@ jit_infer::place_releases (void) { std::set<jit_value *> temporaries; - for (jit_block_list::iterator iter = m_blocks.begin (); iter != m_blocks.end (); + for (jit_block_list::iterator iter = m_blocks.begin (); + iter != m_blocks.end (); ++iter) { jit_block& ablock = **iter; @@ -1915,8 +1932,8 @@ jit_use *use = phi->first_use (); if (phi->use_count () == 1 && isa<jit_assign> (use->user ())) { - // instead of releasing on assign, release on all incoming branches, - // this can get rid of casts inside loops + // instead of releasing on assign, release on all incoming + // branches, this can get rid of casts inside loops for (size_t i = 0; i < phi->argument_count (); ++i) { jit_value *arg = phi->argument (i); @@ -1924,7 +1941,8 @@ continue; jit_block *inc = phi->incoming (i); - jit_block *split = inc->maybe_split (m_factory, m_blocks, ablock); + jit_block *split = inc->maybe_split (m_factory, m_blocks, + ablock); jit_terminator *term = split->terminator (); jit_call *release = m_factory.create<jit_call> (jit_typeinfo::release, arg); @@ -1941,7 +1959,8 @@ void jit_infer::release_temp (jit_block& ablock, std::set<jit_value *>& temp) { - for (jit_block::iterator iter = ablock.begin (); iter != ablock.end (); + for (jit_block::iterator iter = ablock.begin (); + iter != ablock.end (); ++iter) { jit_instruction *instr = *iter; @@ -1979,10 +1998,12 @@ // FIXME: If we support try/catch or unwind_protect final_block // may not be the destination - jit_block *split = ablock.maybe_split (m_factory, m_blocks, final_block ()); + jit_block *split = ablock.maybe_split (m_factory, m_blocks, + final_block ()); jit_terminator *term = split->terminator (); for (std::set<jit_value *>::const_iterator iter = temp.begin (); - iter != temp.end (); ++iter) + iter != temp.end (); + ++iter) { jit_value *value = *iter; jit_call *release @@ -1995,7 +2016,8 @@ void jit_infer::simplify_phi (void) { - for (jit_block_list::iterator biter = m_blocks.begin (); biter != m_blocks.end (); + for (jit_block_list::iterator biter = m_blocks.begin (); + biter != m_blocks.end (); ++biter) { jit_block &ablock = **biter; @@ -2042,8 +2064,8 @@ jit_memory_manager (const jit_memory_manager&) = delete; void operator= (const jit_memory_manager&) = delete; public: - jit_memory_manager () {} - virtual ~jit_memory_manager () {} + jit_memory_manager () { } + virtual ~jit_memory_manager () { } // The Kaleidoscope example in LLVM 3.8 indicates that // getPointerToNamedFunction has to be overloaded, but actually it is @@ -2053,7 +2075,8 @@ // Is it still useful to overload getPointerToNamedFunction to support // some older version of LLVM? Are there others virtual functions // that must be overloaded? - virtual void* getPointerToNamedFunction (const std::string& name, bool abort_on_failure); + virtual void* getPointerToNamedFunction (const std::string& name, bool + abort_on_failure); }; void* @@ -2061,7 +2084,8 @@ bool abort_on_failure) { // Try the standard symbol resolution first, but ask it not to abort - void *pfn = llvm::RTDyldMemoryManager::getPointerToNamedFunction (name, false); + void *pfn = llvm::RTDyldMemoryManager::getPointerToNamedFunction (name, + false); if (pfn) return pfn; @@ -2129,7 +2153,8 @@ .setMCJITMemoryManager(llvm::make_unique<jit_memory_manager> ()) .create (); - // Note: in some versions of LLVM, we should call .setUseMCJIT (true) before .create () ? + // Note: in some versions of LLVM, we should call .setUseMCJIT (true) + // before .create () ? // FIXME: autconf this if (e == nullptr) @@ -2361,7 +2386,8 @@ name, m_module); } - // Create or insert an LLVM Function declaration for an intrinsic and return it + // Create or insert an LLVM Function declaration for an intrinsic and return + // it llvm::Function* jit_module::get_intrinsic_declaration (size_t id, std::vector<llvm::Type*> types) const @@ -2531,8 +2557,12 @@ for (size_t i = 0; i < nargs; ++i) { llvm::Value *arg; - // arg = builder.CreateConstInBoundsGEP1_32 (wrapper_arg, i); // LLVM <= 3.6 - arg = builder.CreateConstInBoundsGEP1_32 (any_t->to_llvm (), wrapper_arg, i); // LLVM >= 3.7 + // LLVM <= 3.6 + // arg = builder.CreateConstInBoundsGEP1_32 (wrapper_arg, i); + / / LLVM >= 3.7 + arg = builder.CreateConstInBoundsGEP1_32 (any_t->to_llvm (), + wrapper_arg, i); + arg = builder.CreateLoad (arg); jit_type *arg_type = m_argument_types[i]; @@ -2544,7 +2574,8 @@ if (raw_fn.result ()) { jit_type *raw_result_t = raw_fn.result (); - const jit_function& cast = jit_typeinfo::cast (any_t, raw_result_t); + const jit_function& cast = jit_typeinfo::cast (any_t, + raw_result_t); result = cast.call (builder, result); } else @@ -2605,7 +2636,8 @@ if (! m_function) return false; - // FIXME: figure out a way to delete ov_args so we avoid duplicating refcount + // FIXME: figure out a way to delete ov_args so we avoid duplicating + // refcount size_t nargs = ov_args.length (); std::vector<octave_base_value *> args (nargs); for (size_t i = 0; i < nargs; ++i) @@ -2657,7 +2689,8 @@ compile (tee, jit_typeinfo::type_of (for_bounds)); } - jit_info::jit_info (tree_simple_for_command& tee, const octave_value& for_bounds) + jit_info::jit_info (tree_simple_for_command& tee, + const octave_value& for_bounds) : m_llvm_function_name (tree_jit::generate_unique_forloop_name ()), m_function (nullptr) {
--- a/libinterp/parse-tree/pt-jit.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/pt-jit.h Tue Apr 03 13:52:40 2018 -0700 @@ -457,18 +457,24 @@ public: static std::string generate_unique_forloop_name (void) - { return std::string ("jittedForLoop") - + std::to_string (next_forloop_number ++); } + { + return std::string ("jittedForLoop") + + std::to_string (next_forloop_number ++); + } // FIXME: Check that the identifier does not exist static std::string generate_unique_function_name (void) - { return std::string ("jittedFunction") - + std::to_string (next_function_number ++); } + { + return std::string ("jittedFunction") + + std::to_string (next_function_number ++); + } // FIXME: Check that the identifier does not exist static std::string generate_unique_module_name (void) - { return std::string ("octaveJITModule") - + std::to_string (next_module_number ++); } + { + return std::string ("octaveJITModule") + + std::to_string (next_module_number ++); + } // FIXME: Check that the identifier does not exist private:
--- a/libinterp/parse-tree/pt-misc.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/pt-misc.h Tue Apr 03 13:52:40 2018 -0700 @@ -45,10 +45,10 @@ public: enum in_or_out - { - in = 1, - out = 2 - }; + { + in = 1, + out = 2 + }; tree_parameter_list (void) : m_marked_for_varargs (0) { }
--- a/libinterp/parse-tree/token.h Tue Apr 03 08:15:40 2018 -0400 +++ b/libinterp/parse-tree/token.h Tue Apr 03 13:52:40 2018 -0700 @@ -37,33 +37,33 @@ public: enum token_type - { - generic_token, - keyword_token, - string_token, - double_token, - ettype_token, - sym_rec_token, - scls_name_token, - }; + { + generic_token, + keyword_token, + string_token, + double_token, + ettype_token, + sym_rec_token, + scls_name_token, + }; enum end_tok_type - { - simple_end, - classdef_end, - enumeration_end, - events_end, - for_end, - function_end, - if_end, - methods_end, - parfor_end, - properties_end, - switch_end, - try_catch_end, - unwind_protect_end, - while_end, - }; + { + simple_end, + classdef_end, + enumeration_end, + events_end, + for_end, + function_end, + if_end, + methods_end, + parfor_end, + properties_end, + switch_end, + try_catch_end, + unwind_protect_end, + while_end, + }; token (int tv, int l = -1, int c = -1); token (int tv, bool is_keyword, int l = -1, int c = -1);
--- a/liboctave/array/CMatrix.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/CMatrix.cc Tue Apr 03 13:52:40 2018 -0700 @@ -1462,7 +1462,7 @@ else { F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, - tmp_info)); + tmp_info)); info = tmp_info; } @@ -2515,9 +2515,9 @@ nlvl = 0; F77_INT lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) - + 3*smlsiz*nrhs - + std::max ((smlsiz+1)*(smlsiz+1), - n*(1+nrhs) + 2*nrhs); + + 3*smlsiz*nrhs + + std::max ((smlsiz+1)*(smlsiz+1), + n*(1+nrhs) + 2*nrhs); if (lrwork < 1) lrwork = 1; Array<double> rwork (dim_vector (lrwork, 1)); @@ -2735,7 +2735,7 @@ nlvl = 0; F77_INT lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) - + 3*smlsiz*nrhs + (smlsiz+1)*(smlsiz+1); + + 3*smlsiz*nrhs + (smlsiz+1)*(smlsiz+1); if (lrwork < 1) lrwork = 1; Array<double> rwork (dim_vector (lrwork, 1));
--- a/liboctave/array/CMatrix.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/CMatrix.h Tue Apr 03 13:52:40 2018 -0700 @@ -255,8 +255,9 @@ octave_idx_type& info) const; ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon) const; - ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, - double& rcon, solve_singularity_handler sing_handler, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info, double& rcon, + solve_singularity_handler sing_handler, bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const;
--- a/liboctave/array/CSparse.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/CSparse.cc Tue Apr 03 13:52:40 2018 -0700 @@ -178,8 +178,8 @@ } static const Complex - Complex_NaN_result (octave::numeric_limits<double>::NaN (), - octave::numeric_limits<double>::NaN ()); +Complex_NaN_result (octave::numeric_limits<double>::NaN (), + octave::numeric_limits<double>::NaN ()); SparseComplexMatrix SparseComplexMatrix::max (int dim) const @@ -3868,8 +3868,11 @@ F77_INT tmp_err = 0; - F77_XFCN (zgttrf, ZGTTRF, (tmp_nr, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), - F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, tmp_err)); + F77_XFCN (zgttrf, ZGTTRF, (tmp_nr, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), + F77_DBLE_CMPLX_ARG (DU), + F77_DBLE_CMPLX_ARG (DU2), + pipvt, tmp_err)); err = tmp_err; @@ -3908,7 +3911,9 @@ F77_XFCN (zgttrs, ZGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), - tmp_nr, 1, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), + tmp_nr, 1, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), + F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, F77_DBLE_CMPLX_ARG (work), b_nr, tmp_err F77_CHAR_ARG_LEN (1))); @@ -4194,8 +4199,11 @@ F77_INT tmp_err = 0; - F77_XFCN (zgttrf, ZGTTRF, (tmp_nr, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), - F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, tmp_err)); + F77_XFCN (zgttrf, ZGTTRF, (tmp_nr, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), + F77_DBLE_CMPLX_ARG (DU), + F77_DBLE_CMPLX_ARG (DU2), + pipvt, tmp_err)); err = tmp_err; @@ -4235,7 +4243,9 @@ F77_XFCN (zgttrs, ZGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), - tmp_nr, 1, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), + tmp_nr, 1, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), + F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, F77_DBLE_CMPLX_ARG (Bx), b_nr, tmp_err F77_CHAR_ARG_LEN (1)));
--- a/liboctave/array/CSparse.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/CSparse.h Tue Apr 03 13:52:40 2018 -0700 @@ -175,8 +175,9 @@ private: // Diagonal matrix solvers - ComplexMatrix dsolve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, - double& rcond, solve_singularity_handler sing_handler, + ComplexMatrix dsolve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info, double& rcond, + solve_singularity_handler sing_handler, bool calc_cond = false) const; ComplexMatrix dsolve (MatrixType& mattype, const ComplexMatrix& b, @@ -308,9 +309,10 @@ ComplexMatrix solve (MatrixType& mattype, const Matrix& b) const; ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const; - ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, - double& rcond) const; - ComplexMatrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info, double& rcond) const; + ComplexMatrix solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info, double& rcond, solve_singularity_handler sing_handler, bool singular_fallback = true) const;
--- a/liboctave/array/dMatrix.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/dMatrix.h Tue Apr 03 13:52:40 2018 -0700 @@ -207,7 +207,8 @@ public: // Generic interface to solver with no probing of type Matrix solve (MatrixType& mattype, const Matrix& b) const; - Matrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info) const; + Matrix solve (MatrixType& mattype, const Matrix& b, + octave_idx_type& info) const; Matrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info, double& rcon) const; Matrix solve (MatrixType& mattype, const Matrix& b, octave_idx_type& info,
--- a/liboctave/array/fCMatrix.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/fCMatrix.cc Tue Apr 03 13:52:40 2018 -0700 @@ -882,7 +882,8 @@ info = -1; else { - F77_XFCN (cgetrf, CGETRF, (nc, nc, F77_CMPLX_ARG (tmp_data), nr, pipvt, tmp_info)); + F77_XFCN (cgetrf, CGETRF, (nc, nc, F77_CMPLX_ARG (tmp_data), nr, pipvt, + tmp_info)); info = tmp_info; } @@ -1461,7 +1462,8 @@ info = -1; else { - F77_XFCN (cgetrf, CGETRF, (nr, nr, F77_CMPLX_ARG (tmp_data), nr, pipvt, tmp_info)); + F77_XFCN (cgetrf, CGETRF, (nr, nr, F77_CMPLX_ARG (tmp_data), nr, pipvt, + tmp_info)); info = tmp_info; } @@ -2022,7 +2024,8 @@ info = -2; else { - F77_XFCN (cgetrf, CGETRF, (nr, nr, F77_CMPLX_ARG (tmp_data), nr, pipvt, tmp_info)); + F77_XFCN (cgetrf, CGETRF, (nr, nr, F77_CMPLX_ARG (tmp_data), nr, pipvt, + tmp_info)); info = tmp_info; } @@ -2536,9 +2539,9 @@ nlvl = 0; F77_INT lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) - + 3*smlsiz*nrhs - + std::max ((smlsiz+1)*(smlsiz+1), - n*(1+nrhs) + 2*nrhs); + + 3*smlsiz*nrhs + + std::max ((smlsiz+1)*(smlsiz+1), + n*(1+nrhs) + 2*nrhs); if (lrwork < 1) lrwork = 1; Array<float> rwork (dim_vector (lrwork, 1)); @@ -2759,7 +2762,7 @@ nlvl = 0; F77_INT lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) - + 3*smlsiz*nrhs + (smlsiz+1)*(smlsiz+1); + + 3*smlsiz*nrhs + (smlsiz+1)*(smlsiz+1); if (lrwork < 1) lrwork = 1; Array<float> rwork (dim_vector (lrwork, 1));
--- a/liboctave/array/fCMatrix.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/fCMatrix.h Tue Apr 03 13:52:40 2018 -0700 @@ -266,7 +266,8 @@ bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b) const; + FloatComplexMatrix solve (MatrixType& mattype, + const FloatComplexMatrix& b) const; FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info) const; FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b,
--- a/liboctave/array/fMatrix.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/array/fMatrix.h Tue Apr 03 13:52:40 2018 -0700 @@ -224,7 +224,8 @@ bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; - FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b) const; + FloatComplexMatrix solve (MatrixType& mattype, + const FloatComplexMatrix& b) const; FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b, octave_idx_type& info) const; FloatComplexMatrix solve (MatrixType& mattype, const FloatComplexMatrix& b,
--- a/liboctave/external/Faddeeva/Faddeeva.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/external/Faddeeva/Faddeeva.cc Tue Apr 03 13:52:40 2018 -0700 @@ -244,8 +244,8 @@ # endif # else # define C(a,b) ((a) + I*(b)) -# define Inf (1./0.) -# define NaN (0./0.) +# define Inf (1./0.) +# define NaN (0./0.) # endif static inline cmplx cpolar(double r, double t)
--- a/liboctave/numeric/gepbalance.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/numeric/gepbalance.cc Tue Apr 03 13:52:40 2018 -0700 @@ -117,7 +117,7 @@ if (a.dims () != b.dims ()) err_nonconformant ("FloatGEPBALANCE", - n, n, b.rows(), b.cols()); + n, n, b.rows(), b.cols()); F77_INT info; F77_INT ilo; @@ -184,7 +184,7 @@ if (a.dims () != b.dims ()) err_nonconformant ("ComplexGEPBALANCE", - n, n, b.rows(), b.cols()); + n, n, b.rows(), b.cols()); F77_INT info; F77_INT ilo; @@ -255,7 +255,7 @@ if (a.dims () != b.dims ()) err_nonconformant ("FloatComplexGEPBALANCE", - n, n, b.rows(), b.cols()); + n, n, b.rows(), b.cols()); F77_INT info; F77_INT ilo;
--- a/liboctave/numeric/hess.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/numeric/hess.cc Tue Apr 03 13:52:40 2018 -0700 @@ -40,7 +40,7 @@ template <> octave_idx_type hess<Matrix>::init (const Matrix& a) - { + { F77_INT a_nr = to_f77_int (a.rows ()); F77_INT a_nc = to_f77_int (a.cols ());
--- a/liboctave/numeric/oct-fftw.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/numeric/oct-fftw.cc Tue Apr 03 13:52:40 2018 -0700 @@ -855,7 +855,7 @@ int fftw::fft (const double *in, Complex *out, size_t npts, - size_t nsamples, octave_idx_type stride, octave_idx_type dist) + size_t nsamples, octave_idx_type stride, octave_idx_type dist) { dist = (dist < 0 ? npts : dist); @@ -876,7 +876,7 @@ int fftw::fft (const Complex *in, Complex *out, size_t npts, - size_t nsamples, octave_idx_type stride, octave_idx_type dist) + size_t nsamples, octave_idx_type stride, octave_idx_type dist) { dist = (dist < 0 ? npts : dist); @@ -895,8 +895,8 @@ int fftw::ifft (const Complex *in, Complex *out, size_t npts, - size_t nsamples, octave_idx_type stride, - octave_idx_type dist) + size_t nsamples, octave_idx_type stride, + octave_idx_type dist) { dist = (dist < 0 ? npts : dist); @@ -919,7 +919,7 @@ int fftw::fftNd (const double *in, Complex *out, const int rank, - const dim_vector& dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -946,7 +946,7 @@ int fftw::fftNd (const Complex *in, Complex *out, const int rank, - const dim_vector& dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -965,7 +965,7 @@ int fftw::ifftNd (const Complex *in, Complex *out, const int rank, - const dim_vector& dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -989,7 +989,7 @@ int fftw::fft (const float *in, FloatComplex *out, size_t npts, - size_t nsamples, octave_idx_type stride, octave_idx_type dist) + size_t nsamples, octave_idx_type stride, octave_idx_type dist) { dist = (dist < 0 ? npts : dist); @@ -1010,7 +1010,7 @@ int fftw::fft (const FloatComplex *in, FloatComplex *out, size_t npts, - size_t nsamples, octave_idx_type stride, octave_idx_type dist) + size_t nsamples, octave_idx_type stride, octave_idx_type dist) { dist = (dist < 0 ? npts : dist); @@ -1029,8 +1029,8 @@ int fftw::ifft (const FloatComplex *in, FloatComplex *out, size_t npts, - size_t nsamples, octave_idx_type stride, - octave_idx_type dist) + size_t nsamples, octave_idx_type stride, + octave_idx_type dist) { dist = (dist < 0 ? npts : dist); @@ -1054,7 +1054,7 @@ int fftw::fftNd (const float *in, FloatComplex *out, const int rank, - const dim_vector& dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -1081,7 +1081,7 @@ int fftw::fftNd (const FloatComplex *in, FloatComplex *out, const int rank, - const dim_vector& dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++) @@ -1100,7 +1100,7 @@ int fftw::ifftNd (const FloatComplex *in, FloatComplex *out, const int rank, - const dim_vector& dv) + const dim_vector& dv) { octave_idx_type dist = 1; for (int i = 0; i < rank; i++)
--- a/liboctave/numeric/oct-fftw.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/numeric/oct-fftw.h Tue Apr 03 13:52:40 2018 -0700 @@ -65,10 +65,10 @@ static bool instance_ok (void); static void * - create_plan (int dir, const int rank, const dim_vector& dims, - octave_idx_type howmany, octave_idx_type stride, - octave_idx_type dist, const Complex *in, - Complex *out) + create_plan (int dir, const int rank, const dim_vector& dims, + octave_idx_type howmany, octave_idx_type stride, + octave_idx_type dist, const Complex *in, + Complex *out) { return instance_ok () ? instance->do_create_plan (dir, rank, dims, howmany, stride, @@ -77,9 +77,9 @@ } static void * - create_plan (const int rank, const dim_vector& dims, - octave_idx_type howmany, octave_idx_type stride, - octave_idx_type dist, const double *in, Complex *out) + create_plan (const int rank, const dim_vector& dims, + octave_idx_type howmany, octave_idx_type stride, + octave_idx_type dist, const double *in, Complex *out) { return instance_ok () ? instance->do_create_plan (rank, dims, howmany, stride, dist, @@ -211,10 +211,10 @@ static bool instance_ok (void); static void * - create_plan (int dir, const int rank, const dim_vector& dims, - octave_idx_type howmany, octave_idx_type stride, - octave_idx_type dist, const FloatComplex *in, - FloatComplex *out) + create_plan (int dir, const int rank, const dim_vector& dims, + octave_idx_type howmany, octave_idx_type stride, + octave_idx_type dist, const FloatComplex *in, + FloatComplex *out) { return instance_ok () ? instance->do_create_plan (dir, rank, dims, howmany, stride, @@ -223,9 +223,9 @@ } static void * - create_plan (const int rank, const dim_vector& dims, - octave_idx_type howmany, octave_idx_type stride, - octave_idx_type dist, const float *in, FloatComplex *out) + create_plan (const int rank, const dim_vector& dims, + octave_idx_type howmany, octave_idx_type stride, + octave_idx_type dist, const float *in, FloatComplex *out) { return instance_ok () ? instance->do_create_plan (rank, dims, howmany, stride, dist,
--- a/liboctave/system/file-stat.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/system/file-stat.cc Tue Apr 03 13:52:40 2018 -0700 @@ -168,11 +168,11 @@ // Private stuff: file_stat::file_stat (const std::string& n, bool fl) - : base_file_stat (), file_name (n), follow_links (fl) - { - if (! file_name.empty ()) - update_internal (); - } + : base_file_stat (), file_name (n), follow_links (fl) + { + if (! file_name.empty ()) + update_internal (); + } file_stat::~file_stat () { }
--- a/liboctave/system/lo-sysinfo.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/system/lo-sysinfo.cc Tue Apr 03 13:52:40 2018 -0700 @@ -53,7 +53,7 @@ // FlexiBLAS typedef void (*flexi_f_type) (int*, int*, int*); flexi_f_type flexi_f_ptr = reinterpret_cast<flexi_f_type> - (dyn_libs.search ("flexiblas_get_version")); + (dyn_libs.search ("flexiblas_get_version")); if (flexi_f_ptr) { @@ -75,7 +75,7 @@ // OpenBLAS typedef char * (*open_fcn_type) (void); open_fcn_type open_f_ptr = reinterpret_cast<open_fcn_type> - (dyn_libs.search ("openblas_get_config")); + (dyn_libs.search ("openblas_get_config")); if (open_f_ptr) { @@ -108,7 +108,7 @@ // ACML typedef void (*acml_f_type) (int*, int*, int*); acml_f_type acml_f_ptr = reinterpret_cast<acml_f_type> - (dyn_libs.search ("acmlversion")); + (dyn_libs.search ("acmlversion")); if (acml_f_ptr) { @@ -130,7 +130,7 @@ // Intel MKL typedef void (*mkl_f_type) (char*, int); mkl_f_type mkl_f_ptr = reinterpret_cast<mkl_f_type> - (dyn_libs.search ("mkl_get_version_string")); + (dyn_libs.search ("mkl_get_version_string")); if (mkl_f_ptr) {
--- a/liboctave/util/action-container.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/util/action-container.h Tue Apr 03 13:52:40 2018 -0700 @@ -247,7 +247,8 @@ class method_arg3_elem : public elem { public: - method_arg3_elem (T *obj, void (T::*method) (const A&, const B&, const C&), + method_arg3_elem (T *obj, + void (T::*method) (const A&, const B&, const C&), const A& arg_a, const B& arg_b, const C& arg_c) : e_obj (obj), e_method (method), e_arg_a (arg_a), e_arg_b (arg_b), e_arg_c (arg_c) @@ -275,13 +276,16 @@ class method_arg4_elem : public elem { public: - method_arg4_elem (T *obj, void (T::*method) (const A&, const B&, const C&, const D&), - const A& arg_a, const B& arg_b, const C& arg_c, const D& arg_d) + method_arg4_elem (T *obj, + void (T::*method) (const A&, const B&, const C&, const D&), + const A& arg_a, const B& arg_b, const C& arg_c, + const D& arg_d) : e_obj (obj), e_method (method), e_arg_a (arg_a), e_arg_b (arg_b), e_arg_c (arg_c), e_arg_d (arg_d) { } - void run (void) { + void run (void) + { (e_obj->*e_method) (e_arg_a, e_arg_b, e_arg_c, e_arg_d); }
--- a/liboctave/util/f77-fcn.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/util/f77-fcn.h Tue Apr 03 13:52:40 2018 -0700 @@ -163,7 +163,7 @@ typedef void *octave_cray_ftn_ch_dsc; - #if defined (__cplusplus) +#if defined (__cplusplus) # define OCTAVE_F77_FCN_INLINE inline #else # define OCTAVE_F77_FCN_INLINE
--- a/liboctave/util/lo-regexp.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/util/lo-regexp.cc Tue Apr 03 13:52:40 2018 -0700 @@ -220,7 +220,7 @@ buf << pattern.substr (pos); - // Replace NULLs with escape sequence because conversion function c_str() + // Replace NULLs with escape sequence because conversion function c_str() // will terminate string early at embedded NULLs. std::string buf_str = buf.str (); while ((pos = buf_str.find ('\0')) != std::string::npos)
--- a/liboctave/util/oct-mutex.h Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/util/oct-mutex.h Tue Apr 03 13:52:40 2018 -0700 @@ -60,29 +60,29 @@ mutex (const mutex& m) : rep (m.rep) - { - rep->count++; - } + { + rep->count++; + } ~mutex (void) - { - if (--rep->count == 0) - delete rep; - } + { + if (--rep->count == 0) + delete rep; + } mutex& operator = (const mutex& m) - { - if (rep != m.rep) - { - if (--rep->count == 0) - delete rep; + { + if (rep != m.rep) + { + if (--rep->count == 0) + delete rep; - rep = m.rep; - rep->count++; - } + rep = m.rep; + rep->count++; + } - return *this; - } + return *this; + } void lock (void) {
--- a/liboctave/util/oct-shlib.cc Tue Apr 03 08:15:40 2018 -0400 +++ b/liboctave/util/oct-shlib.cc Tue Apr 03 13:52:40 2018 -0700 @@ -455,16 +455,16 @@ &bytes_all_libs); } - if (got_libs) + if (got_libs) { for (size_t i = 0; i < (bytes_all_libs / size_lib); i++) { - // Check for function in library. - function = reinterpret_cast<void *> - (GetProcAddress (h_libs[i], sym_name.c_str ())); + // Check for function in library. + function = reinterpret_cast<void *> + (GetProcAddress (h_libs[i], sym_name.c_str ())); - if (function) - break; + if (function) + break; } }