# HG changeset patch # User Rik # Date 1450635302 28800 # Node ID 77f5591878bf4033d33aa5c01262467acf22cc15 # Parent 6982def1d416d3a44895fa6d0e1a2cfed764cdd7 maint: Use '! expr' rather than '!expr' to conform to coding guidelines. * dialog.h, documentation-dock-widget.cc, files-dock-widget.cc, find-files-dialog.cc, file-editor-tab.cc, file-editor.cc, find-dialog.cc, octave-qscintilla.cc, main-window.cc, parser.cc, resource-manager.cc, workspace-view.cc, data.cc, dlmread.cc, gl-render.cc, gl2ps-renderer.cc, graphics.cc, graphics.in.h, ls-hdf5.cc, ls-mat5.cc, ls-oct-binary.cc, lsode.cc, mappers.cc, pt-jit.cc, regexp.cc, spparms.cc, symtab.h, utils.cc, zfstream.cc, __eigs__.cc, __glpk__.cc, __init_fltk__.cc, ccolamd.cc, colamd.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-sparse.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-class.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-java.cc, ov-perm.cc, ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov.cc, pt-mat.cc, Array.cc, Array.h, CMatrix.cc, CSparse.cc, MatrixType.cc, PermMatrix.cc, Sparse.h, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, idx-vector.cc, CollocWt.h, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleLU.cc, base-qr.cc, eigs-base.cc, oct-fftw.cc, randmtzig.c, sparse-dmsolve.cc, kpse.cc, lo-regexp.cc, oct-locbuf.h, url-transfer.cc, url-transfer.h, bitset.m, interp2.m, __isequal__.m, inpolygon.m, questdlg.m, help.m, compare_versions.m, substruct.m, configure_make.m, whitebg.m, __marching_cube__.m, struct2hdl.m, polyfit.m, spline.m, unique.m, svds.m, ellipke.m, binoinv.m, hygepdf.m, nbininv.m, poissinv.m, tcdf.m, unidcdf.m, unidpdf.m, dec2base.m, assert.m, weekday.m, mkoctfile.in.cc: maint: Use '! expr' rather than '!expr' to conform to coding guidelines. diff -r 6982def1d416 -r 77f5591878bf libgui/src/dialog.h --- a/libgui/src/dialog.h Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/dialog.h Sun Dec 20 10:15:02 2015 -0800 @@ -60,7 +60,7 @@ // Use the last button in the list as the reject result, i.e., when no // button is pressed such as in the case of the upper right close tab. - if (!button.isEmpty ()) + if (! button.isEmpty ()) dialog_button = button.last (); QString xicon = icon; diff -r 6982def1d416 -r 77f5591878bf libgui/src/documentation-dock-widget.cc --- a/libgui/src/documentation-dock-widget.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/documentation-dock-widget.cc Sun Dec 20 10:15:02 2015 -0800 @@ -61,7 +61,7 @@ documentation_dock_widget::showDoc (const QString &name) { // show the doc pane without focus for carrying on typing in the console - if (!isVisible ()) + if (! isVisible ()) setVisible (true); raise (); diff -r 6982def1d416 -r 77f5591878bf libgui/src/files-dock-widget.cc --- a/libgui/src/files-dock-widget.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/files-dock-widget.cc Sun Dec 20 10:15:02 2015 -0800 @@ -812,8 +812,8 @@ // only if this is not done by default _sync_octave_dir = settings->value ("filesdockwidget/sync_octave_directory",false).toBool (); - _sync_octave_directory_action->setEnabled (!_sync_octave_dir); - _sync_browser_directory_action->setEnabled (!_sync_octave_dir); + _sync_octave_directory_action->setEnabled (! _sync_octave_dir); + _sync_browser_directory_action->setEnabled (! _sync_octave_dir); if (_sync_octave_dir) display_directory (_octave_dir); // sync browser to octave dir diff -r 6982def1d416 -r 77f5591878bf libgui/src/find-files-dialog.cc --- a/libgui/src/find-files-dialog.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/find-files-dialog.cc Sun Dec 20 10:15:02 2015 -0800 @@ -256,7 +256,7 @@ flags |= QDirIterator::Subdirectories; QDir::Filters filters = QDir::Dirs|QDir::NoDotAndDotDot|QDir::Files; - if (!_name_case_check->isChecked ()) + if (! _name_case_check->isChecked ()) filters |= QDir::CaseSensitive; QStringList nameFilters; @@ -368,7 +368,7 @@ bool match = true; if (info.isDir ()) { - if (!_include_dirs_check->isChecked ()) match = false; + if (! _include_dirs_check->isChecked ()) match = false; if (_contains_text_check->isChecked ()) match = false; } else @@ -394,7 +394,7 @@ line = stream.readLine (); match = line.contains (match_str, cs); } - while (!line.isNull () && match == false); + while (! line.isNull () && match == false); } } diff -r 6982def1d416 -r 77f5591878bf libgui/src/m-editor/file-editor-tab.cc --- a/libgui/src/m-editor/file-editor-tab.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/m-editor/file-editor-tab.cc Sun Dec 20 10:15:02 2015 -0800 @@ -363,9 +363,9 @@ { // update tracked file if we really have a file on disk QStringList trackedFiles = _file_system_watcher.files (); - if (!trackedFiles.isEmpty ()) + if (! trackedFiles.isEmpty ()) _file_system_watcher.removePath (_file_name); - if (!fileName.isEmpty ()) + if (! fileName.isEmpty ()) _file_system_watcher.addPath (fileName); _file_name = fileName; @@ -563,7 +563,7 @@ _prep_apis_file = prep_apis_path + lexer->lexer () + ".pap"; } - if (update_apis_file || !_lexer_apis->loadPrepared (_prep_apis_file)) + if (update_apis_file || ! _lexer_apis->loadPrepared (_prep_apis_file)) { // no prepared info loaded, prepare and save if possible @@ -1070,7 +1070,7 @@ // better, but individual find dialogs has the nice feature of // retaining position per file editor tabs, which can be undocked. - if (!_find_dialog) + if (! _find_dialog) { _find_dialog = new find_dialog (_edit_area, qobject_cast (sender ())); @@ -1079,7 +1079,7 @@ _find_dialog->setWindowModality (Qt::NonModal); _find_dialog_geometry = _find_dialog->geometry (); } - else if (!_find_dialog->isVisible ()) + else if (! _find_dialog->isVisible ()) { _find_dialog->setGeometry (_find_dialog_geometry); QPoint p = _find_dialog->pos (); @@ -1383,7 +1383,7 @@ else file_to_load = fileName; QFile file (file_to_load); - if (!file.open (QFile::ReadOnly)) + if (! file.open (QFile::ReadOnly)) return file.errorString (); // read the file @@ -1524,7 +1524,7 @@ _file_system_watcher.removePath (file_to_save); // open the file for writing - if (!file.open (QIODevice::WriteOnly)) + if (! file.open (QIODevice::WriteOnly)) { // Unsuccessful, begin watching file again if it was being // watched previously. @@ -1832,7 +1832,7 @@ // been changed multiple times by temporarily removing from the // file watcher. QStringList trackedFiles = _file_system_watcher.files (); - if (!trackedFiles.isEmpty ()) + if (! trackedFiles.isEmpty ()) _file_system_watcher.removePath (_file_name); if (QFile::exists (_file_name)) @@ -2062,7 +2062,7 @@ return; // Unnamed files shouldn't be transmitted. - if (!_file_name.isEmpty ()) + if (! _file_name.isEmpty ()) emit add_filename_to_list (_file_name, _encoding, this); } diff -r 6982def1d416 -r 77f5591878bf libgui/src/m-editor/file-editor.cc --- a/libgui/src/m-editor/file-editor.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/m-editor/file-editor.cc Sun Dec 20 10:15:02 2015 -0800 @@ -89,7 +89,7 @@ p != editor_tab_map.end (); p++) { QString file_name = p->first; // get file name of tab - if (!file_name.isEmpty ()) // do not append unnamed files + if (! file_name.isEmpty ()) // do not append unnamed files { fetFileNames.append (file_name); fet_encodings.append (editor_tab_map[file_name].encoding); @@ -481,7 +481,7 @@ QMessageBox *msgBox; QSettings *settings = resource_manager::get_settings (); - if (!settings->value ("editor/create_new_file", false).toBool ()) + if (! settings->value ("editor/create_new_file", false).toBool ()) { msgBox = new QMessageBox (QMessageBox::Question, tr ("Octave Editor"), @@ -505,7 +505,7 @@ { // create the file and call the editor again QFile file (openFileName); - if (!file.open (QIODevice::WriteOnly)) + if (! file.open (QIODevice::WriteOnly)) { // error opening the file msgBox = new QMessageBox (QMessageBox::Critical, @@ -596,7 +596,7 @@ break; } } - if (!saveFileWidget) + if (! saveFileWidget) { // Create a NonModal message about error. QMessageBox *msgBox @@ -1125,7 +1125,7 @@ { QSettings *settings = resource_manager::get_settings (); bool old = settings->value (preference,def).toBool (); - settings->setValue (preference,!old); + settings->setValue (preference,! old); notice_settings (settings); } diff -r 6982def1d416 -r 77f5591878bf libgui/src/m-editor/find-dialog.cc --- a/libgui/src/m-editor/find-dialog.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/m-editor/find-dialog.cc Sun Dec 20 10:15:02 2015 -0800 @@ -253,7 +253,7 @@ void find_dialog::find_next () { - find (!_backward_check_box->isChecked ()); + find (! _backward_check_box->isChecked ()); } void diff -r 6982def1d416 -r 77f5591878bf libgui/src/m-editor/octave-qscintilla.cc --- a/libgui/src/m-editor/octave-qscintilla.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/m-editor/octave-qscintilla.cc Sun Dec 20 10:15:02 2015 -0800 @@ -156,7 +156,7 @@ _word_at_cursor = wordAtPoint (local_pos); QString lexer_name = lexer ()->lexer (); return ((lexer_name == "octave" || lexer_name == "matlab") - && !_word_at_cursor.isEmpty ()); + && ! _word_at_cursor.isEmpty ()); } // call documentation or help on the current word @@ -208,7 +208,7 @@ QRect editor_rect = geometry (); // editor rect mapped to global editor_rect.moveTopLeft (parentWidget ()->mapToGlobal (editor_rect.topLeft ())); - if (!editor_rect.contains (global_pos)) // is cursor outside editor? + if (! editor_rect.contains (global_pos)) // is cursor outside editor? global_pos = editor_rect.topLeft (); // yes, take top left corner } @@ -221,7 +221,7 @@ if (lexer_name == "octave" || lexer_name == "matlab") { _word_at_cursor = wordAtPoint (local_pos); - if (!_word_at_cursor.isEmpty ()) + if (! _word_at_cursor.isEmpty ()) { context_menu->addAction (tr ("Help on") + " " + _word_at_cursor, this, SLOT (contextmenu_help (bool))); diff -r 6982def1d416 -r 77f5591878bf libgui/src/main-window.cc --- a/libgui/src/main-window.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/main-window.cc Sun Dec 20 10:15:02 2015 -0800 @@ -727,7 +727,7 @@ int count = 0; int icon_set_found = 0; // default - while (!widget_icon_data[count].name.isEmpty ()) + while (! widget_icon_data[count].name.isEmpty ()) { // while not end of data if (widget_icon_data[count].name == icon_set) @@ -1039,7 +1039,7 @@ { QSettings *settings = resource_manager::get_settings (); - if (!settings) + if (! settings) { qDebug ("Error: QSettings pointer from resource manager is NULL."); return; @@ -1121,7 +1121,7 @@ main_window::write_settings (void) { QSettings *settings = resource_manager::get_settings (); - if (!settings) + if (! settings) { qDebug ("Error: QSettings pointer from resource manager is NULL."); return; @@ -2176,7 +2176,7 @@ { bool repost = false; // flag for reposting event for this callback - if (!_dbg_queue->isEmpty ()) // list can not be empty here, just to make sure + if (! _dbg_queue->isEmpty ()) // list can not be empty here, just to make sure { _dbg_queue_mutex.lock (); // critical path QString debug = _dbg_queue->takeFirst (); diff -r 6982def1d416 -r 77f5591878bf libgui/src/qtinfo/parser.cc --- a/libgui/src/qtinfo/parser.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/qtinfo/parser.cc Sun Dec 20 10:15:02 2015 -0800 @@ -114,7 +114,7 @@ QBuffer *io = new QBuffer (this); io->setData (result); - if (!io->open (QIODevice::ReadOnly | QIODevice::Text)) + if (! io->open (QIODevice::ReadOnly | QIODevice::Text)) return 0; iodevice = io; @@ -122,7 +122,7 @@ else { QFile *io = new QFile (file_info.absoluteFilePath ()); - if (!io->open (QIODevice::ReadOnly | QIODevice::Text)) + if (! io->open (QIODevice::ReadOnly | QIODevice::Text)) return 0; iodevice = io; } @@ -176,7 +176,7 @@ seek (io, realPos); QString text = get_next_node (io); - if (!text.isEmpty()) + if (! text.isEmpty()) { return text; } @@ -191,7 +191,7 @@ QString parser::search_node (const QString& node, QIODevice *io) { - while (!io->atEnd ()) + while (! io->atEnd ()) { QString text = get_next_node (io); if (node == get_node_name (text)) @@ -211,7 +211,7 @@ char c; int i; - while (!io->atEnd ()) + while (! io->atEnd ()) { io->getChar (&c); if (c) @@ -555,7 +555,7 @@ parser::seek (QIODevice *io, int pos) { char ch; - while (!io->atEnd () && pos > 0) + while (! io->atEnd () && pos > 0) { io->getChar (&ch); pos--; diff -r 6982def1d416 -r 77f5591878bf libgui/src/resource-manager.cc --- a/libgui/src/resource-manager.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/resource-manager.cc Sun Dec 20 10:15:02 2015 -0800 @@ -117,13 +117,13 @@ // load the translator file for qt strings loaded = qt_tr->load ("qt_" + language, qt_trans_dir); - if (!loaded) // try lower case + if (! loaded) // try lower case qt_tr->load ("qt_" + language.toLower (), qt_trans_dir); // load the translator file for qscintilla settings loaded = qsci_tr->load ("qscintilla_" + language, qt_trans_dir); - if (!loaded) // try lower case + if (! loaded) // try lower case qsci_tr->load ("qscintilla_" + language.toLower (), qt_trans_dir); // load the translator file for gui strings @@ -185,7 +185,7 @@ QDir ("/").mkpath (settings_directory); QFile qt_settings (default_qt_settings_file ()); - if (!qt_settings.open (QFile::ReadOnly)) + if (! qt_settings.open (QFile::ReadOnly)) return; QTextStream in (&qt_settings); diff -r 6982def1d416 -r 77f5591878bf libgui/src/workspace-view.cc --- a/libgui/src/workspace-view.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libgui/src/workspace-view.cc Sun Dec 20 10:15:02 2015 -0800 @@ -462,7 +462,7 @@ QString tool_tip; - if (!settings->value ("workspaceview/hide_tool_tips",false).toBool ()) + if (! settings->value ("workspaceview/hide_tool_tips",false).toBool ()) { tool_tip = QString (tr ("View the variables in the active workspace.
")); tool_tip += QString (tr ("Colors for variable attributes:")); diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/data.cc --- a/libinterp/corefcn/data.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/data.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1001,7 +1001,7 @@ { \ error (#FCN, ": invalid char type"); \ } \ - else if (!isdouble && arg.is_single_type ()) \ + else if (! isdouble && arg.is_single_type ()) \ { \ if (arg.is_complex_type ()) \ { \ @@ -1041,7 +1041,7 @@ \ retval = tmp.FCN (dim); \ } \ - else if (!isdouble && arg.is_single_type ()) \ + else if (! isdouble && arg.is_single_type ()) \ { \ if (arg.is_real_type ()) \ { \ @@ -1957,11 +1957,11 @@ if (all_cmplx_p && ! (args(i).is_complex_type () || args(i).is_real_type ())) all_cmplx_p = false; - if (!any_sparse_p && args(i).is_sparse_type ()) + if (! any_sparse_p && args(i).is_sparse_type ()) any_sparse_p = true; - if (!any_cell_p && args(i).is_cell ()) + if (! any_cell_p && args(i).is_cell ()) any_cell_p = true; - if (!any_class_p && args(i).is_object ()) + if (! any_class_p && args(i).is_object ()) any_class_p = true; } diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/dlmread.cc --- a/libinterp/corefcn/dlmread.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/dlmread.cc Sun Dec 20 10:15:02 2015 -0800 @@ -118,7 +118,7 @@ if (ch == '.') { ch = is.get (); - if (!is || ch != '.') + if (! is || ch != '.') stat = false; } @@ -129,16 +129,16 @@ { rup = rlo; cup = clo; - if (!is || !is.eof ()) + if (! is || ! is.eof ()) stat = false; } } } - if (stat && is && !is.eof ()) + if (stat && is && ! is.eof ()) stat = read_cell_spec (is, rup, cup); - if (!is || !is.eof ()) + if (! is || ! is.eof ()) stat = false; } else if (range_spec.is_real_matrix () && range_spec.numel () == 4) @@ -251,7 +251,7 @@ { if (nargin == 3) { - if (!parse_range_spec (args(2), r0, c0, r1, c1)) + if (! parse_range_spec (args(2), r0, c0, r1, c1)) error ("dlmread: error parsing RANGE"); } else if (nargin == 4) @@ -296,7 +296,7 @@ // To be compatible with matlab, blank separator should // correspond to whitespace as delimter. - if (!sep.length ()) + if (! sep.length ()) { size_t n = line.find_first_of (",:; \t", line.find_first_of ("0123456789")); @@ -412,7 +412,7 @@ { double y = octave_read_double (tmp_stream); - if (!iscmplx && y != 0.) + if (! iscmplx && y != 0.) { iscmplx = true; cdata = ComplexMatrix (rdata); diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/gl-render.cc --- a/libinterp/corefcn/gl-render.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/gl-render.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1193,7 +1193,7 @@ if (yticklabels.numel () > 0) { int halign = (ystate == AXE_HORZ_DIR - ? 1 : (!xyzSym || y2Dright ? 0 : 2)); + ? 1 : (! xyzSym || y2Dright ? 0 : 2)); int valign = (ystate == AXE_VERT_DIR ? 1 : 2); if (tick_along_z) diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/gl2ps-renderer.cc --- a/libinterp/corefcn/gl2ps-renderer.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/gl2ps-renderer.cc Sun Dec 20 10:15:02 2015 -0800 @@ -45,7 +45,7 @@ static bool in_draw = false; static std::string old_print_cmd; - if (!in_draw) + if (! in_draw) { unwind_protect frame; diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/graphics.cc Sun Dec 20 10:15:02 2015 -0800 @@ -5540,7 +5540,7 @@ xySym = (xd*yd*(xPlane-xPlaneN)*(yPlane-yPlaneN) > 0); zSign = (zd*(zPlane-zPlaneN) <= 0); - xyzSym = zSign ? xySym : !xySym; + xyzSym = zSign ? xySym : ! xySym; xpTick = (zSign ? xPlaneN : xPlane); ypTick = (zSign ? yPlaneN : yPlane); zpTick = (zSign ? zPlane : zPlaneN); @@ -5790,7 +5790,7 @@ if (ylabel_props.horizontalalignmentmode_is ("auto")) { ylabel_props.set_horizontalalignment - (ystate > AXE_DEPTH_DIR ? "center" : (!xyzSym ? "left" : "right")); + (ystate > AXE_DEPTH_DIR ? "center" : (! xyzSym ? "left" : "right")); ylabel_props.set_horizontalalignmentmode ("auto"); } @@ -5798,7 +5798,7 @@ if (ylabel_props.verticalalignmentmode_is ("auto")) { ylabel_props.set_verticalalignment - (ystate == AXE_VERT_DIR && !y2Dright ? "bottom" : "top"); + (ystate == AXE_VERT_DIR && ! y2Dright ? "bottom" : "top"); ylabel_props.set_verticalalignmentmode ("auto"); } @@ -5840,7 +5840,7 @@ switch (ystate) { case AXE_ANY_DIR: - p(0) += (!xyzSym ? wmax : -wmax); + p(0) += (! xyzSym ? wmax : -wmax); p(1) += hmax; break; @@ -5963,7 +5963,7 @@ // FIXME: what's the correct offset? // - // p[0] += (!xySym ? wmax : -wmax); + // p[0] += (! xySym ? wmax : -wmax); // p[1] += (zSign ? hmax : -hmax); break; diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/graphics.in.h --- a/libinterp/corefcn/graphics.in.h Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/graphics.in.h Sun Dec 20 10:15:02 2015 -0800 @@ -609,7 +609,7 @@ for (octave_idx_type i = 0; i < nel; i++) { strings[i] = chm.row_as_string (i); - if (!replace && strings[i] != str[i]) + if (! replace && strings[i] != str[i]) replace = true; } diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/ls-hdf5.cc --- a/libinterp/corefcn/ls-hdf5.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/ls-hdf5.cc Sun Dec 20 10:15:02 2015 -0800 @@ -592,7 +592,7 @@ retval = (d->tc.load_hdf5 (group_id, name) ? 1 : -1); } - if (!ident_valid) + if (! ident_valid) { // should we attempt to handle invalid identifiers by converting // bad characters to '_', say? @@ -803,7 +803,7 @@ empty = true; } - if (!empty) + if (! empty) return 0; space_hid = H5Screate_simple (1, &sz, 0); diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/ls-mat5.cc --- a/libinterp/corefcn/ls-mat5.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/ls-mat5.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1504,7 +1504,7 @@ if (! swap) // version number is inverse swapped! version = ((version >> 8) & 0xff) + ((version & 0xff) << 8); - if (version != 1 && !quiet) + if (version != 1 && ! quiet) warning ("load: found version %d binary MAT file, " "but only prepared for version 1", version); @@ -1907,7 +1907,7 @@ } } - if (!too_large_for_float) + if (! too_large_for_float) size = 4; } @@ -2295,7 +2295,7 @@ } #ifdef HAVE_ZLIB - if (mat7_format && !compressing) + if (mat7_format && ! compressing) { bool ret = false; diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/ls-oct-binary.cc --- a/libinterp/corefcn/ls-oct-binary.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/ls-oct-binary.cc Sun Dec 20 10:15:02 2015 -0800 @@ -253,7 +253,7 @@ break; } - if (!tc.load_binary (is, swap, fmt)) + if (! tc.load_binary (is, swap, fmt)) { data_read_error: error ("load: trouble reading binary file '%s'", filename.c_str ()); diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/lsode.cc --- a/libinterp/corefcn/lsode.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/lsode.cc Sun Dec 20 10:15:02 2015 -0800 @@ -315,7 +315,7 @@ lsode_jac = extract_function (c(1), "lsode", jac_name, jname, "; endfunction"); - if (!lsode_jac) + if (! lsode_jac) { if (fcn_name.length ()) clear_function (fcn_name); @@ -328,7 +328,7 @@ error ("lsode: incorrect number of elements in cell array"); } - if (!lsode_fcn && ! f_arg.is_cell ()) + if (! lsode_fcn && ! f_arg.is_cell ()) { if (f_arg.is_function_handle () || f_arg.is_inline_function ()) lsode_fcn = f_arg.function_value (); @@ -370,7 +370,7 @@ jac_name, jname, "; endfunction"); - if (!lsode_jac) + if (! lsode_jac) { if (fcn_name.length ()) clear_function (fcn_name); diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/mappers.cc --- a/libinterp/corefcn/mappers.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/mappers.cc Sun Dec 20 10:15:02 2015 -0800 @@ -921,12 +921,12 @@ } /* -%!assert (!isfinite (Inf)) -%!assert (!isfinite (NaN)) +%!assert (! isfinite (Inf)) +%!assert (! isfinite (NaN)) %!assert (isfinite (rand (1,10))) -%!assert (!isfinite (single (Inf))) -%!assert (!isfinite (single (NaN))) +%!assert (! isfinite (single (Inf))) +%!assert (! isfinite (single (NaN))) %!assert (isfinite (single (rand (1,10)))) %!error isfinite () @@ -1253,14 +1253,14 @@ /* %!assert (isinf (Inf)) -%!assert (!isinf (NaN)) -%!assert (!isinf (NA)) +%!assert (! isinf (NaN)) +%!assert (! isinf (NA)) %!assert (isinf (rand (1,10)), false (1,10)) %!assert (isinf ([NaN -Inf -1 0 1 Inf NA]), [false, true, false, false, false, true, false]) %!assert (isinf (single (Inf))) -%!assert (!isinf (single (NaN))) -%!assert (!isinf (single (NA))) +%!assert (! isinf (single (NaN))) +%!assert (! isinf (single (NA))) %!assert (isinf (single (rand (1,10))), false (1,10)) %!assert (isinf (single ([NaN -Inf -1 0 1 Inf NA])), [false, true, false, false, false, true, false]) @@ -1343,14 +1343,14 @@ } /* -%!assert (!isna (Inf)) -%!assert (!isna (NaN)) +%!assert (! isna (Inf)) +%!assert (! isna (NaN)) %!assert (isna (NA)) %!assert (isna (rand (1,10)), false (1,10)) %!assert (isna ([NaN -Inf -1 0 1 Inf NA]), [false, false, false, false, false, false, true]) -%!assert (!isna (single (Inf))) -%!assert (!isna (single (NaN))) +%!assert (! isna (single (Inf))) +%!assert (! isna (single (NaN))) %!assert (isna (single (NA))) %!assert (isna (single (rand (1,10))), false (1,10)) %!assert (isna (single ([NaN -Inf -1 0 1 Inf NA])), [false, false, false, false, false, false, true]) @@ -1383,13 +1383,13 @@ } /* -%!assert (!isnan (Inf)) +%!assert (! isnan (Inf)) %!assert (isnan (NaN)) %!assert (isnan (NA)) %!assert (isnan (rand (1,10)), false (1,10)) %!assert (isnan ([NaN -Inf -1 0 1 Inf NA]), [true, false, false, false, false, false, true]) -%!assert (!isnan (single (Inf))) +%!assert (! isnan (single (Inf))) %!assert (isnan (single (NaN))) %!assert (isnan (single (NA))) %!assert (isnan (single (rand (1,10))), false (1,10)) @@ -2076,7 +2076,7 @@ /* %!assert (tolower ("OCTAVE"), "octave") -%!assert (tolower ("123OCTave!_&"), "123octave!_&") +%!assert (tolower ("123OCTave! _&"), "123octave! _&") %!assert (tolower ({"ABC", "DEF", {"GHI", {"JKL"}}}), {"abc", "def", {"ghi", {"jkl"}}}) %!assert (tolower (["ABC"; "DEF"]), ["abc"; "def"]) %!assert (tolower ({["ABC"; "DEF"]}), {["abc";"def"]}) @@ -2135,7 +2135,7 @@ /* %!assert (toupper ("octave"), "OCTAVE") -%!assert (toupper ("123OCTave!_&"), "123OCTAVE!_&") +%!assert (toupper ("123OCTave! _&"), "123OCTAVE! _&") %!assert (toupper ({"abc", "def", {"ghi", {"jkl"}}}), {"ABC", "DEF", {"GHI", {"JKL"}}}) %!assert (toupper (["abc"; "def"]), ["ABC"; "DEF"]) %!assert (toupper ({["abc"; "def"]}), {["ABC";"DEF"]}) diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/pt-jit.cc --- a/libinterp/corefcn/pt-jit.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/pt-jit.cc Sun Dec 20 10:15:02 2015 -0800 @@ -515,7 +515,7 @@ { if (ti.has_magic_end ()) { - if (!end_context.size ()) + if (! end_context.size ()) throw jit_fail_exception ("Illegal end"); result = block->append (factory.create (end_context)); } diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/regexp.cc --- a/libinterp/corefcn/regexp.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/regexp.cc Sun Dec 20 10:15:02 2015 -0800 @@ -968,7 +968,7 @@ %! assert (t{1}{1}, 'short'); %! assert (t{1}{2}, 'test'); %! assert (size (nm), [1, 1]); -%! assert (!isempty (fieldnames (nm))); +%! assert (! isempty (fieldnames (nm))); %! assert (sort (fieldnames (nm)), {'word1';'word2'}); %! assert (nm.word1, 'short'); %! assert (nm.word2, 'test'); @@ -1245,7 +1245,7 @@ %! assert (t{1}{1}, 'ShoRt'); %! assert (t{1}{2}, 'Test'); %! assert (size (nm), [1, 1]); -%! assert (!isempty (fieldnames (nm))); +%! assert (! isempty (fieldnames (nm))); %! assert (sort (fieldnames (nm)), {'word1';'word2'}); %! assert (nm.word1, 'ShoRt'); %! assert (nm.word2, 'Test'); diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/spparms.cc --- a/libinterp/corefcn/spparms.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/spparms.cc Sun Dec 20 10:15:02 2015 -0800 @@ -169,7 +169,7 @@ if (str == "umfpack") warning ("spparms: request to disable umfpack solvers ignored"); - else if (!octave_sparse_params::set_key (str, val)) + else if (! octave_sparse_params::set_key (str, val)) error ("spparms: KEY not found"); } else diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/symtab.h --- a/libinterp/corefcn/symtab.h Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/symtab.h Sun Dec 20 10:15:02 2015 -0800 @@ -2473,7 +2473,7 @@ void add_nest_child (symbol_table& st) { - assert (!st.nest_parent); + assert (! st.nest_parent); nest_children.push_back (&st); st.nest_parent = this; } diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/utils.cc --- a/libinterp/corefcn/utils.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/utils.cc Sun Dec 20 10:15:02 2015 -0800 @@ -342,11 +342,11 @@ %! assert (! isempty (f)); %!test -%! f = file_in_loadpath ("$$probably_!!_not_&&_a_!!_file$$"); +%! f = file_in_loadpath ("$$probably_!! _not_&&_a_!! _file$$"); %! assert (f, ""); %!test -%! lst = file_in_loadpath ("$$probably_!!_not_&&_a_!!_file$$", "all"); +%! lst = file_in_loadpath ("$$probably_!! _not_&&_a_!! _file$$", "all"); %! assert (lst, {}); %!error file_in_loadpath () @@ -417,11 +417,11 @@ %! assert (! isempty (f)); %!test -%! f = file_in_path (path (), "$$probably_!!_not_&&_a_!!_file$$"); +%! f = file_in_path (path (), "$$probably_!! _not_&&_a_!! _file$$"); %! assert (f, ""); %!test -%! lst = file_in_path (path (), "$$probably_!!_not_&&_a_!!_file$$", "all"); +%! lst = file_in_path (path (), "$$probably_!! _not_&&_a_!! _file$$", "all"); %! assert (lst, {}); %!error file_in_path () @@ -1012,11 +1012,11 @@ %! assert (! isempty (f)); %!test -%! f = dir_in_loadpath ("$$probably_!!_not_&&_a_!!_dir$$"); +%! f = dir_in_loadpath ("$$probably_!! _not_&&_a_!! _dir$$"); %! assert (f, ""); %!test -%! lst = dir_in_loadpath ("$$probably_!!_not_&&_a_!!_dir$$", "all"); +%! lst = dir_in_loadpath ("$$probably_!! _not_&&_a_!! _dir$$", "all"); %! assert (lst, {}); %!error dir_in_loadpath () diff -r 6982def1d416 -r 77f5591878bf libinterp/corefcn/zfstream.cc --- a/libinterp/corefcn/zfstream.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/corefcn/zfstream.cc Sun Dec 20 10:15:02 2015 -0800 @@ -173,18 +173,18 @@ // Double the time for less than 1% size improvement seems // excessive though - keeping it at the default level // To change back, just append "9" to the next three mode strings - if (!testi && testo && !testt && !testa) + if (! testi && testo && ! testt && ! testa) strcpy (c_mode, "w"); - if (!testi && testo && !testt && testa) + if (! testi && testo && ! testt && testa) strcpy (c_mode, "a"); - if (!testi && testo && testt && !testa) + if (! testi && testo && testt && ! testa) strcpy (c_mode, "w"); - if (testi && !testo && !testt && !testa) + if (testi && ! testo && ! testt && ! testa) strcpy (c_mode, "r"); // No read/write mode yet - // if (testi && testo && !testt && !testa) + // if (testi && testo && ! testt && ! testa) // strcpy(c_mode, "r+"); - // if (testi && testo && testt && !testa) + // if (testi && testo && testt && ! testa) // strcpy(c_mode, "w+"); // Mode string should be empty for invalid combination of flags @@ -358,7 +358,7 @@ // least a buffer of size 1 (very inefficient though, therefore make it // bigger?). This follows from [27.5.2.4.3]/12 (gptr needs to point at // something, it seems). - if (!p || !n) + if (! p || ! n) { // Replace existing buffer (if any) with small internal buffer this->disable_buffer (); @@ -394,7 +394,7 @@ gzfilebuf::enable_buffer () { // If internal buffer required, allocate one - if (own_buffer && !buffer) + if (own_buffer && ! buffer) { // Check for buffered vs. "unbuffered" if (buffer_size > 0) diff -r 6982def1d416 -r 77f5591878bf libinterp/dldfcn/__eigs__.cc --- a/libinterp/dldfcn/__eigs__.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/dldfcn/__eigs__.cc Sun Dec 20 10:15:02 2015 -0800 @@ -215,7 +215,7 @@ else eigs_fcn = args(0).function_value (); - if (!eigs_fcn) + if (! eigs_fcn) error ("eigs: unknown function"); if (nargin < 2) @@ -310,7 +310,7 @@ // issym is ignored for complex matrix inputs tmp = map.getfield ("issym"); - if (tmp.is_defined () && !sym_tested) + if (tmp.is_defined () && ! sym_tested) { symmetric = tmp.double_value () != 0.; sym_tested = true; @@ -359,7 +359,7 @@ error ("eigs: incorrect number of arguments"); // Test undeclared (no issym) matrix inputs for symmetry - if (!sym_tested && !have_a_fun) + if (! sym_tested && ! have_a_fun) { if (a_is_sparse) symmetric = asmm.is_symmetric (); diff -r 6982def1d416 -r 77f5591878bf libinterp/dldfcn/__glpk__.cc --- a/libinterp/dldfcn/__glpk__.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/dldfcn/__glpk__.cc Sun Dec 20 10:15:02 2015 -0800 @@ -176,17 +176,17 @@ } // scale the problem data - if (!par->presol || lpsolver != 1) + if (! par->presol || lpsolver != 1) glp_scale_prob (lp, scale); // build advanced initial basis (if required) - if (lpsolver == 1 && !par->presol) + if (lpsolver == 1 && ! par->presol) glp_adv_basis (lp, 0); // For MIP problems without a presolver, a first pass with glp_simplex // is required - if ((!isMIP && lpsolver == 1) - || (isMIP && !par->presol)) + if ((! isMIP && lpsolver == 1) + || (isMIP && ! par->presol)) { glp_smcp smcp; glp_init_smcp (&smcp); @@ -223,7 +223,7 @@ errnum = glp_intopt (lp, &iocp); } - if (!isMIP && lpsolver == 2) + if (! isMIP && lpsolver == 2) { glp_iptcp iptcp; glp_init_iptcp (&iptcp); diff -r 6982def1d416 -r 77f5591878bf libinterp/dldfcn/__init_fltk__.cc --- a/libinterp/dldfcn/__init_fltk__.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/dldfcn/__init_fltk__.cc Sun Dec 20 10:15:02 2015 -0800 @@ -293,7 +293,7 @@ if (m->submenu ()) { // item has submenu - if (!menupath.empty ()) + if (! menupath.empty ()) menupath += "/"; menupath += m->label (); @@ -314,7 +314,7 @@ } // Menu item? std::string itempath = menupath; - if (!itempath.empty ()) + if (! itempath.empty ()) itempath += "/"; itempath += m->label (); @@ -383,7 +383,7 @@ void update_accelerator (uimenu::properties& uimenup) { std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { Fl_Menu_Item* item = const_cast (menubar->find_item ( fltk_label.c_str ())); @@ -402,13 +402,13 @@ void update_callback (uimenu::properties& uimenup) { std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { Fl_Menu_Item* item = const_cast (menubar->find_item ( fltk_label.c_str ())); if (item) { - if (!uimenup.get_callback ().is_empty ()) + if (! uimenup.get_callback ().is_empty ()) item->callback (static_cast (script_cb), static_cast (&uimenup)); else @@ -420,7 +420,7 @@ void update_enable (uimenu::properties& uimenup) { std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { Fl_Menu_Item* item = const_cast (menubar->find_item ( fltk_label.c_str ())); @@ -437,7 +437,7 @@ void update_foregroundcolor (uimenu::properties& uimenup) { std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { Fl_Menu_Item* item = const_cast (menubar->find_item ( fltk_label.c_str ())); @@ -460,7 +460,7 @@ // menu entry, while fltk places it after. So we need to find // the previous item in this menu/submenu. (Kai) std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { int itemflags = 0, idx; int curr_idx = find_index_by_name (fltk_label.c_str ()); @@ -490,7 +490,7 @@ void update_visible (uimenu::properties& uimenup) { std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { Fl_Menu_Item* item = const_cast (menubar->find_item (fltk_label.c_str ())); @@ -514,7 +514,7 @@ std::string fltk_label = uimenup.get_fltk_label (); - if (!fltk_label.empty ()) + if (! fltk_label.empty ()) { bool item_added = false; do @@ -554,7 +554,7 @@ item_added = true; } } - while (!item_added); + while (! item_added); uimenup.set_fltk_label (fltk_label); } } @@ -771,7 +771,7 @@ set_name (); uimenu->add_to_menu (fp); - if (fp.menubar_is ("none") || !uimenu->items_to_show ()) + if (fp.menubar_is ("none") || ! uimenu->items_to_show ()) hide_menubar (); update_boundingbox (internal); @@ -1182,7 +1182,7 @@ void set_currentpoint (int px, int py) { - if (!fp.is_beingdeleted ()) + if (! fp.is_beingdeleted ()) { Matrix pos = fp.map_from_boundingbox (px, py); fp.set_currentpoint (pos); @@ -1393,7 +1393,7 @@ graphics_handle gh; - if (!fp.is_beingdeleted ()) + if (! fp.is_beingdeleted ()) { //std::cout << "plot_window::handle event = " << fl_eventnames[event] << std::endl; diff -r 6982def1d416 -r 77f5591878bf libinterp/dldfcn/ccolamd.cc --- a/libinterp/dldfcn/ccolamd.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/dldfcn/ccolamd.cc Sun Dec 20 10:15:02 2015 -0800 @@ -513,7 +513,7 @@ if (cslen != n_col) error ("csymamd: CMEMBER must be of length equal to #cols of A"); - else if (!CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, + else if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, &calloc, &free, cmember, -1)) { CSYMAMD_NAME (_report) (stats) ; @@ -523,7 +523,7 @@ } else { - if (!CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, + if (! CSYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, &calloc, &free, 0, -1)) { CSYMAMD_NAME (_report) (stats) ; diff -r 6982def1d416 -r 77f5591878bf libinterp/dldfcn/colamd.cc --- a/libinterp/dldfcn/colamd.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/dldfcn/colamd.cc Sun Dec 20 10:15:02 2015 -0800 @@ -586,7 +586,7 @@ // Allocate workspace for symamd OCTAVE_LOCAL_BUFFER (octave_idx_type, perm, n_col+1); OCTAVE_LOCAL_BUFFER (octave_idx_type, stats, COLAMD_STATS); - if (!SYMAMD_NAME () (n_col, ridx, cidx, perm, + if (! SYMAMD_NAME () (n_col, ridx, cidx, perm, knobs, stats, &calloc, &free)) { SYMAMD_NAME (_report) (stats) ; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-base-diag.cc --- a/libinterp/octave-value/ov-base-diag.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-base-diag.cc Sun Dec 20 10:15:02 2015 -0800 @@ -509,7 +509,7 @@ MT tmp (l, 1); is >> tmp; - if (!is) + if (! is) error ("load: failed to load diagonal matrix constant"); else { diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-base-int.cc --- a/libinterp/octave-value/ov-base-int.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-base-int.cc Sun Dec 20 10:15:02 2015 -0800 @@ -221,7 +221,7 @@ is >> tmp; - if (!is) + if (! is) error ("load: failed to load matrix constant"); this->matrix = tmp; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-base-sparse.cc --- a/libinterp/octave-value/ov-base-sparse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-base-sparse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -455,7 +455,7 @@ is >> tmp; - if (!is) + if (! is) error ("load: failed to load matrix constant"); matrix = tmp; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-bool-mat.cc --- a/libinterp/octave-value/ov-bool-mat.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-bool-mat.cc Sun Dec 20 10:15:02 2015 -0800 @@ -585,7 +585,7 @@ /* %!test %! m = eye (2) != 0; -%! s = !0; +%! s = ! 0; %! c = {"double", "single", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "logical"}; %! for i = 1:numel (c) %! assert (logical (eye (2, c{i})), m) diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-bool-sparse.cc --- a/libinterp/octave-value/ov-bool-sparse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-bool-sparse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -388,7 +388,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -413,7 +413,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -438,7 +438,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -476,7 +476,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -514,7 +514,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-bool.cc --- a/libinterp/octave-value/ov-bool.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-bool.cc Sun Dec 20 10:15:02 2015 -0800 @@ -129,7 +129,7 @@ { scalar = (octave_read_value (is) != 0.); - if (!is) + if (! is) error ("load: failed to load scalar constant"); return true; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-class.cc --- a/libinterp/octave-value/ov-class.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-class.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1172,7 +1172,7 @@ { dbgstr = *pit; bool dbgbool = map.contains (*pit); - if (!dbgbool) + if (! dbgbool) { retval = false; break; @@ -1615,7 +1615,7 @@ { map = m; - if (!reconstruct_parents ()) + if (! reconstruct_parents ()) warning ("load: unable to reconstruct object inheritance"); if (load_path::find_method (c_name, "loadobj") != std::string ()) diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-cx-sparse.cc --- a/libinterp/octave-value/ov-cx-sparse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-cx-sparse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -421,7 +421,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -446,7 +446,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -471,7 +471,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -509,7 +509,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -547,7 +547,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-fcn-handle.cc --- a/libinterp/octave-value/ov-fcn-handle.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-handle.cc Sun Dec 20 10:15:02 2015 -0800 @@ -452,7 +452,7 @@ std::string name = read_text_data (is, std::string (), dummy, t2, i); - if (!is) + if (! is) { error ("load: failed to load anonymous function handle"); break; @@ -637,7 +637,7 @@ read_binary_data (is, swap, fmt, std::string (), dummy, t2, doc); - if (!is) + if (! is) { error ("load: failed to load anonymous function handle"); break; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-fcn-inline.cc --- a/libinterp/octave-value/ov-fcn-inline.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-inline.cc Sun Dec 20 10:15:02 2015 -0800 @@ -344,7 +344,7 @@ H5Dclose (data_hid); H5Sclose (space_hid); - if (!retval) + if (! retval) { H5Gclose (group_hid); return false; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-java.cc --- a/libinterp/octave-value/ov-java.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-java.cc Sun Dec 20 10:15:02 2015 -0800 @@ -508,11 +508,11 @@ jsize nVMs = 0; -# if !defined (__APPLE__) && !defined (__MACH__) +# if ! defined (__APPLE__) && ! defined (__MACH__) octave_shlib lib (jvm_lib_path); - if (!lib) + if (! lib) throw std::string ("unable to load Java Runtime Environment from ") + jvm_lib_path; @@ -530,10 +530,10 @@ JNI_GetCreatedJavaVMs_t get_vm = reinterpret_cast (lib.search ("JNI_GetCreatedJavaVMs")); - if (!create_vm) + if (! create_vm) throw std::string ("unable to find JNI_CreateJavaVM in ") + jvm_lib_path; - if (!get_vm) + if (! get_vm) throw std::string ("unable to find JNI_GetCreatedJavaVMs in ") + jvm_lib_path; @@ -590,7 +590,7 @@ vm_args.read_java_opts (initial_java_dir () + file_ops::dir_sep_str () + "java.opts"); -# if !defined (__APPLE__) && !defined (__MACH__) +# if ! defined (__APPLE__) && ! defined (__MACH__) if (create_vm (&jvm, ¤t_env, vm_args.to_args ()) != JNI_OK) throw std::string ("unable to start Java VM in ")+jvm_lib_path; @@ -1356,7 +1356,7 @@ jcls = 0; //jcls = jni_env->FindClass ("java/lang/Object"); } - else if (!Vjava_matrix_autoconversion + else if (! Vjava_matrix_autoconversion && ((val.is_real_matrix () && (val.rows () == 1 || val.columns () == 1)) || val.is_range ())) diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-perm.cc --- a/libinterp/octave-value/ov-perm.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-perm.cc Sun Dec 20 10:15:02 2015 -0800 @@ -292,7 +292,7 @@ bool colp = orient == 'c'; ColumnVector tmp (n); is >> tmp; - if (!is) + if (! is) error ("load: failed to load permutation matrix constant"); else { diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-re-sparse.cc --- a/libinterp/octave-value/ov-re-sparse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-re-sparse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -450,7 +450,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -474,7 +474,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -499,7 +499,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -537,7 +537,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); @@ -574,7 +574,7 @@ retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) >= 0; H5Dclose (data_hid); - if (!retval) + if (! retval) { H5Sclose (space_hid); H5Gclose (group_hid); diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-str-mat.cc --- a/libinterp/octave-value/ov-str-mat.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-str-mat.cc Sun Dec 20 10:15:02 2015 -0800 @@ -370,7 +370,7 @@ skip_preceeding_newline (is); - if (! is.read (ftmp, dv.numel ()) || !is) + if (! is.read (ftmp, dv.numel ()) || ! is) error ("load: failed to load string constant"); else matrix = tmp; diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov-struct.cc --- a/libinterp/octave-value/ov-struct.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov-struct.cc Sun Dec 20 10:15:02 2015 -0800 @@ -744,7 +744,7 @@ std::string nm = read_text_data (is, std::string (), dummy, t2, j); - if (!is) + if (! is) break; Cell tcell = t2.is_cell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2); @@ -863,7 +863,7 @@ std::string nm = read_binary_data (is, swap, fmt, std::string (), dummy, t2, doc); - if (!is) + if (! is) break; Cell tcell = t2.is_cell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2); @@ -1388,7 +1388,7 @@ std::string nm = read_text_data (is, std::string (), dummy, t2, j); - if (!is) + if (! is) break; m.setfield (nm, t2); @@ -1469,7 +1469,7 @@ std::string nm = read_binary_data (is, swap, fmt, std::string (), dummy, t2, doc); - if (!is) + if (! is) break; m.setfield (nm, t2); diff -r 6982def1d416 -r 77f5591878bf libinterp/octave-value/ov.cc --- a/libinterp/octave-value/ov.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/octave-value/ov.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1602,7 +1602,7 @@ if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) { - if (!force_vector_conversion) + if (! force_vector_conversion) gripe_implicit_conversion ("Octave:array-to-vector", my_type.c_str (), wanted_type.c_str ()); retval = dim_vector (nel, 1); diff -r 6982def1d416 -r 77f5591878bf libinterp/parse-tree/pt-mat.cc --- a/libinterp/parse-tree/pt-mat.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/libinterp/parse-tree/pt-mat.cc Sun Dec 20 10:15:02 2015 -0800 @@ -327,13 +327,13 @@ if (all_cmplx && ! (val.is_complex_type () || val.is_real_type ())) all_cmplx = false; - if (!any_cell && val.is_cell ()) + if (! any_cell && val.is_cell ()) any_cell = true; - if (!any_sparse && val.is_sparse_type ()) + if (! any_sparse && val.is_sparse_type ()) any_sparse = true; - if (!any_class && val.is_object ()) + if (! any_class && val.is_object ()) any_class = true; // Special treatment of sparse matrices to avoid out-of-memory error @@ -583,13 +583,13 @@ if (all_mt && ! tmp.all_empty_p ()) all_mt = false; - if (!any_cell && tmp.any_cell_p ()) + if (! any_cell && tmp.any_cell_p ()) any_cell = true; - if (!any_sparse && tmp.any_sparse_p ()) + if (! any_sparse && tmp.any_sparse_p ()) any_sparse = true; - if (!any_class && tmp.any_class_p ()) + if (! any_class && tmp.any_class_p ()) any_class = true; all_1x1 = all_1x1 && tmp.all_1x1_p (); @@ -643,7 +643,7 @@ dv(1) = this_elt_nc; dv(0) += this_elt_nr; } - else if ((!any_class) && (!dv.hvcat (this_elt_dv, 0))) + else if ((! any_class) && (! dv.hvcat (this_elt_dv, 0))) eval_error ("vertical dimensions mismatch", dv, this_elt_dv); } diff -r 6982def1d416 -r 77f5591878bf liboctave/array/Array.cc --- a/liboctave/array/Array.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/Array.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1436,7 +1436,7 @@ { // Special case deleting a contiguous range. octave_idx_type m = n + l - u; - Array tmp (dim_vector (col_vec ? m : 1, !col_vec ? m : 1)); + Array tmp (dim_vector (col_vec ? m : 1, ! col_vec ? m : 1)); const T *src = data (); T *dest = tmp.fortran_vec (); std::copy (src, src + l, dest); diff -r 6982def1d416 -r 77f5591878bf liboctave/array/Array.h --- a/liboctave/array/Array.h Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/Array.h Sun Dec 20 10:15:02 2015 -0800 @@ -40,7 +40,7 @@ #include "quit.h" #include "oct-refcount.h" -//!Handles the reference counting for all the derived classes. +//! Handles the reference counting for all the derived classes. template class Array diff -r 6982def1d416 -r 77f5591878bf liboctave/array/CMatrix.cc --- a/liboctave/array/CMatrix.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/CMatrix.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1209,7 +1209,7 @@ mattype.mark_as_unsymmetric (); } - if (!mattype.is_hermitian ()) + if (! mattype.is_hermitian ()) ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) diff -r 6982def1d416 -r 77f5591878bf liboctave/array/CSparse.cc --- a/liboctave/array/CSparse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/CSparse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1127,7 +1127,7 @@ } } - if (!mattype.is_hermitian ()) + if (! mattype.is_hermitian ()) { octave_idx_type n = rows (); ColumnVector Qinit(n); @@ -1190,11 +1190,11 @@ UMFPACK_ZNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) { Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; Control (UMFPACK_PIVOT_TOLERANCE) = tmp; @@ -1202,7 +1202,7 @@ // Set whether we are allowed to modify Q or not tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; // Turn-off UMFPACK scaling for LU @@ -5464,10 +5464,10 @@ UMFPACK_ZNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) { Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; Control (UMFPACK_PIVOT_TOLERANCE) = tmp; @@ -5475,7 +5475,7 @@ // Set whether we are allowed to modify Q or not tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; UMFPACK_ZNAME (report_control) (control); diff -r 6982def1d416 -r 77f5591878bf liboctave/array/MatrixType.cc --- a/liboctave/array/MatrixType.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/MatrixType.cc Sun Dec 20 10:15:02 2015 -0800 @@ -329,7 +329,7 @@ } } - if (!singular) + if (! singular) { bandden = double (nnz) / (double (ncols) * (double (lower_band) + @@ -391,7 +391,7 @@ } } - if (!found) + if (! found) break; } @@ -647,7 +647,7 @@ } } - if (!singular) + if (! singular) { bandden = double (nnz) / (double (ncols) * (double (lower_band) + @@ -709,7 +709,7 @@ } } - if (!found) + if (! found) break; } @@ -965,7 +965,7 @@ if (typ != MatrixType::Unknown && (full || sp_bandden == octave_sparse_params::get_bandden ())) { - if (!quiet && octave_sparse_params::get_key ("spumoni") != 0.) + if (! quiet && octave_sparse_params::get_key ("spumoni") != 0.) warn_cached (); return typ; diff -r 6982def1d416 -r 77f5591878bf liboctave/array/PermMatrix.cc --- a/liboctave/array/PermMatrix.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/PermMatrix.cc Sun Dec 20 10:15:02 2015 -0800 @@ -48,7 +48,7 @@ } } - if (!colp) + if (! colp) *this = this->transpose (); } @@ -78,7 +78,7 @@ Array::operator = (idxa); } - if (!colp) + if (! colp) *this = this->transpose (); } diff -r 6982def1d416 -r 77f5591878bf liboctave/array/Sparse.h --- a/liboctave/array/Sparse.h Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/Sparse.h Sun Dec 20 10:15:02 2015 -0800 @@ -246,7 +246,7 @@ //! Amount of storage for nonzero elements. //! Synonymous with nzmax(). GCC_ATTR_DEPRECATED octave_idx_type capacity (void) const { return nzmax (); } - //!Actual number of nonzero terms. + //! Actual number of nonzero terms. octave_idx_type nnz (void) const { return rep->nnz (); } // Querying the number of elements (incl. zeros) may overflow the index type, diff -r 6982def1d416 -r 77f5591878bf liboctave/array/dMatrix.cc --- a/liboctave/array/dMatrix.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/dMatrix.cc Sun Dec 20 10:15:02 2015 -0800 @@ -856,7 +856,7 @@ mattype.mark_as_unsymmetric (); } - if (!mattype.is_hermitian ()) + if (! mattype.is_hermitian ()) ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) diff -r 6982def1d416 -r 77f5591878bf liboctave/array/dSparse.cc --- a/liboctave/array/dSparse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/dSparse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1220,7 +1220,7 @@ } } - if (!mattype.is_hermitian ()) + if (! mattype.is_hermitian ()) { octave_idx_type n = rows (); ColumnVector Qinit(n); @@ -1280,11 +1280,11 @@ UMFPACK_DNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) { Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; Control (UMFPACK_PIVOT_TOLERANCE) = tmp; @@ -1292,7 +1292,7 @@ // Set whether we are allowed to modify Q or not tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; // Turn-off UMFPACK scaling for LU @@ -5661,10 +5661,10 @@ UMFPACK_DNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) { Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; Control (UMFPACK_PIVOT_TOLERANCE) = tmp; @@ -5672,7 +5672,7 @@ // Set whether we are allowed to modify Q or not tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; UMFPACK_DNAME (report_control) (control); diff -r 6982def1d416 -r 77f5591878bf liboctave/array/fCMatrix.cc --- a/liboctave/array/fCMatrix.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/fCMatrix.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1212,7 +1212,7 @@ mattype.mark_as_unsymmetric (); } - if (!mattype.is_hermitian ()) + if (! mattype.is_hermitian ()) ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) diff -r 6982def1d416 -r 77f5591878bf liboctave/array/fMatrix.cc --- a/liboctave/array/fMatrix.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/fMatrix.cc Sun Dec 20 10:15:02 2015 -0800 @@ -863,7 +863,7 @@ mattype.mark_as_unsymmetric (); } - if (!mattype.is_hermitian ()) + if (! mattype.is_hermitian ()) ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) diff -r 6982def1d416 -r 77f5591878bf liboctave/array/idx-vector.cc --- a/liboctave/array/idx-vector.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/array/idx-vector.cc Sun Dec 20 10:15:02 2015 -0800 @@ -235,7 +235,7 @@ { if (i <= 0) { - if (!conv_error) // only gripe once, for things like A(-10000:0) + if (! conv_error) // only gripe once, for things like A(-10000:0) gripe_invalid_index (i-1); conv_error = true; } @@ -362,7 +362,7 @@ octave_idx_type k = inda.xelem (i); if (k < 0) { - if (!err) // only report first error, in case 1000s. + if (! err) // only report first error, in case 1000s. gripe_invalid_index (k); err = true; } diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/CollocWt.h --- a/liboctave/numeric/CollocWt.h Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/CollocWt.h Sun Dec 20 10:15:02 2015 -0800 @@ -150,14 +150,14 @@ double alpha (void) const { return Alpha; } double beta (void) const { return Beta; } - ColumnVector roots (void) { if (!initialized) init (); return r; } - ColumnVector quad (void) { if (!initialized) init (); return q; } + ColumnVector roots (void) { if (! initialized) init (); return r; } + ColumnVector quad (void) { if (! initialized) init (); return q; } ColumnVector quad_weights (void) { return quad (); } - Matrix first (void) { if (!initialized) init (); return A; } + Matrix first (void) { if (! initialized) init (); return A; } - Matrix second (void) { if (!initialized) init (); return B; } + Matrix second (void) { if (! initialized) init (); return B; } friend std::ostream& operator << (std::ostream&, const CollocWt&); diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/SparseCmplxLU.cc --- a/liboctave/numeric/SparseCmplxLU.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/SparseCmplxLU.cc Sun Dec 20 10:15:02 2015 -0800 @@ -56,31 +56,31 @@ UMFPACK_ZNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; if (piv_thres.numel () == 2) { tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } else { tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = octave_sparse_params::get_key ("sym_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } // Set whether we are allowed to modify Q or not tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; // Turn-off UMFPACK scaling for LU @@ -265,25 +265,25 @@ UMFPACK_ZNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; if (piv_thres.numel () == 2) { tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } else { tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = octave_sparse_params::get_key ("sym_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } @@ -296,7 +296,7 @@ else { tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; } diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/SparseCmplxQR.cc --- a/liboctave/numeric/SparseCmplxQR.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/SparseCmplxQR.cc Sun Dec 20 10:15:02 2015 -0800 @@ -76,7 +76,7 @@ #endif N = CXSPARSE_ZNAME (_qr) (&A, S); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - if (!N) + if (! N) (*current_liboctave_error_handler) ("SparseComplexQR: sparse matrix QR factorization filled"); count = 1; diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/SparseQR.cc --- a/liboctave/numeric/SparseQR.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/SparseQR.cc Sun Dec 20 10:15:02 2015 -0800 @@ -56,7 +56,7 @@ N = CXSPARSE_DNAME (_qr) (&A, S); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - if (!N) + if (! N) (*current_liboctave_error_handler) ("SparseQR: sparse matrix QR factorization filled"); count = 1; diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/SparsedbleLU.cc --- a/liboctave/numeric/SparsedbleLU.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/SparsedbleLU.cc Sun Dec 20 10:15:02 2015 -0800 @@ -54,32 +54,32 @@ UMFPACK_DNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; if (piv_thres.numel () == 2) { tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } else { tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = octave_sparse_params::get_key ("sym_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } // Set whether we are allowed to modify Q or not tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; if (scale) @@ -250,26 +250,26 @@ UMFPACK_DNAME (defaults) (control); double tmp = octave_sparse_params::get_key ("spumoni"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PRL) = tmp; if (piv_thres.numel () == 2) { tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = (piv_thres (1) > 1. ? 1. : piv_thres (1)); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } else { tmp = octave_sparse_params::get_key ("piv_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_PIVOT_TOLERANCE) = tmp; tmp = octave_sparse_params::get_key ("sym_tol"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_SYM_PIVOT_TOLERANCE) = tmp; } @@ -283,7 +283,7 @@ else { tmp = octave_sparse_params::get_key ("autoamd"); - if (!xisnan (tmp)) + if (! xisnan (tmp)) Control (UMFPACK_FIXQ) = tmp; } diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/base-qr.cc --- a/liboctave/numeric/base-qr.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/base-qr.cc Sun Dec 20 10:15:02 2015 -0800 @@ -50,7 +50,7 @@ { qr_type_t retval; - if (!q.is_empty () && q.is_square ()) + if (! q.is_empty () && q.is_square ()) retval = qr_type_std; else if (q.rows () > q.columns () && r.is_square ()) retval = qr_type_economy; diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/eigs-base.cc --- a/liboctave/numeric/eigs-base.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/eigs-base.cc Sun Dec 20 10:15:02 2015 -0800 @@ -247,7 +247,7 @@ M retval; const double* qv = Q.fortran_vec (); - if (!err) + if (! err) { retval.resize (n, b_nc); for (octave_idx_type j = 0; j < b_nc; j++) @@ -942,7 +942,7 @@ return -1; } - if (disp > 0 && !xisnan (workl[iptr (5)-1])) + if (disp > 0 && ! xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -975,7 +975,7 @@ for (octave_idx_type i = 0; i < n; i++) workd[i+iptr(1)-1] = mtmp(i,0); } - else if (!vector_product (m, workd + iptr(0) - 1, + else if (! vector_product (m, workd + iptr(0) - 1, workd + iptr(1) - 1)) break; } @@ -1235,7 +1235,7 @@ return -1; } - if (disp > 0 && !xisnan (workl[iptr (5)-1])) + if (disp > 0 && ! xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -1536,7 +1536,7 @@ return -1; } - if (disp > 0 && !xisnan (workl[iptr (5)-1])) + if (disp > 0 && ! xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -1856,7 +1856,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && ! xisnan(workl[iptr(5)-1])) { if (iter++) { @@ -1889,7 +1889,7 @@ for (octave_idx_type i = 0; i < n; i++) workd[i+iptr(1)-1] = mtmp(i,0); } - else if (!vector_product (m, workd + iptr(0) - 1, + else if (! vector_product (m, workd + iptr(0) - 1, workd + iptr(1) - 1)) break; } @@ -1962,7 +1962,7 @@ else d[i-jj] = Complex (dr[i], di[i]); } - if (jj == 0 && !rvec) + if (jj == 0 && ! rvec) for (octave_idx_type i = 0; i < k; i++) d[i] = d[i+1]; @@ -2198,7 +2198,7 @@ return -1; } - if (disp > 0 && !xisnan (workl[iptr (5)-1])) + if (disp > 0 && ! xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -2348,7 +2348,7 @@ else d[i-jj] = Complex (dr[i], di[i]); } - if (jj == 0 && !rvec) + if (jj == 0 && ! rvec) for (octave_idx_type i = 0; i < k; i++) d[i] = d[i+1]; @@ -2554,7 +2554,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && ! xisnan(workl[iptr(5)-1])) { if (iter++) { @@ -2660,7 +2660,7 @@ else d[i-jj] = Complex (dr[i], di[i]); } - if (jj == 0 && !rvec) + if (jj == 0 && ! rvec) for (octave_idx_type i = 0; i < k; i++) d[i] = d[i+1]; @@ -2925,7 +2925,7 @@ return -1; } - if (disp > 0 && !xisnan (workl[iptr (5)-1])) + if (disp > 0 && ! xisnan (workl[iptr (5)-1])) { if (iter++) { @@ -2957,7 +2957,7 @@ workd[i+iptr(1)-1] = mtmp(i,0); } - else if (!vector_product (m, workd + iptr(0) - 1, + else if (! vector_product (m, workd + iptr(0) - 1, workd + iptr(1) - 1)) break; } @@ -3219,7 +3219,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && ! xisnan(workl[iptr(5)-1])) { if (iter++) { @@ -3528,7 +3528,7 @@ return -1; } - if (disp > 0 && !xisnan(workl[iptr(5)-1])) + if (disp > 0 && ! xisnan(workl[iptr(5)-1])) { if (iter++) { diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/oct-fftw.cc --- a/liboctave/numeric/oct-fftw.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/oct-fftw.cc Sun Dec 20 10:15:02 2015 -0800 @@ -71,7 +71,7 @@ #if defined (HAVE_FFTW3_THREADS) int init_ret = fftw_init_threads (); - if (!init_ret) + if (! init_ret) (*current_liboctave_error_handler) ("Error initializing FFTW threads"); //Use number of processors available to the current process //This can be later changed with fftw ("threads", nthreads) @@ -148,7 +148,7 @@ if (plan[which] == 0 || d[which] != dist || s[which] != stride || r[which] != rank || h[which] != howmany || ioinplace != inplace[which] - || ((ioalign != simd_align[which]) ? !ioalign : false)) + || ((ioalign != simd_align[which]) ? ! ioalign : false)) create_new_plan = true; else { @@ -268,7 +268,7 @@ // change the alignment. if (rplan == 0 || rd != dist || rs != stride || rr != rank - || rh != howmany || ((ioalign != rsimd_align) ? !ioalign : false)) + || rh != howmany || ((ioalign != rsimd_align) ? ! ioalign : false)) create_new_plan = true; else { @@ -415,7 +415,7 @@ #if defined (HAVE_FFTW3F_THREADS) int init_ret = fftwf_init_threads (); - if (!init_ret) + if (! init_ret) (*current_liboctave_error_handler) ("Error initializing FFTW3F threads"); //Use number of processors available to the current process //This can be later changed with fftw ("threads", nthreads) @@ -490,7 +490,7 @@ if (plan[which] == 0 || d[which] != dist || s[which] != stride || r[which] != rank || h[which] != howmany || ioinplace != inplace[which] - || ((ioalign != simd_align[which]) ? !ioalign : false)) + || ((ioalign != simd_align[which]) ? ! ioalign : false)) create_new_plan = true; else { @@ -611,7 +611,7 @@ // change the alignment. if (rplan == 0 || rd != dist || rs != stride || rr != rank - || rh != howmany || ((ioalign != rsimd_align) ? !ioalign : false)) + || rh != howmany || ((ioalign != rsimd_align) ? ! ioalign : false)) create_new_plan = true; else { diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/randmtzig.c --- a/liboctave/numeric/randmtzig.c Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/randmtzig.c Sun Dec 20 10:15:02 2015 -0800 @@ -591,13 +591,13 @@ p[0] = lo; p[1] = hi&0x1FFFFF; x = ( si ? -rabs : rabs ) * wi[idx]; -# else /* !HAVE_X86_32 */ +# else /* ! HAVE_X86_32 */ /* arbitrary mantissa (selected by NRANDI, with 1 bit for sign) */ const uint64_t r = NRANDI; const int64_t rabs = r>>1; const int idx = (int)(rabs&0xFF); const double x = ( r&1 ? -rabs : rabs) * wi[idx]; -# endif /* !HAVE_X86_32 */ +# endif /* ! HAVE_X86_32 */ if (rabs < (int64_t)ki[idx]) return x; /* 99.3% of the time we return here 1st try */ else if (idx == 0) diff -r 6982def1d416 -r 77f5591878bf liboctave/numeric/sparse-dmsolve.cc --- a/liboctave/numeric/sparse-dmsolve.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/numeric/sparse-dmsolve.cc Sun Dec 20 10:15:02 2015 -0800 @@ -426,7 +426,7 @@ qrsolve (m, dmsolve_extract (btmp, 0, 0, dm->rr[2], b_nr, 0, b_nc), info); dmsolve_insert (retval, mtmp, q, dm->cc[3], 0); - if (dm->rr[2] > 0 && !info) + if (dm->rr[2] > 0 && ! info) { m = dmsolve_extract (a, pinv, q, 0, dm->rr[2], dm->cc[3], nc, nnz_remaining, true); @@ -439,7 +439,7 @@ // Structurally non-singular blocks // FIXME: Should use fine Dulmange-Mendelsohn decomposition here. - if (dm->rr[1] < dm->rr[2] && dm->cc[2] < dm->cc[3] && !info) + if (dm->rr[1] < dm->rr[2] && dm->cc[2] < dm->cc[3] && ! info) { ST m = dmsolve_extract (a, pinv, q, dm->rr[1], dm->rr[2], dm->cc[2], dm->cc[3], nnz_remaining, false); @@ -457,7 +457,7 @@ } dmsolve_insert (retval, mtmp, q, dm->cc[2], 0); - if (dm->rr[1] > 0 && !info) + if (dm->rr[1] > 0 && ! info) { m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], dm->cc[2], dm->cc[3], nnz_remaining, true); @@ -469,7 +469,7 @@ } // Trailing under-determined block - if (dm->rr[1] > 0 && dm->cc[2] > 0 && !info) + if (dm->rr[1] > 0 && dm->cc[2] > 0 && ! info) { ST m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], 0, dm->cc[2], nnz_remaining, true); diff -r 6982def1d416 -r 77f5591878bf liboctave/util/kpse.cc --- a/liboctave/util/kpse.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/util/kpse.cc Sun Dec 20 10:15:02 2015 -0800 @@ -1009,7 +1009,7 @@ const std::string dir = STR_LLIST (*dirs_elt); int len = names.numel (); - for (int i = 0; i < len && !done; i++) + for (int i = 0; i < len && ! done; i++) { std::string name = names[i]; @@ -1651,7 +1651,7 @@ continue; } - if (c == satisfy && !level && !quoted) + if (c == satisfy && ! level && ! quoted) { /* We ignore an open brace surrounded by whitespace, and also an open brace followed immediately by a close brace, that @@ -1763,7 +1763,7 @@ else { /* Intermediate //, have to match rest of PATH_ELT. */ - for (; !matched && *filename; filename++) + for (; ! matched && *filename; filename++) { /* Try matching at each possible character. */ if (IS_DIR_SEP (filename[-1]) && *filename == *path_elt) @@ -1794,7 +1794,7 @@ if (IS_DIR_SEP (*filename)) filename++; - while (*filename && !IS_DIR_SEP (*filename)) + while (*filename && ! IS_DIR_SEP (*filename)) filename++; matched = *filename == 0; @@ -1903,7 +1903,7 @@ done = false; len = aliases.numel (); - for (int i = 0; i < len && !done; i++) + for (int i = 0; i < len && ! done; i++) { std::string atry = aliases[i]; @@ -1915,7 +1915,7 @@ and the path looks like .../cx, we don't want the ricoh file. */ int db_dirs_len = db_dirs.numel (); - for (int j = 0; j < db_dirs_len && !done; j++) + for (int j = 0; j < db_dirs_len && ! done; j++) { std::string db_file = db_dirs[j] + atry; bool matched = match (db_file, path_elt); @@ -2618,7 +2618,7 @@ /* ${: scan ahead for matching delimiter, then expand. */ size_t var_end = ++i; - while (var_end < src_len && !IS_VAR_END_DELIMITER (src[var_end])) + while (var_end < src_len && ! IS_VAR_END_DELIMITER (src[var_end])) var_end++; if (var_end == src_len) diff -r 6982def1d416 -r 77f5591878bf liboctave/util/lo-regexp.cc --- a/liboctave/util/lo-regexp.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/util/lo-regexp.cc Sun Dec 20 10:15:02 2015 -0800 @@ -176,7 +176,7 @@ if (tmp_pos3 != std::string::npos && tmp_pos3 < tmp_pos1) { - if (!lookbehind_warned) + if (! lookbehind_warned) { lookbehind_warned = true; (*current_liboctave_warning_with_id_handler) diff -r 6982def1d416 -r 77f5591878bf liboctave/util/oct-locbuf.h --- a/liboctave/util/oct-locbuf.h Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/util/oct-locbuf.h Sun Dec 20 10:15:02 2015 -0800 @@ -185,7 +185,7 @@ <= OCTAVE_LOCAL_BUFFER_MAX_STACK_SIZE; \ T _bufaut_ ## buf [_lbufaut_ ## buf ? _bufsize_ ## buf : 0]; \ octave_local_buffer _bufheap_ ## buf \ - (!_lbufaut_ ## buf ? _bufsize_ ## buf : 0); \ + (! _lbufaut_ ## buf ? _bufsize_ ## buf : 0); \ T *buf = _lbufaut_ ## buf \ ? _bufaut_ ## buf : static_cast (_bufheap_ ## buf) diff -r 6982def1d416 -r 77f5591878bf liboctave/util/url-transfer.cc --- a/liboctave/util/url-transfer.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/util/url-transfer.cc Sun Dec 20 10:15:02 2015 -0800 @@ -58,7 +58,7 @@ std::string sep = file_ops::dir_sep_str (); file_stat fs (directory); - if (!fs || !fs.is_dir ()) + if (! fs || ! fs.is_dir ()) { std::string msg; int status = octave_mkdir (directory, 0777, msg); diff -r 6982def1d416 -r 77f5591878bf liboctave/util/url-transfer.h --- a/liboctave/util/url-transfer.h Sun Dec 20 08:19:58 2015 -0800 +++ b/liboctave/util/url-transfer.h Sun Dec 20 10:15:02 2015 -0800 @@ -93,7 +93,7 @@ bool is_ascii (void) const { return ascii_mode; } - bool is_binary (void) const { return !ascii_mode; } + bool is_binary (void) const { return ! ascii_mode; } virtual void cwd (const std::string& /* path */) { } diff -r 6982def1d416 -r 77f5591878bf scripts/general/bitset.m --- a/scripts/general/bitset.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/general/bitset.m Sun Dec 20 10:15:02 2015 -0800 @@ -70,7 +70,7 @@ mask = bitshift (cast (1, cl), uint8 (n) - uint8 (1)); on = logical (val); - off = !on; + off = ! on; if (isscalar (mask)) onmask = mask; diff -r 6982def1d416 -r 77f5591878bf scripts/general/interp2.m --- a/scripts/general/interp2.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/general/interp2.m Sun Dec 20 10:15:02 2015 -0800 @@ -345,7 +345,7 @@ x = abs (x); o = zeros (size (x)); idx1 = (x < 1); - idx2 = !idx1 & (x < 2); + idx2 = ! idx1 & (x < 2); o(idx1) = 1 - 2.*x(idx1).^2 + x(idx1).^3; o(idx2) = 4 - 8.*x(idx2) + 5.*x(idx2).^2 - x(idx2).^3; endfunction diff -r 6982def1d416 -r 77f5591878bf scripts/general/private/__isequal__.m --- a/scripts/general/private/__isequal__.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/general/private/__isequal__.m Sun Dec 20 10:15:02 2015 -0800 @@ -73,7 +73,7 @@ k = 1; do t = all (builtin ("size", x, k) == cellfun ("size", varargin, k)); - until (!t || k++ == nd); + until (! t || k++ == nd); endif ## From here on, compare objects as if they were structures. @@ -155,7 +155,7 @@ f_y = find (y); t = (l_f_x == length (f_y)) && all (f_x == f_y); - if (!t) + if (! t) break; endif @@ -163,11 +163,11 @@ m = (x == y); t = all (m); - if (!t && nans_compare_equal) - t = isnan (x(!m)) && isnan (y(!m)); + if (! t && nans_compare_equal) + t = isnan (x(! m)) && isnan (y(! m)); endif - if (!t) + if (! t) break; endif endfor diff -r 6982def1d416 -r 77f5591878bf scripts/geometry/inpolygon.m --- a/scripts/geometry/inpolygon.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/geometry/inpolygon.m Sun Dec 20 10:15:02 2015 -0800 @@ -75,7 +75,7 @@ ## Check if (x,y) are actually on the boundary of the polygon. idx2 = (((yv(i) <= y & y <= yv(j)) | (yv(j) <= y & y <= yv(i))) & ((xv(i) <= x & x <= xv(j)) | (xv(j) <= x & x <= xv(i))) - & (0 == distance | !delta_xv)); + & (0 == distance | ! delta_xv)); on(idx2) = true; j = i; @@ -98,13 +98,13 @@ %! ya = [0:0.1:1.4]; %! [x,y] = meshgrid (xa, ya); %! [in,on] = inpolygon (x, y, xv, yv); -%! inside = in & !on; +%! inside = in & ! on; %! %! clf; %! plot (xv, yv); %! hold on; %! plot (x(inside), y(inside), "@g") -%! plot (x(!in), y(!in), "@m"); +%! plot (x(! in), y(! in), "@m"); %! plot (x(on), y(on), "@b"); %! hold off; %! disp ("Green points are inside polygon, magenta are outside,"); @@ -123,13 +123,13 @@ %! ya = [0:0.1:1.4]; %! [x, y] = meshgrid (xa, ya); %! [in, on] = inpolygon (x, y, xv, yv); -%! inside = in & !on; +%! inside = in & ! on; %! %! clf; %! plot (xv, yv); %! hold on; %! plot (x(inside), y(inside), "@g"); -%! plot (x(!in), y(!in), "@m"); +%! plot (x(! in), y(! in), "@m"); %! plot (x(on), y(on), "@b"); %! hold off; %! disp ("Green points are inside polygon, magenta are outside,"); diff -r 6982def1d416 -r 77f5591878bf scripts/gui/questdlg.m --- a/scripts/gui/questdlg.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/gui/questdlg.m Sun Dec 20 10:15:02 2015 -0800 @@ -134,11 +134,11 @@ %! disp ('- test questdlg with message and title only.'); %! a = 'No'; %! c = 0; -%! while (strcmp (a, 'No') || !c) +%! while (strcmp (a, 'No') || ! c) %! a = questdlg ('Close this Question Dialog?', 'Reductio Ad Absurdum'); %! if (strcmp (a, 'Yes')) %! q = 'Are you sure?'; -%! while (strcmp (a, 'Yes') && !c) +%! while (strcmp (a, 'Yes') && ! c) %! a = questdlg (q, 'Reductio Ad Absurdum'); %! word = ' really'; %! i = strfind (q, word); diff -r 6982def1d416 -r 77f5591878bf scripts/help/help.m --- a/scripts/help/help.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/help/help.m Sun Dec 20 10:15:02 2015 -0800 @@ -215,5 +215,5 @@ ## Test input validation %!error help (42) %!error help ("abc", "def") -%!error <'_!UNLIKELY_FCN!_' not found> help ("_!UNLIKELY_FCN!_") +%!error <'_! UNLIKELY_FCN! _' not found> help ("_! UNLIKELY_FCN! _") diff -r 6982def1d416 -r 77f5591878bf scripts/miscellaneous/compare_versions.m --- a/scripts/miscellaneous/compare_versions.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/miscellaneous/compare_versions.m Sun Dec 20 10:15:02 2015 -0800 @@ -175,7 +175,7 @@ ## Reverse the output if not is given. if (not_op) - out = !out; + out = ! out; endif endfunction diff -r 6982def1d416 -r 77f5591878bf scripts/miscellaneous/substruct.m --- a/scripts/miscellaneous/substruct.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/miscellaneous/substruct.m Sun Dec 20 10:15:02 2015 -0800 @@ -61,9 +61,9 @@ if (all (braces | dots)) cells = cellfun ("isclass", sub, "cell"); chars = cellfun ("isclass", sub, "char"); - if (any (braces & !cells)) + if (any (braces & ! cells)) error ("substruct: for TYPE == () or {}, SUBS must be a cell array"); - elseif (any (dots & !chars)) + elseif (any (dots & ! chars)) error ("substruct: for TYPE == ., SUBS must be a character string"); endif else diff -r 6982def1d416 -r 77f5591878bf scripts/pkg/private/configure_make.m --- a/scripts/pkg/private/configure_make.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/pkg/private/configure_make.m Sun Dec 20 10:15:02 2015 -0800 @@ -141,7 +141,7 @@ idx = cellfun ("is_architecture_dependent", filenames); endif archdependent = filenames(idx); - archindependent = filenames(!idx); + archindependent = filenames(! idx); ## Copy the files. if (! all (isspace ([filenames{:}]))) diff -r 6982def1d416 -r 77f5591878bf scripts/plot/appearance/whitebg.m --- a/scripts/plot/appearance/whitebg.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/plot/appearance/whitebg.m Sun Dec 20 10:15:02 2015 -0800 @@ -75,7 +75,7 @@ if (isroot) fac = get (0, "factory"); fields = fieldnames (fac); - fieldindex = intersect (find (! cellfun ("isempty", regexp (fields, 'color'))), union (find (! cellfun ("isempty", regexp (fields, 'factoryaxes.*'))), find (!cellfun ("isempty", regexp (fields, 'factoryfigure.*'))))); + fieldindex = intersect (find (! cellfun ("isempty", regexp (fields, 'color'))), union (find (! cellfun ("isempty", regexp (fields, 'factoryaxes.*'))), find (! cellfun ("isempty", regexp (fields, 'factoryfigure.*'))))); ## Check whether the factory value has been replaced for nf = 1 : numel (fieldindex); @@ -105,7 +105,7 @@ for nh = 1 : numel (h) p = get (h (nh)); fields = fieldnames (p); - fieldindex = find (!cellfun ("isempty", regexp (fields, 'color'))); + fieldindex = find (! cellfun ("isempty", regexp (fields, 'color'))); if (numel (fieldindex)) for nf = 1 : numel (fieldindex); field = fields{fieldindex(nf)}; diff -r 6982def1d416 -r 77f5591878bf scripts/plot/draw/private/__marching_cube__.m --- a/scripts/plot/draw/private/__marching_cube__.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/plot/draw/private/__marching_cube__.m Sun Dec 20 10:15:02 2015 -0800 @@ -224,7 +224,7 @@ p(id, 4) = col1(id); endif endif - nid = !id; + nid = ! id; if (any (nid)) mu(nid) = (isolevel - valp1(nid)) ./ (valp2(nid) - valp1(nid)); p(nid, 1:3) = [p1x(nid) + mu(nid) .* (p2x(nid) - p1x(nid)), ... diff -r 6982def1d416 -r 77f5591878bf scripts/plot/util/struct2hdl.m --- a/scripts/plot/util/struct2hdl.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/plot/util/struct2hdl.m Sun Dec 20 10:15:02 2015 -0800 @@ -101,7 +101,7 @@ names = fieldnames (s.properties); n = strncmp (cellfun (@fliplr, names, "uniformoutput", false), "edom", 4); n = (n | strcmp (names, "activepositionproperty")); - names = [names(!n); names(n)]; + names = [names(! n); names(n)]; if (strcmp (s.type, "axes")) n_pos = find (strcmp (names, "position") | strcmp (names, "outerposition")); if (strcmp (s.properties.activepositionproperty, "position")) diff -r 6982def1d416 -r 77f5591878bf scripts/polynomial/polyfit.m --- a/scripts/polynomial/polyfit.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/polynomial/polyfit.m Sun Dec 20 10:15:02 2015 -0800 @@ -146,7 +146,7 @@ if (n != m) ## fill matrices if required - s.X(:, !polymask) = 0; + s.X(:, ! polymask) = 0; s.R = zeros (n+1, n+1); s.R(polymask, polymask) = r; s.C = zeros (n+1, n+1); s.C(polymask, polymask) = C; else diff -r 6982def1d416 -r 77f5591878bf scripts/polynomial/spline.m --- a/scripts/polynomial/spline.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/polynomial/spline.m Sun Dec 20 10:15:02 2015 -0800 @@ -99,7 +99,7 @@ for k = (1:columns (a))(any (isnan (a))) ok = ! isnan (a(:,k)); - a(!ok,k) = spline (x(ok), a(ok,k), x(!ok)); + a(! ok,k) = spline (x(ok), a(ok,k), x(! ok)); endfor complete = false; @@ -267,7 +267,7 @@ %! assert (spline (x, y, x(ok)), y(ok), abserr); %!test %! ok = ! isnan (y); -%! assert (! isnan (spline (x, y, x(!ok)))); +%! assert (! isnan (spline (x, y, x(! ok)))); %!test %! x = [1,2]; %! y = [1,4]; diff -r 6982def1d416 -r 77f5591878bf scripts/set/unique.m --- a/scripts/set/unique.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/set/unique.m Sun Dec 20 10:15:02 2015 -0800 @@ -146,9 +146,9 @@ if (isargout (3)) j = i; if (dim == 1) - j(i) = cumsum ([1; !match]); + j(i) = cumsum ([1; ! match]); else - j(i) = cumsum ([1, !match]); + j(i) = cumsum ([1, ! match]); endif endif diff -r 6982def1d416 -r 77f5591878bf scripts/sparse/svds.m --- a/scripts/sparse/svds.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/sparse/svds.m Sun Dec 20 10:15:02 2015 -0800 @@ -267,14 +267,14 @@ %!testif HAVE_ARPACK %! [u2,s2,v2,flag] = svds (A,k); %! s2 = diag (s2); -%! assert (flag, !1); +%! assert (flag, ! 1); %! tol = 10 * eps() * norm(s2, 1); %! assert (s2, s(end:-1:end-k+1), tol); %! %!testif HAVE_ARPACK, HAVE_UMFPACK %! [u2,s2,v2,flag] = svds (A,k,0,opts); %! s2 = diag (s2); -%! assert (flag, !1); +%! assert (flag, ! 1); %! tol = 10 * eps() * norm(s2, 1); %! assert (s2, s(k:-1:1), tol); %! @@ -284,7 +284,7 @@ %! sigma = 0.99*s(idx) + 0.01*s(idx+1); %! [u2,s2,v2,flag] = svds (A,k,sigma,opts); %! s2 = diag (s2); -%! assert (flag, !1); +%! assert (flag, ! 1); %! tol = 10 * eps() * norm(s2, 1); %! assert (s2, s((idx+floor(k/2)):-1:(idx-floor(k/2))), tol); %! diff -r 6982def1d416 -r 77f5591878bf scripts/specfun/ellipke.m --- a/scripts/specfun/ellipke.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/specfun/ellipke.m Sun Dec 20 10:15:02 2015 -0800 @@ -120,9 +120,9 @@ ## Arithmetic-Geometric Mean (AGM) algorithm ## ( Abramowitz and Stegun, Section 17.6 ) Nmax = 16; - idx = !idx_1 & !idx_neginf; + idx = ! idx_1 & ! idx_neginf; if (any (idx)) - idx_neg = find (m < 0 & !idx_neginf); + idx_neg = find (m < 0 & ! idx_neginf); mult_k = 1./sqrt (1 - m(idx_neg)); mult_e = sqrt (1 - m(idx_neg)); m(idx_neg) = -m(idx_neg) ./ (1 - m(idx_neg)); diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/binoinv.m --- a/scripts/statistics/distributions/binoinv.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/binoinv.m Sun Dec 20 10:15:02 2015 -0800 @@ -151,7 +151,7 @@ cdf = binocdf (floor(mid(:)), n, p); r = (x <= cdf); upper(r) = mid(r); - lower(!r) = mid(!r); + lower(! r) = mid(! r); endfor m = ceil (lower); m(x > binocdf (m(:), n, p)) += 1; # fix off-by-one errors from binary search diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/hygepdf.m --- a/scripts/statistics/distributions/hygepdf.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/hygepdf.m Sun Dec 20 10:15:02 2015 -0800 @@ -65,7 +65,7 @@ pdf(nel) = NaN; - k = !nel & !zel; + k = ! nel & ! zel; if (any (k(:))) if (isscalar (t) && isscalar (m) && isscalar (n)) pdf(k) = (bincoeff (m, x(k)) .* bincoeff (t-m, n-x(k)) diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/nbininv.m --- a/scripts/statistics/distributions/nbininv.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/nbininv.m Sun Dec 20 10:15:02 2015 -0800 @@ -123,7 +123,7 @@ cdf = nbincdf (floor (mid), n, p); r = (x <= cdf); upper(r) = mid(r); - lower(!r) = mid(!r); + lower(! r) = mid(! r); endfor m = ceil (lower); m(x > nbincdf (m, n, p)) += 1; # fix off-by-one errors from binary search diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/poissinv.m --- a/scripts/statistics/distributions/poissinv.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/poissinv.m Sun Dec 20 10:15:02 2015 -0800 @@ -166,7 +166,7 @@ inv(k) = floor (lam + (y+t)+lam.*rm); endif - k = !k & (s > -sqrt (2)); + k = ! k & (s > -sqrt (2)); if (any (k)) ## Newton iteration r = 1 + s(k); diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/tcdf.m --- a/scripts/statistics/distributions/tcdf.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/tcdf.m Sun Dec 20 10:15:02 2015 -0800 @@ -65,7 +65,7 @@ endif ## deal with the case "abs(x) small" - kk = k & !x_big_abs; + kk = k & ! x_big_abs; if (isscalar (n)) cdf(kk) = 0.5 * (1 - betainc (xx(kk) ./ (n + xx(kk)), 1/2, n/2)); else diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/unidcdf.m --- a/scripts/statistics/distributions/unidcdf.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/unidcdf.m Sun Dec 20 10:15:02 2015 -0800 @@ -52,10 +52,10 @@ cdf(knan) = NaN; endif - k = (x >= n) & !knan; + k = (x >= n) & ! knan; cdf(k) = 1; - k = (x >= 1) & (x < n) & !knan; + k = (x >= 1) & (x < n) & ! knan; if (isscalar (n)) cdf(k) = floor (x(k)) / n; else diff -r 6982def1d416 -r 77f5591878bf scripts/statistics/distributions/unidpdf.m --- a/scripts/statistics/distributions/unidpdf.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/statistics/distributions/unidpdf.m Sun Dec 20 10:15:02 2015 -0800 @@ -54,7 +54,7 @@ k = isnan (x) | ! (n > 0 & n == fix (n)); pdf(k) = NaN; - k = !k & (x >= 1) & (x <= n) & (x == fix (x)); + k = ! k & (x >= 1) & (x <= n) & (x == fix (x)); if (isscalar (n)) pdf(k) = 1 / n; else diff -r 6982def1d416 -r 77f5591878bf scripts/strings/dec2base.m --- a/scripts/strings/dec2base.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/strings/dec2base.m Sun Dec 20 10:15:02 2015 -0800 @@ -156,7 +156,7 @@ %!test %! a = 0:3; -%! assert (dec2base (!a, 2, 1), ["1"; "0"; "0"; "0"]) +%! assert (dec2base (! a, 2, 1), ["1"; "0"; "0"; "0"]) ## Test input validation %!error dec2base () diff -r 6982def1d416 -r 77f5591878bf scripts/testfun/assert.m --- a/scripts/testfun/assert.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/testfun/assert.m Sun Dec 20 10:15:02 2015 -0800 @@ -271,7 +271,7 @@ errvec = ( isnan (real (A)) != isnan (real (B)) | isnan (imag (A)) != isnan (imag (B))); - erridx = find (errvec & !errseen); + erridx = find (errvec & ! errseen); if (! isempty (erridx)) err.index(end+1:end+length (erridx)) = ... ind2tuple (size (A), erridx); @@ -288,7 +288,7 @@ & (real (A) != real (B))) ... | ((isinf (imag (A)) | isinf (imag (B))) ... & (imag (A) != imag (B))); - erridx = find (errvec & !errseen); + erridx = find (errvec & ! errseen); if (! isempty (erridx)) err.index(end+1:end+length (erridx)) = ... ind2tuple (size (A), erridx); diff -r 6982def1d416 -r 77f5591878bf scripts/time/weekday.m --- a/scripts/time/weekday.m Sun Dec 20 08:19:58 2015 -0800 +++ b/scripts/time/weekday.m Sun Dec 20 10:15:02 2015 -0800 @@ -67,7 +67,7 @@ ## Find the offset from a known Sunday (2008-Jan-6), mod 7. d = floor (reshape (mod (d - 733048, 7), endsize)); ## Make Saturdays a 7 and not a 0. - d(!d) = 7; + d(! d) = 7; if (isargout (2)) if (strcmpi (format, "long")) diff -r 6982def1d416 -r 77f5591878bf src/mkoctfile.in.cc --- a/src/mkoctfile.in.cc Sun Dec 20 08:19:58 2015 -0800 +++ b/src/mkoctfile.in.cc Sun Dec 20 10:15:02 2015 -0800 @@ -405,9 +405,9 @@ return 1; } - if (argc == 2 && (!strcmp (argv[1], "-v") - || !strcmp (argv[1], "-version") - || !strcmp (argv[1], "--version"))) + if (argc == 2 && (! strcmp (argv[1], "-v") + || ! strcmp (argv[1], "-version") + || ! strcmp (argv[1], "--version"))) { std::cout << version_msg << std::endl; return 0; @@ -561,18 +561,18 @@ return 1; } - if (!file.empty () && octfile.empty ()) + if (! file.empty () && octfile.empty ()) octfile = file; } if (link_stand_alone) { - if (!outputfile.empty ()) + if (! outputfile.empty ()) output_option = "-o " + outputfile; } else { - if (!outputfile.empty ()) + if (! outputfile.empty ()) { octfile = outputfile; size_t len = octfile.length (); @@ -602,7 +602,7 @@ FILE *fd = popen (cmd.c_str (), "r"); std::ofstream fo (dfile.c_str ()); size_t pos; - while (!feof (fd)) + while (! feof (fd)) { line = get_line (fd); if ((pos = line.rfind (".o:")) != std::string::npos) @@ -636,7 +636,7 @@ FILE *fd = popen (cmd.c_str (), "r"); std::ofstream fo (dfile.c_str ()); size_t pos; - while (!feof (fd)) + while (! feof (fd)) { line = get_line (fd); if ((pos = line.rfind (".o:")) != std::string::npos) @@ -659,13 +659,13 @@ return 0; } - for (it = f77files.begin (); it != f77files.end () && !result; ++it) + for (it = f77files.begin (); it != f77files.end () && ! result; ++it) { std::string f = *it, b = basename (f, true); - if (!vars["F77"].empty ()) + if (! vars["F77"].empty ()) { std::string o; - if (!outputfile.empty ()) + if (! outputfile.empty ()) { if (link) o = b + ".o"; @@ -690,13 +690,13 @@ } } - for (it = cfiles.begin (); it != cfiles.end () && !result; ++it) + for (it = cfiles.begin (); it != cfiles.end () && ! result; ++it) { std::string f = *it; - if (!vars["CC"].empty ()) + if (! vars["CC"].empty ()) { std::string b = basename (f, true), o; - if (!outputfile.empty ()) + if (! outputfile.empty ()) { if (link) o = b + ".o"; @@ -722,13 +722,13 @@ } } - for (it = ccfiles.begin (); it != ccfiles.end () && !result; ++it) + for (it = ccfiles.begin (); it != ccfiles.end () && ! result; ++it) { std::string f = *it; - if (!vars["CXX"].empty ()) + if (! vars["CXX"].empty ()) { std::string b = basename (f, true), o; - if (!outputfile.empty ()) + if (! outputfile.empty ()) { if (link) o = b + ".o"; @@ -755,11 +755,11 @@ } } - if (link && !objfiles.empty () && !result) + if (link && ! objfiles.empty () && ! result) { if (link_stand_alone) { - if (!vars["LD_CXX"].empty ()) + if (! vars["LD_CXX"].empty ()) { std::string cmd = vars["LD_CXX"] + " " + vars["CPPFLAGS"] + " "