diff libinterp/parse-tree/lex.h @ 23795:980f39c3ab90

Use C++11 nullptr rather than 0 in code (bug #51565). * Backend.cc, BaseControl.h, ButtonGroup.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, ContextMenu.h, EditControl.cc, Figure.cc, FigureWindow.cc, ListBoxControl.cc, Menu.cc, Menu.h, MouseModeActionGroup.cc, Object.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, QTerminal.h, BlockArray.cpp, Emulation.cpp, Filter.cpp, Filter.h, History.cpp, KeyboardTranslator.cpp, QUnixTerminalImpl.h, Screen.cpp, ScreenWindow.cpp, ScreenWindow.h, SelfListener.h, TerminalCharacterDecoder.cpp, TerminalModel.cpp, TerminalView.cpp, TerminalView.h, kpty.cpp, dialog.cc, dialog.h, files-dock-widget.cc, find-files-model.h, file-editor-tab.cc, file-editor.cc, main-window.cc, octave-dock-widget.cc, octave-gui.cc, parser.cc, resource-manager.cc, resource-manager.h, shortcut-manager.cc, shortcut-manager.h, workspace-model.cc, workspace-view.cc, __magick_read__.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, daspk.cc, dasrt.cc, dassl.cc, det.cc, display.h, error.cc, ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics.in.h, help.cc, input.cc, interpreter.cc, load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, lsode.cc, mex.cc, mxarray.in.h, oct-errno.h, oct-hist.cc, oct-iostrm.h, oct-procbuf.cc, oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, oct-tex-parser.in.yy, octave-link.h, pager.cc, pager.h, pr-output.cc, procstream.h, qz.cc, sighandlers.cc, svd.cc, symtab.cc, symtab.h, text-renderer.cc, txt-eng.h, utils.cc, variables.cc, zfstream.cc, zfstream.h, __glpk__.cc, __init_fltk__.cc, __ode15__.cc, audiodevinfo.cc, ccolamd.cc, colamd.cc, dmperm.cc, gzip.cc, symbfact.cc, ov-base-int.cc, ov-base-int.h, ov-base-mat.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-java.h, ov-mex-fcn.cc, ov-oncleanup.cc, ov-range.cc, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, octave.cc, bp-table.cc, bp-table.h, jit-ir.h, jit-typeinfo.cc, lex.h, profiler.cc, pt-arg-list.cc, pt-array-list.cc, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-cell.cc, pt-classdef.cc, pt-classdef.h, pt-colon.cc, pt-colon.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-idx.cc, pt-jit.cc, pt-loop.h, pt-mat.cc, pt-select.h, pt-stmt.h, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt.cc, Array-C.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-util.cc, Array.cc, Array.h, CMatrix.cc, CSparse.cc, DiagArray2.h, MArray.h, MDiagArray2.h, MatrixType.cc, Sparse.cc, Sparse.h, dMatrix.cc, dSparse.cc, fMatrix.cc, idx-vector.cc, idx-vector.h, DAEFunc.h, DAERTFunc.h, ODEFunc.h, ODESFunc.h, eigs-base.cc, oct-fftw.cc, oct-fftw.h, oct-rand.h, oct-spparms.h, schur.cc, sparse-chol.cc, sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, lo-sysdep.cc, oct-env.h, oct-time.cc, cmd-edit.cc, cmd-edit.h, cmd-hist.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, quit.cc, singleton-cleanup.h, str-vec.cc: Use C++11 nullptr rather than 0 in code (bug #51565).
author Rik <rik@octave.org>
date Tue, 25 Jul 2017 14:54:10 -0700
parents ea879bc55272
children bc3819b7cca1
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.h	Mon Jul 24 16:48:03 2017 +0200
+++ b/libinterp/parse-tree/lex.h	Tue Jul 25 14:54:10 2017 -0700
@@ -214,33 +214,33 @@
       // Direct access.
       token * at (size_t n)
       {
-        return empty () ? 0 : buffer.at (n);
+        return empty () ? nullptr : buffer.at (n);
       }
 
       const token * at (size_t n) const
       {
-        return empty () ? 0 : buffer.at (n);
+        return empty () ? nullptr : buffer.at (n);
       }
 
       // Most recently pushed.
       token * front (void)
       {
-        return empty () ? 0 : buffer.front ();
+        return empty () ? nullptr : buffer.front ();
       }
 
       const token * front (void) const
       {
-        return empty () ? 0 : buffer.front ();
+        return empty () ? nullptr : buffer.front ();
       }
 
       token * back (void)
       {
-        return empty () ? 0 : buffer.back ();
+        return empty () ? nullptr : buffer.back ();
       }
 
       const token * back (void) const
       {
-        return empty () ? 0 : buffer.back ();
+        return empty () ? nullptr : buffer.back ();
       }
 
       // Number of elements currently in the buffer.
@@ -493,7 +493,7 @@
     public:
 
       input_buffer (void)
-        : buffer (), pos (0), chars_left (0), eof (false)
+        : buffer (), pos (nullptr), chars_left (0), eof (false)
       { }
 
       void fill (const std::string& input, bool eof_arg);
@@ -520,7 +520,7 @@
     {
     public:
 
-      comment_buffer (void) : m_comment_list (0) { }
+      comment_buffer (void) : m_comment_list (nullptr) { }
 
       ~comment_buffer (void) { delete m_comment_list; }
 
@@ -538,7 +538,7 @@
       {
         comment_list *retval = m_comment_list;
 
-        m_comment_list = 0;
+        m_comment_list = nullptr;
 
         return retval;
       }
@@ -547,7 +547,7 @@
       {
         delete m_comment_list;
 
-        m_comment_list = 0;
+        m_comment_list = nullptr;
       }
 
     private:
@@ -556,7 +556,7 @@
     };
 
     base_lexer (interpreter *interp = nullptr)
-      : lexical_feedback (), scanner (0), input_buf (), comment_buf (),
+      : lexical_feedback (), scanner (nullptr), input_buf (), comment_buf (),
         m_interpreter (interp)
     {
       init ();