Mercurial > octave
changeset 23446:cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
* make_int.cc, dialog.h, file-editor-interface.h, file-editor-tab.h,
file-editor.h, octave-txt-lexer.h, main-window.h, octave-dock-widget.h,
parser.h, webinfo.h, resource-manager.h, thread-manager.h, c-file-ptr-stream.h,
call-stack.h, comment-list.h, ft-text-renderer.h, gl-render.cc, input.h,
mex.cc, mexproto.h, mxarray.in.h, oct-fstrm.h, oct-iostrm.h, oct-procbuf.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-link.h,
sighandlers.cc, symtab.h, sysdep.h, utils.h, audiodevinfo.cc, ov-base-diag.h,
ov-base-int.h, ov-base-scalar.h, ov-base-sparse.h, ov-base.h, ov-bool-mat.h,
ov-bool-sparse.h, ov-bool.h, ov-builtin.h, ov-cell.h, ov-ch-mat.h, ov-class.h,
ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h,
ov-cx-diag.h, ov-cx-mat.h, ov-cx-sparse.h, ov-fcn-handle.h, ov-fcn-inline.h,
ov-fcn.h, ov-float.h, ov-flt-complex.h, ov-flt-cx-diag.h, ov-flt-cx-mat.h,
ov-flt-re-diag.h, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h,
ov-lazy-idx.h, ov-mex-fcn.h, ov-oncleanup.h, ov-perm.h, ov-range.h,
ov-re-diag.h, ov-re-mat.h, ov-re-sparse.h, ov-scalar.h, ov-str-mat.h,
ov-struct.h, ov-usr-fcn.h, ov.h, octave.h, bp-table.h, jit-ir.h,
jit-typeinfo.h, jit-util.h, lex.h, parse.h, pt-arg-list.h, pt-array-list.h,
pt-assign.h, pt-binop.h, pt-cell.h, pt-classdef.h, pt-cmd.h, pt-colon.h,
pt-const.h, pt-decl.h, pt-except.h, pt-exp.h, pt-fcn-handle.h, pt-funcall.h,
pt-id.h, pt-idx.h, pt-jit.h, pt-jump.h, pt-loop.h, pt-mat.h, pt-misc.h,
pt-select.h, pt-stmt.h, pt-unop.h, token.h, Array.cc, Array.h, DiagArray2.h,
Sparse.h, dim-vector.h, idx-vector.h, sparse-chol.cc, cmd-edit.cc, cmd-edit.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc, lo-utils.h,
oct-inttypes.h, oct-locbuf.h, oct-refcount.h, oct-rl-edit.h, oct-rl-hist.h,
oct-shlib.cc, oct-shlib.h, str-vec.h, canonicalize-file-name-wrapper.h,
dirent-wrappers.h, getopt-wrapper.h, glob-wrappers.h, localcharset-wrapper.h,
set-program-name-wrapper.h, signal-wrappers.h, strdup-wrapper.h,
tmpfile-wrapper.h, unistd-wrappers.h, display-available.h:
Use convention 'void * fcn ()' for functions which return pointers.
line wrap: on
line diff
--- a/examples/code/make_int.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/examples/code/make_int.cc Thu Apr 27 09:48:57 2017 -0700 @@ -47,7 +47,7 @@ ~octave_integer (void) = default; - octave_base_value *clone (void) { return new octave_integer (*this); } + octave_base_value * clone (void) { return new octave_integer (*this); } #if 0 void *operator new (size_t size);
--- a/libgui/src/dialog.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/dialog.h Thu Apr 27 09:48:57 2017 -0700 @@ -88,7 +88,7 @@ return true; }; - const QIntList *get_list_index (void) { return list_index; } + const QIntList * get_list_index (void) { return list_index; } bool signal_inputlayout (const QStringList& prompt, const QString& title, const QFloatList& nr, const QFloatList& nc, @@ -102,7 +102,7 @@ return true; }; - const QStringList *get_string_list (void) { return string_list; } + const QStringList * get_string_list (void) { return string_list; } bool signal_filedialog (const QStringList& filters, const QString& title, const QString& filename, const QString& dirname, @@ -112,7 +112,7 @@ return true; } - const QString *get_dialog_path (void) { return path_name; } + const QString * get_dialog_path (void) { return path_name; } // GUI objects cannot be accessed in the non-GUI thread. However, // signals can be sent to slots across threads with proper
--- a/libgui/src/m-editor/file-editor-interface.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/m-editor/file-editor-interface.h Thu Apr 27 09:48:57 2017 -0700 @@ -40,9 +40,9 @@ virtual ~file_editor_interface () { } - virtual QMenu *get_mru_menu () = 0; - virtual QMenu *debug_menu () = 0; - virtual QToolBar *toolbar () = 0; + virtual QMenu * get_mru_menu () = 0; + virtual QMenu * debug_menu () = 0; + virtual QToolBar * toolbar () = 0; virtual void insert_global_actions (QList<QAction*>) = 0; virtual void handle_enter_debug_mode (void) = 0;
--- a/libgui/src/m-editor/file-editor-tab.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/m-editor/file-editor-tab.h Thu Apr 27 09:48:57 2017 -0700 @@ -55,7 +55,7 @@ ~file_editor_tab (void); - octave_qscintilla *qsci_edit_area () { return _edit_area; } + octave_qscintilla * qsci_edit_area () { return _edit_area; } // Will initiate close if associated with the identifier tag. bool conditional_close (void);
--- a/libgui/src/m-editor/file-editor.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/m-editor/file-editor.h Thu Apr 27 09:48:57 2017 -0700 @@ -119,9 +119,9 @@ void loadFile (const QString& fileName); - QMenu *get_mru_menu (void) { return _mru_file_menu; } - QMenu *debug_menu (void); - QToolBar *toolbar (void); + QMenu * get_mru_menu (void) { return _mru_file_menu; } + QMenu * debug_menu (void); + QToolBar * toolbar (void); void insert_global_actions (QList<QAction*>); enum shared_actions_idx @@ -349,9 +349,9 @@ bool editor_tab_has_focus (); - QWidget *find_tab_widget (const QString& openFileName) const; - QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text, - const char *member); + QWidget * find_tab_widget (const QString& openFileName) const; + QAction * add_action (QMenu *menu, const QIcon& icon, const QString& text, + const char *member); QMenu* m_add_menu (QMenuBar *p, QString text);
--- a/libgui/src/m-editor/octave-txt-lexer.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/m-editor/octave-txt-lexer.h Thu Apr 27 09:48:57 2017 -0700 @@ -35,8 +35,8 @@ public: - virtual const char *language () const; - virtual const char *lexer () const; + virtual const char * language () const; + virtual const char * lexer () const; virtual QString description (int style) const; };
--- a/libgui/src/main-window.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/main-window.h Thu Apr 27 09:48:57 2017 -0700 @@ -281,19 +281,19 @@ void construct_octave_qt_link (void); - QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text, - const char *member, const QWidget *receiver = 0); + QAction * add_action (QMenu *menu, const QIcon& icon, const QString& text, + const char *member, const QWidget *receiver = 0); QMenu* m_add_menu (QMenuBar *p, QString text); void construct_menu_bar (void); void construct_file_menu (QMenuBar *p); void construct_new_menu (QMenu *p); void construct_edit_menu (QMenuBar *p); - QAction *construct_debug_menu_item (const char *icon, const QString& item, - const char* member); + QAction * construct_debug_menu_item (const char *icon, const QString& item, + const char* member); void construct_debug_menu (QMenuBar *p); - QAction *construct_window_menu_item (QMenu *p, const QString& item, - bool checkable, QWidget*); + QAction * construct_window_menu_item (QMenu *p, const QString& item, + bool checkable, QWidget*); void construct_window_menu (QMenuBar *p); void construct_help_menu (QMenuBar *p); void construct_documentation_menu (QMenu *p);
--- a/libgui/src/octave-dock-widget.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/octave-dock-widget.h Thu Apr 27 09:48:57 2017 -0700 @@ -81,7 +81,7 @@ void handle_active_dock_changed (octave_dock_widget*, octave_dock_widget*); - QMainWindow *main_win () { return _parent; } + QMainWindow * main_win () { return _parent; } void save_settings (void);
--- a/libgui/src/qtinfo/parser.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/qtinfo/parser.h Thu Apr 27 09:48:57 2017 -0700 @@ -104,7 +104,7 @@ void parse_info_map (); /** Open info files and uncompress them. */ - QIODevice *open_file (QFileInfo & fileInfo); + QIODevice * open_file (QFileInfo & fileInfo); /** Calculates real position of nodes. * @param pos position from info file.
--- a/libgui/src/qtinfo/webinfo.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/qtinfo/webinfo.h Thu Apr 27 09:48:57 2017 -0700 @@ -49,7 +49,7 @@ webinfo_tab_bar (QWidget *p); ~webinfo_tab_bar (); - QMenu *get_context_menu () { return _context_menu; } + QMenu * get_context_menu () { return _context_menu; } public slots: @@ -95,8 +95,8 @@ private: - QAction *add_action (QMenu *menu, const QIcon& icon, const QString& text, - const char *member); + QAction * add_action (QMenu *menu, const QIcon& icon, const QString& text, + const char *member); void tab_state_changed (void); QTextBrowser *_text_browser; @@ -110,7 +110,7 @@ parser _parser; QFont _font_web; - QTextBrowser *addNewTab (const QString& name); + QTextBrowser * addNewTab (const QString& name); QAction *_close_action; QAction *_close_others_action;
--- a/libgui/src/resource-manager.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/resource-manager.h Thu Apr 27 09:48:57 2017 -0700 @@ -48,7 +48,7 @@ ~resource_manager (); - static QSettings *get_settings (void) + static QSettings * get_settings (void) { return instance_ok () ? instance->do_get_settings () : 0; } @@ -61,7 +61,7 @@ return QIcon (); } - static QSettings *get_default_settings (void) + static QSettings * get_default_settings (void) { return instance_ok () ? instance->do_get_default_settings () : 0; } @@ -130,9 +130,9 @@ QSettings *default_settings; - QSettings *do_get_settings (void) const; + QSettings * do_get_settings (void) const; - QSettings *do_get_default_settings (void) const; + QSettings * do_get_default_settings (void) const; QString do_get_settings_file (void);
--- a/libgui/src/thread-manager.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libgui/src/thread-manager.h Thu Apr 27 09:48:57 2017 -0700 @@ -90,7 +90,7 @@ octave_base_thread_manager *rep; - static octave_base_thread_manager *create_rep (void); + static octave_base_thread_manager * create_rep (void); }; #endif
--- a/libinterp/corefcn/c-file-ptr-stream.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.h Thu Apr 27 09:48:57 2017 -0700 @@ -117,7 +117,7 @@ ~c_file_ptr_stream (void) { delete buf; buf = 0; } - BUF_T *rdbuf (void) { return buf; } + BUF_T * rdbuf (void) { return buf; } void stream_close (void) { if (buf) buf->buf_close (); }
--- a/libinterp/corefcn/call-stack.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/call-stack.h Thu Apr 27 09:48:57 2017 -0700 @@ -107,7 +107,7 @@ } // Current function (top of stack). - static octave_function *current (void) + static octave_function * current (void) { return instance_ok () ? instance->do_current () : 0; } @@ -125,7 +125,7 @@ } // Caller function, may be built-in. - static octave_function *caller (void) + static octave_function * caller (void) { return instance_ok () ? instance->do_caller () : 0; } @@ -165,13 +165,13 @@ // Function at location N on the call stack (N == 0 is current), may // be built-in. - static octave_function *element (size_t n) + static octave_function * element (size_t n) { return instance_ok () ? instance->do_element (n) : 0; } // User code caller. - static octave_user_code *caller_user_code (size_t nskip = 0) + static octave_user_code * caller_user_code (size_t nskip = 0) { return instance_ok () ? instance->do_caller_user_code (nskip) : 0; } @@ -189,7 +189,7 @@ } // Current function that we are debugging. - static octave_user_code *debug_user_code (void) + static octave_user_code * debug_user_code (void) { return instance_ok () ? instance->do_debug_user_code () : 0; } @@ -339,7 +339,7 @@ int do_current_column (void) const; - octave_function *do_caller (void) const + octave_function * do_caller (void) const { return curr_frame > 1 ? cs[curr_frame-1].m_fcn : cs[0].m_fcn; } @@ -371,7 +371,7 @@ } #endif - octave_function *do_element (size_t n) + octave_function * do_element (size_t n) { octave_function *retval = 0; @@ -384,11 +384,11 @@ return retval; } - octave_user_code *do_caller_user_code (size_t nskip) const; + octave_user_code * do_caller_user_code (size_t nskip) const; int do_caller_user_code_line (void) const; int do_caller_user_code_column (void) const; - octave_user_code *do_debug_user_code (void) const; + octave_user_code * do_debug_user_code (void) const; int do_debug_user_code_line (void) const; int do_debug_user_code_column (void) const; @@ -403,7 +403,7 @@ symbol_table::set_scope_and_context (scope, context); } - octave_function *do_current (void) const + octave_function * do_current (void) const { octave_function *retval = 0;
--- a/libinterp/corefcn/comment-list.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/comment-list.h Thu Apr 27 09:48:57 2017 -0700 @@ -31,7 +31,7 @@ extern std::string get_comment_text (void); -extern char *get_comment_text_c_str (void); +extern char * get_comment_text_c_str (void); extern void save_comment_text (const std::string& text); @@ -97,7 +97,7 @@ octave_comment_elt::comment_type t = octave_comment_elt::unknown) { append (octave_comment_elt (s, t)); } - octave_comment_list *dup (void) const; + octave_comment_list * dup (void) const; }; #endif
--- a/libinterp/corefcn/ft-text-renderer.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/ft-text-renderer.h Thu Apr 27 09:48:57 2017 -0700 @@ -30,7 +30,7 @@ { class base_text_renderer; - extern base_text_renderer *make_ft_text_renderer (void); + extern base_text_renderer * make_ft_text_renderer (void); } #endif
--- a/libinterp/corefcn/gl-render.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/gl-render.cc Thu Apr 27 09:48:57 2017 -0700 @@ -396,7 +396,7 @@ private: vertex_data_rep *rep; - vertex_data_rep *nil_rep (void) const + vertex_data_rep * nil_rep (void) const { static vertex_data_rep *nr = new vertex_data_rep (); @@ -436,7 +436,7 @@ return *this; } - vertex_data_rep *get_rep (void) const { return rep; } + vertex_data_rep * get_rep (void) const { return rep; } }; class
--- a/libinterp/corefcn/input.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/input.h Thu Apr 27 09:48:57 2017 -0700 @@ -42,7 +42,7 @@ class base_lexer; } -extern OCTINTERP_API FILE *get_input_from_stdin (void); +extern OCTINTERP_API FILE * get_input_from_stdin (void); // TRUE after a call to completion_matches. extern bool octave_completion_matches_called;
--- a/libinterp/corefcn/mex.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/mex.cc Thu Apr 27 09:48:57 2017 -0700 @@ -149,7 +149,7 @@ // happens, we delete this representation, so the conversion can only // happen once per call to a MEX file. -static inline void *maybe_mark_foreign (void *ptr); +static inline void * maybe_mark_foreign (void *ptr); class mxArray_octave_value : public mxArray_base { @@ -164,9 +164,9 @@ mxArray_octave_value& operator = (const mxArray_octave_value&) = delete; - mxArray_base *dup (void) const { return new mxArray_octave_value (*this); } - - mxArray *as_mxArray (void) const + mxArray_base * dup (void) const { return new mxArray_octave_value (*this); } + + mxArray * as_mxArray (void) const { mxArray *retval = val.as_mxArray (); @@ -271,7 +271,7 @@ return n; } - mwSize *get_dimensions (void) const + mwSize * get_dimensions (void) const { if (! dims) { @@ -360,7 +360,7 @@ return id; } - const char *get_class_name (void) const + const char * get_class_name (void) const { if (! class_name) { @@ -374,7 +374,7 @@ // Not allowed. void set_class_name (const char * /*name_arg*/) { request_mutation (); } - mxArray *get_cell (mwIndex /*idx*/) const + mxArray * get_cell (mwIndex /*idx*/) const { request_mutation (); return 0; @@ -403,7 +403,7 @@ return val.scalar_value (true); } - void *get_data (void) const + void * get_data (void) const { void *retval = val.mex_get_data (); @@ -415,7 +415,7 @@ return retval; } - void *get_imag_data (void) const + void * get_imag_data (void) const { void *retval = 0; @@ -433,12 +433,12 @@ // Not allowed. void set_imag_data (void * /*pi*/) { request_mutation (); } - mwIndex *get_ir (void) const + mwIndex * get_ir (void) const { return static_cast<mwIndex *> (maybe_mark_foreign (val.mex_get_ir ())); } - mwIndex *get_jc (void) const + mwIndex * get_jc (void) const { return static_cast<mwIndex *> (maybe_mark_foreign (val.mex_get_jc ())); } @@ -464,7 +464,7 @@ // Not allowed. void remove_field (int /*key_num*/) { request_mutation (); } - mxArray *get_field_by_number (mwIndex /*index*/, int /*key_num*/) const + mxArray * get_field_by_number (mwIndex /*index*/, int /*key_num*/) const { request_mutation (); return 0; @@ -479,7 +479,7 @@ int get_number_of_fields (void) const { return val.nfields (); } - const char *get_field_name_by_number (int /*key_num*/) const + const char * get_field_name_by_number (int /*key_num*/) const { request_mutation (); return 0; @@ -514,7 +514,7 @@ return retval; } - char *array_to_string (void) const + char * array_to_string (void) const { // FIXME: this is supposed to handle multi-byte character strings. @@ -588,7 +588,7 @@ mutate_flag = true; } - mxArray *mutate (void) const { return as_mxArray (); } + mxArray * mutate (void) const { return as_mxArray (); } octave_value as_octave_value (void) const { return val; } @@ -772,7 +772,7 @@ return n; } - mwSize *get_dimensions (void) const { return dims; } + mwSize * get_dimensions (void) const { return dims; } mwSize get_number_of_dimensions (void) const { return ndims; } @@ -825,7 +825,7 @@ mxClassID get_class_id (void) const { return id; } - const char *get_class_name (void) const + const char * get_class_name (void) const { switch (id) { @@ -857,7 +857,7 @@ strcpy (class_name, name_arg); } - mxArray *get_cell (mwIndex /*idx*/) const + mxArray * get_cell (mwIndex /*idx*/) const { err_invalid_type (); } @@ -872,12 +872,12 @@ err_invalid_type (); } - void *get_data (void) const + void * get_data (void) const { err_invalid_type (); } - void *get_imag_data (void) const + void * get_imag_data (void) const { err_invalid_type (); } @@ -892,12 +892,12 @@ err_invalid_type (); } - mwIndex *get_ir (void) const + mwIndex * get_ir (void) const { err_invalid_type (); } - mwIndex *get_jc (void) const + mwIndex * get_jc (void) const { err_invalid_type (); } @@ -932,7 +932,7 @@ err_invalid_type (); } - mxArray *get_field_by_number (mwIndex /*index*/, int /*key_num*/) const + mxArray * get_field_by_number (mwIndex /*index*/, int /*key_num*/) const { err_invalid_type (); } @@ -948,7 +948,7 @@ err_invalid_type (); } - const char *get_field_name_by_number (int /*key_num*/) const + const char * get_field_name_by_number (int /*key_num*/) const { err_invalid_type (); } @@ -963,7 +963,7 @@ err_invalid_type (); } - char *array_to_string (void) const + char * array_to_string (void) const { err_invalid_type (); } @@ -1157,7 +1157,7 @@ mxArray_number& operator = (const mxArray_number&); - mxArray_base *dup (void) const { return new mxArray_number (*this); } + mxArray_base * dup (void) const { return new mxArray_number (*this); } ~mxArray_number (void) { @@ -1228,9 +1228,9 @@ return retval; } - void *get_data (void) const { return pr; } - - void *get_imag_data (void) const { return pi; } + void * get_data (void) const { return pr; } + + void * get_imag_data (void) const { return pi; } void set_data (void *pr_arg) { pr = pr_arg; } @@ -1262,7 +1262,7 @@ return retval; } - char *array_to_string (void) const + char * array_to_string (void) const { // FIXME: this is supposed to handle multi-byte character strings. @@ -1492,7 +1492,7 @@ mxArray_sparse& operator = (const mxArray_sparse&); - mxArray_base *dup (void) const { return new mxArray_sparse (*this); } + mxArray_base * dup (void) const { return new mxArray_sparse (*this); } ~mxArray_sparse (void) { @@ -1506,17 +1506,17 @@ int is_sparse (void) const { return 1; } - void *get_data (void) const { return pr; } - - void *get_imag_data (void) const { return pi; } + void * get_data (void) const { return pr; } + + void * get_imag_data (void) const { return pi; } void set_data (void *pr_arg) { pr = pr_arg; } void set_imag_data (void *pi_arg) { pi = pi_arg; } - mwIndex *get_ir (void) const { return ir; } - - mwIndex *get_jc (void) const { return jc; } + mwIndex * get_ir (void) const { return ir; } + + mwIndex * get_jc (void) const { return jc; } mwSize get_nzmax (void) const { return nzmax; } @@ -1693,7 +1693,7 @@ fields[i] = mxArray::strsave (keys[i]); } - mxArray_base *dup (void) const { return new mxArray_struct (*this); } + mxArray_base * dup (void) const { return new mxArray_struct (*this); } ~mxArray_struct (void) { @@ -1813,7 +1813,7 @@ } } - mxArray *get_field_by_number (mwIndex index, int key_num) const + mxArray * get_field_by_number (mwIndex index, int key_num) const { return key_num >= 0 && key_num < nfields ? data[nfields * index + key_num] : 0; @@ -1823,7 +1823,7 @@ int get_number_of_fields (void) const { return nfields; } - const char *get_field_name_by_number (int key_num) const + const char * get_field_name_by_number (int key_num) const { return key_num >= 0 && key_num < nfields ? fields[key_num] : 0; } @@ -1844,7 +1844,7 @@ return retval; } - void *get_data (void) const { return data; } + void * get_data (void) const { return data; } void set_data (void *data_arg) { data = static_cast<mxArray **> (data_arg); } @@ -1927,7 +1927,7 @@ mxArray_cell& operator = (const mxArray_cell&); - mxArray_base *dup (void) const { return new mxArray_cell (*this); } + mxArray_base * dup (void) const { return new mxArray_cell (*this); } ~mxArray_cell (void) { @@ -1939,14 +1939,14 @@ mxFree (data); } - mxArray *get_cell (mwIndex idx) const + mxArray * get_cell (mwIndex idx) const { return idx >= 0 && idx < get_number_of_elements () ? data[idx] : 0; } void set_cell (mwIndex idx, mxArray *val); - void *get_data (void) const { return data; } + void * get_data (void) const { return data; } void set_data (void *data_arg) { data = static_cast<mxArray **> (data_arg); } @@ -2111,7 +2111,7 @@ mxFree (fname); } - const char *function_name (void) const + const char * function_name (void) const { if (! fname) { @@ -2130,7 +2130,7 @@ } // Allocate memory. - void *malloc_unmarked (size_t n) + void * malloc_unmarked (size_t n) { void *ptr = std::malloc (n); @@ -2147,7 +2147,7 @@ } // Allocate memory to be freed on exit. - void *malloc (size_t n) + void * malloc (size_t n) { void *ptr = malloc_unmarked (n); @@ -2157,7 +2157,7 @@ } // Allocate memory and initialize to 0. - void *calloc_unmarked (size_t n, size_t t) + void * calloc_unmarked (size_t n, size_t t) { void *ptr = malloc_unmarked (n*t); @@ -2167,7 +2167,7 @@ } // Allocate memory to be freed on exit and initialize to 0. - void *calloc (size_t n, size_t t) + void * calloc (size_t n, size_t t) { void *ptr = calloc_unmarked (n, t); @@ -2179,7 +2179,7 @@ // Reallocate a pointer obtained from malloc or calloc. // If the pointer is NULL, allocate using malloc. // We don't need an "unmarked" version of this. - void *realloc (void *ptr, size_t n) + void * realloc (void *ptr, size_t n) { void *v; @@ -2263,7 +2263,7 @@ #endif } - mxArray *mark_array (mxArray *ptr) + mxArray * mark_array (mxArray *ptr) { arraylist.insert (ptr); return ptr; @@ -2304,7 +2304,7 @@ // Make a new array value and initialize from an octave value; it will be // freed on exit unless marked as persistent. - mxArray *make_value (const octave_value& ov) + mxArray * make_value (const octave_value& ov) { return mark_array (new mxArray (ov)); } @@ -2330,7 +2330,7 @@ return inlist; } - octave_mex_function *current_mex_function (void) const + octave_mex_function * current_mex_function (void) const { return curr_mex_fcn; }
--- a/libinterp/corefcn/mexproto.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/mexproto.h Thu Apr 27 09:48:57 2017 -0700 @@ -63,7 +63,7 @@ #undef MXARRAY_TYPEDEFS_ONLY /* Interface to the interpreter. */ -extern OCTINTERP_API const char *mexFunctionName (void); +extern OCTINTERP_API const char * mexFunctionName (void); extern OCTINTERP_API int mexCallMATLAB (int nargout, mxArray *argout[], int nargin, mxArray *argin[], @@ -87,16 +87,16 @@ ...); extern OCTINTERP_API int mexPrintf (const char *fmt, ...); -extern OCTINTERP_API mxArray *mexGetVariable (const char *space, - const char *name); -extern OCTINTERP_API const mxArray *mexGetVariablePtr (const char *space, - const char *name); +extern OCTINTERP_API mxArray * mexGetVariable (const char *space, + const char *name); +extern OCTINTERP_API const mxArray * mexGetVariablePtr (const char *space, + const char *name); extern OCTINTERP_API int mexPutVariable (const char *space, const char *name, const mxArray *ptr); -extern OCTINTERP_API const mxArray *mexGet (double handle, - const char *property); +extern OCTINTERP_API const mxArray * mexGet (double handle, + const char *property); extern OCTINTERP_API int mexSet (double handle, const char *property, mxArray *val); @@ -122,56 +122,56 @@ extern OCTINTERP_API double mxGetNaN (void); /* Memory management. */ -extern OCTINTERP_API void *mxCalloc (size_t n, size_t size); -extern OCTINTERP_API void *mxMalloc (size_t n); -extern OCTINTERP_API void *mxRealloc (void *ptr, size_t size); +extern OCTINTERP_API void * mxCalloc (size_t n, size_t size); +extern OCTINTERP_API void * mxMalloc (size_t n); +extern OCTINTERP_API void * mxRealloc (void *ptr, size_t size); extern OCTINTERP_API void mxFree (void *ptr); /* Constructors. */ -extern OCTINTERP_API mxArray *mxCreateCellArray (mwSize ndims, - const mwSize *dims); -extern OCTINTERP_API mxArray *mxCreateCellMatrix (mwSize m, mwSize n); -extern OCTINTERP_API mxArray *mxCreateCharArray (mwSize ndims, - const mwSize *dims); -extern OCTINTERP_API mxArray *mxCreateCharMatrixFromStrings (mwSize m, - const char **str); -extern OCTINTERP_API mxArray *mxCreateDoubleMatrix (mwSize nr, mwSize nc, - mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateDoubleScalar (double val); -extern OCTINTERP_API mxArray *mxCreateLogicalArray (mwSize ndims, - const mwSize *dims); -extern OCTINTERP_API mxArray *mxCreateLogicalMatrix (mwSize m, mwSize n); -extern OCTINTERP_API mxArray *mxCreateLogicalScalar (mxLogical val); -extern OCTINTERP_API mxArray *mxCreateNumericArray (mwSize ndims, - const mwSize *dims, - mxClassID class_id, - mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateNumericMatrix (mwSize m, mwSize n, +extern OCTINTERP_API mxArray * mxCreateCellArray (mwSize ndims, + const mwSize *dims); +extern OCTINTERP_API mxArray * mxCreateCellMatrix (mwSize m, mwSize n); +extern OCTINTERP_API mxArray * mxCreateCharArray (mwSize ndims, + const mwSize *dims); +extern OCTINTERP_API mxArray * mxCreateCharMatrixFromStrings (mwSize m, + const char **str); +extern OCTINTERP_API mxArray * mxCreateDoubleMatrix (mwSize nr, mwSize nc, + mxComplexity flag); +extern OCTINTERP_API mxArray * mxCreateDoubleScalar (double val); +extern OCTINTERP_API mxArray * mxCreateLogicalArray (mwSize ndims, + const mwSize *dims); +extern OCTINTERP_API mxArray * mxCreateLogicalMatrix (mwSize m, mwSize n); +extern OCTINTERP_API mxArray * mxCreateLogicalScalar (mxLogical val); +extern OCTINTERP_API mxArray * mxCreateNumericArray (mwSize ndims, + const mwSize *dims, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateUninitNumericArray (mwSize ndims, - const mwSize *dims, - mxClassID class_id, - mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateUninitNumericMatrix (mwSize m, mwSize n, +extern OCTINTERP_API mxArray * mxCreateNumericMatrix (mwSize m, mwSize n, + mxClassID class_id, + mxComplexity flag); +extern OCTINTERP_API mxArray * mxCreateUninitNumericArray (mwSize ndims, + const mwSize *dims, mxClassID class_id, mxComplexity flag); +extern OCTINTERP_API mxArray * mxCreateUninitNumericMatrix (mwSize m, mwSize n, + mxClassID class_id, + mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, - mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateSparseLogicalMatrix (mwSize m, mwSize n, - mwSize nzmax); -extern OCTINTERP_API mxArray *mxCreateString (const char *str); -extern OCTINTERP_API mxArray *mxCreateStructArray (mwSize ndims, - const mwSize *dims, - int num_keys, - const char **keys); -extern OCTINTERP_API mxArray *mxCreateStructMatrix (mwSize rows, mwSize cols, +extern OCTINTERP_API mxArray * mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, + mxComplexity flag); +extern OCTINTERP_API mxArray * mxCreateSparseLogicalMatrix (mwSize m, mwSize n, + mwSize nzmax); +extern OCTINTERP_API mxArray * mxCreateString (const char *str); +extern OCTINTERP_API mxArray * mxCreateStructArray (mwSize ndims, + const mwSize *dims, int num_keys, const char **keys); +extern OCTINTERP_API mxArray * mxCreateStructMatrix (mwSize rows, mwSize cols, + int num_keys, + const char **keys); /* Copy constructor. */ -extern OCTINTERP_API mxArray *mxDuplicateArray (const mxArray *v); +extern OCTINTERP_API mxArray * mxDuplicateArray (const mxArray *v); /* Destructor. */ extern OCTINTERP_API void mxDestroyArray (mxArray *v); @@ -214,7 +214,7 @@ /* Dimension extractors. */ extern OCTINTERP_API size_t mxGetM (const mxArray *ptr); extern OCTINTERP_API size_t mxGetN (const mxArray *ptr); -extern OCTINTERP_API const mwSize *mxGetDimensions (const mxArray *ptr); +extern OCTINTERP_API const mwSize * mxGetDimensions (const mxArray *ptr); extern OCTINTERP_API mwSize mxGetNumberOfDimensions (const mxArray *ptr); extern OCTINTERP_API size_t mxGetNumberOfElements (const mxArray *ptr); @@ -225,13 +225,13 @@ mwSize ndims); /* Data extractors. */ -extern OCTINTERP_API double *mxGetPi (const mxArray *ptr); -extern OCTINTERP_API double *mxGetPr (const mxArray *ptr); +extern OCTINTERP_API double * mxGetPi (const mxArray *ptr); +extern OCTINTERP_API double * mxGetPr (const mxArray *ptr); extern OCTINTERP_API double mxGetScalar (const mxArray *ptr); -extern OCTINTERP_API mxChar *mxGetChars (const mxArray *ptr); -extern OCTINTERP_API mxLogical *mxGetLogicals (const mxArray *ptr); -extern OCTINTERP_API void *mxGetData (const mxArray *ptr); -extern OCTINTERP_API void *mxGetImagData (const mxArray *ptr); +extern OCTINTERP_API mxChar * mxGetChars (const mxArray *ptr); +extern OCTINTERP_API mxLogical * mxGetLogicals (const mxArray *ptr); +extern OCTINTERP_API void * mxGetData (const mxArray *ptr); +extern OCTINTERP_API void * mxGetImagData (const mxArray *ptr); /* Data setters. */ extern OCTINTERP_API void mxSetPr (mxArray *ptr, double *pr); @@ -241,18 +241,18 @@ /* Classes. */ extern OCTINTERP_API mxClassID mxGetClassID (const mxArray *ptr); -extern OCTINTERP_API const char *mxGetClassName (const mxArray *ptr); +extern OCTINTERP_API const char * mxGetClassName (const mxArray *ptr); extern OCTINTERP_API void mxSetClassName (mxArray *ptr, const char *name); /* Cell support. */ -extern OCTINTERP_API mxArray *mxGetCell (const mxArray *ptr, mwIndex idx); +extern OCTINTERP_API mxArray * mxGetCell (const mxArray *ptr, mwIndex idx); extern OCTINTERP_API void mxSetCell (mxArray *ptr, mwIndex idx, mxArray *val); /* Sparse support. */ -extern OCTINTERP_API mwIndex *mxGetIr (const mxArray *ptr); -extern OCTINTERP_API mwIndex *mxGetJc (const mxArray *ptr); +extern OCTINTERP_API mwIndex * mxGetIr (const mxArray *ptr); +extern OCTINTERP_API mwIndex * mxGetJc (const mxArray *ptr); extern OCTINTERP_API mwSize mxGetNzmax (const mxArray *ptr); extern OCTINTERP_API void mxSetIr (mxArray *ptr, mwIndex *ir); @@ -264,10 +264,10 @@ extern OCTINTERP_API void mxRemoveField (mxArray *ptr, int key_num); -extern OCTINTERP_API mxArray *mxGetField (const mxArray *ptr, mwIndex index, - const char *key); -extern OCTINTERP_API mxArray *mxGetFieldByNumber (const mxArray *ptr, - mwIndex index, int key_num); +extern OCTINTERP_API mxArray * mxGetField (const mxArray *ptr, mwIndex index, + const char *key); +extern OCTINTERP_API mxArray * mxGetFieldByNumber (const mxArray *ptr, + mwIndex index, int key_num); extern OCTINTERP_API void mxSetField (mxArray *ptr, mwIndex index, const char *key, mxArray *val); @@ -276,13 +276,13 @@ extern OCTINTERP_API int mxGetNumberOfFields (const mxArray *ptr); -extern OCTINTERP_API const char *mxGetFieldNameByNumber (const mxArray *ptr, - int key_num); +extern OCTINTERP_API const char * mxGetFieldNameByNumber (const mxArray *ptr, + int key_num); extern OCTINTERP_API int mxGetFieldNumber (const mxArray *ptr, const char *key); extern OCTINTERP_API int mxGetString (const mxArray *ptr, char *buf, mwSize buflen); -extern OCTINTERP_API char *mxArrayToString (const mxArray *ptr); +extern OCTINTERP_API char * mxArrayToString (const mxArray *ptr); /* Miscellaneous. */ extern OCTINTERP_API mwIndex mxCalcSingleSubscript (const mxArray *ptr,
--- a/libinterp/corefcn/mxarray.in.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/mxarray.in.h Thu Apr 27 09:48:57 2017 -0700 @@ -135,9 +135,9 @@ public: - virtual mxArray_base *dup (void) const = 0; + virtual mxArray_base * dup (void) const = 0; - virtual mxArray *as_mxArray (void) const { return 0; } + virtual mxArray * as_mxArray (void) const { return 0; } virtual ~mxArray_base (void) = default; @@ -202,7 +202,7 @@ virtual mwSize get_n (void) const = 0; - virtual mwSize *get_dimensions (void) const = 0; + virtual mwSize * get_dimensions (void) const = 0; virtual mwSize get_number_of_dimensions (void) const = 0; @@ -220,13 +220,13 @@ virtual mxClassID get_class_id (void) const = 0; - virtual const char *get_class_name (void) const = 0; + virtual const char * get_class_name (void) const = 0; virtual void set_class_name (const char *name_arg) = 0; // FIXME: Why not just have this '= 0' as the others? // Could then eliminate err_invalid_type function and #include "error.h". - virtual mxArray *get_cell (mwIndex /*idx*/) const + virtual mxArray * get_cell (mwIndex /*idx*/) const { err_invalid_type (); } @@ -235,17 +235,17 @@ virtual double get_scalar (void) const = 0; - virtual void *get_data (void) const = 0; + virtual void * get_data (void) const = 0; - virtual void *get_imag_data (void) const = 0; + virtual void * get_imag_data (void) const = 0; virtual void set_data (void *pr) = 0; virtual void set_imag_data (void *pi) = 0; - virtual mwIndex *get_ir (void) const = 0; + virtual mwIndex * get_ir (void) const = 0; - virtual mwIndex *get_jc (void) const = 0; + virtual mwIndex * get_jc (void) const = 0; virtual mwSize get_nzmax (void) const = 0; @@ -259,20 +259,20 @@ virtual void remove_field (int key_num) = 0; - virtual mxArray *get_field_by_number (mwIndex index, int key_num) const = 0; + virtual mxArray * get_field_by_number (mwIndex index, int key_num) const = 0; virtual void set_field_by_number (mwIndex index, int key_num, mxArray *val) = 0; virtual int get_number_of_fields (void) const = 0; - virtual const char *get_field_name_by_number (int key_num) const = 0; + virtual const char * get_field_name_by_number (int key_num) const = 0; virtual int get_field_number (const char *key) const = 0; virtual int get_string (char *buf, mwSize buflen) const = 0; - virtual char *array_to_string (void) const = 0; + virtual char * array_to_string (void) const = 0; virtual mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const = 0; @@ -280,7 +280,7 @@ virtual bool mutation_needed (void) const { return false; } - virtual mxArray *mutate (void) const { return 0; } + virtual mxArray * mutate (void) const { return 0; } virtual octave_value as_octave_value (void) const = 0; @@ -342,7 +342,7 @@ mxArray (mwSize m, mwSize n); - mxArray *dup (void) const + mxArray * dup (void) const { mxArray *retval = rep->as_mxArray (); @@ -415,7 +415,7 @@ mwSize get_n (void) const { return rep->get_n (); } - mwSize *get_dimensions (void) const { return rep->get_dimensions (); } + mwSize * get_dimensions (void) const { return rep->get_dimensions (); } mwSize get_number_of_dimensions (void) const { return rep->get_number_of_dimensions (); } @@ -434,18 +434,18 @@ bool is_scalar (void) const { return rep->is_scalar (); } - const char *get_name (void) const { return name; } + const char * get_name (void) const { return name; } void set_name (const char *name_arg); mxClassID get_class_id (void) const { return rep->get_class_id (); } - const char *get_class_name (void) const { return rep->get_class_name (); } + const char * get_class_name (void) const { return rep->get_class_name (); } void set_class_name (const char *name_arg) { DO_VOID_MUTABLE_METHOD (set_class_name (name_arg)); } - mxArray *get_cell (mwIndex idx) const + mxArray * get_cell (mwIndex idx) const { DO_MUTABLE_METHOD (mxArray *, get_cell (idx)); } void set_cell (mwIndex idx, mxArray *val) @@ -453,18 +453,18 @@ double get_scalar (void) const { return rep->get_scalar (); } - void *get_data (void) const { DO_MUTABLE_METHOD (void *, get_data ()); } + void * get_data (void) const { DO_MUTABLE_METHOD (void *, get_data ()); } - void *get_imag_data (void) const + void * get_imag_data (void) const { DO_MUTABLE_METHOD (void *, get_imag_data ()); } void set_data (void *pr) { DO_VOID_MUTABLE_METHOD (set_data (pr)); } void set_imag_data (void *pi) { DO_VOID_MUTABLE_METHOD (set_imag_data (pi)); } - mwIndex *get_ir (void) const { DO_MUTABLE_METHOD (mwIndex *, get_ir ()); } + mwIndex * get_ir (void) const { DO_MUTABLE_METHOD (mwIndex *, get_ir ()); } - mwIndex *get_jc (void) const { DO_MUTABLE_METHOD (mwIndex *, get_jc ()); } + mwIndex * get_jc (void) const { DO_MUTABLE_METHOD (mwIndex *, get_jc ()); } mwSize get_nzmax (void) const { return rep->get_nzmax (); } @@ -479,7 +479,7 @@ void remove_field (int key_num) { DO_VOID_MUTABLE_METHOD (remove_field (key_num)); } - mxArray *get_field_by_number (mwIndex index, int key_num) const + mxArray * get_field_by_number (mwIndex index, int key_num) const { DO_MUTABLE_METHOD (mxArray *, get_field_by_number (index, key_num)); } void set_field_by_number (mwIndex index, int key_num, mxArray *val) @@ -487,7 +487,7 @@ int get_number_of_fields (void) const { return rep->get_number_of_fields (); } - const char *get_field_name_by_number (int key_num) const + const char * get_field_name_by_number (int key_num) const { DO_MUTABLE_METHOD (const char*, get_field_name_by_number (key_num)); } int get_field_number (const char *key) const @@ -496,7 +496,7 @@ int get_string (char *buf, mwSize buflen) const { return rep->get_string (buf, buflen); } - char *array_to_string (void) const { return rep->array_to_string (); } + char * array_to_string (void) const { return rep->array_to_string (); } mwIndex calc_single_subscript (mwSize nsubs, mwIndex *subs) const { return rep->calc_single_subscript (nsubs, subs); } @@ -505,13 +505,13 @@ bool mutation_needed (void) const { return rep->mutation_needed (); } - mxArray *mutate (void) const { return rep->mutate (); } + mxArray * mutate (void) const { return rep->mutate (); } - static void *malloc (size_t n); + static void * malloc (size_t n); - static void *calloc (size_t n, size_t t); + static void * calloc (size_t n, size_t t); - static char *strsave (const char *str) + static char * strsave (const char *str) { char *retval = 0;
--- a/libinterp/corefcn/oct-fstrm.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-fstrm.h Thu Apr 27 09:48:57 2017 -0700 @@ -70,9 +70,9 @@ std::string name (void) const { return nm; } - std::istream *input_stream (void); + std::istream * input_stream (void); - std::ostream *output_stream (void); + std::ostream * output_stream (void); protected:
--- a/libinterp/corefcn/oct-iostrm.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-iostrm.h Thu Apr 27 09:48:57 2017 -0700 @@ -76,7 +76,7 @@ std::string nm; - virtual const char *stream_type (void) const = 0; + virtual const char * stream_type (void) const = 0; }; class @@ -97,9 +97,9 @@ bool eof (void) const; - std::istream *input_stream (void) { return is; } + std::istream * input_stream (void) { return is; } - std::ostream *output_stream (void) { return 0; } + std::ostream * output_stream (void) { return 0; } protected: @@ -109,7 +109,7 @@ std::istream *is; - const char *stream_type (void) const { return "octave_istream"; } + const char * stream_type (void) const { return "octave_istream"; } // No copying! @@ -136,9 +136,9 @@ bool eof (void) const; - std::istream *input_stream (void) { return 0; } + std::istream * input_stream (void) { return 0; } - std::ostream *output_stream (void) { return os; } + std::ostream * output_stream (void) { return os; } protected: @@ -148,7 +148,7 @@ std::ostream *os; - const char *stream_type (void) const { return "octave_ostream"; } + const char * stream_type (void) const { return "octave_ostream"; } // No copying!
--- a/libinterp/corefcn/oct-procbuf.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-procbuf.h Thu Apr 27 09:48:57 2017 -0700 @@ -53,9 +53,9 @@ ~octave_procbuf (void) { close (); } - octave_procbuf *open (const char *command, int mode); + octave_procbuf * open (const char *command, int mode); - octave_procbuf *close (void); + octave_procbuf * close (void); int wait_status (void) const { return wstatus; }
--- a/libinterp/corefcn/oct-stdstrm.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-stdstrm.h Thu Apr 27 09:48:57 2017 -0700 @@ -66,12 +66,12 @@ std::string name (void) const { return nm; } - std::istream *input_stream (void) { return (md & std::ios::in) ? s : 0; } + std::istream * input_stream (void) { return (md & std::ios::in) ? s : 0; } - std::ostream *output_stream (void) { return (md & std::ios::out) ? s : 0; } + std::ostream * output_stream (void) { return (md & std::ios::out) ? s : 0; } // FIXME: should not have to cast away const here. - BUF_T *rdbuf (void) const + BUF_T * rdbuf (void) const { return s ? (const_cast<STREAM_T *> (s))->rdbuf () : 0; } int file_number (void) const { return fnum; }
--- a/libinterp/corefcn/oct-stream.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-stream.cc Thu Apr 27 09:48:57 2017 -0700 @@ -302,18 +302,18 @@ size_t length (void) const { return fmt_elts.size (); } - const scanf_format_elt *first (void) + const scanf_format_elt * first (void) { curr_idx = 0; return current (); } - const scanf_format_elt *current (void) const + const scanf_format_elt * current (void) const { return length () > 0 ? fmt_elts[curr_idx] : 0; } - const scanf_format_elt *next (bool cycle = true) + const scanf_format_elt * next (bool cycle = true) { static scanf_format_elt dummy (0, 0, false, scanf_format_elt::null, '\0', ""); @@ -811,20 +811,20 @@ octave_idx_type num_conversions (void) { return nconv; } - const printf_format_elt *first (void) + const printf_format_elt * first (void) { curr_idx = 0; return current (); } - const printf_format_elt *current (void) const + const printf_format_elt * current (void) const { return length () > 0 ? fmt_elts[curr_idx] : 0; } size_t length (void) const { return fmt_elts.size (); } - const printf_format_elt *next (bool cycle = true) + const printf_format_elt * next (bool cycle = true) { curr_idx++; @@ -1282,11 +1282,11 @@ // int skipline (char delim); - char *read (char *buffer, int size, char* &new_start); + char * read (char *buffer, int size, char* &new_start); // Return a position suitable to "seekg", valid only within this // block between calls to field_done. - char *tellg (void) { return idx; } + char * tellg (void) { return idx; } void seekg (char *old_idx) { idx = old_idx; } @@ -1716,18 +1716,18 @@ size_t numel (void) const { return fmt_elts.size (); } - const textscan_format_elt *first (void) + const textscan_format_elt * first (void) { curr_idx = 0; return current (); } - const textscan_format_elt *current (void) const + const textscan_format_elt * current (void) const { return numel () > 0 ? fmt_elts[curr_idx] : 0; } - const textscan_format_elt *next (bool cycle = true) + const textscan_format_elt * next (bool cycle = true) { curr_idx++;
--- a/libinterp/corefcn/oct-stream.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-stream.h Thu Apr 27 09:48:57 2017 -0700 @@ -101,13 +101,13 @@ // pointer to a valid istream, scanf(), read(), getl(), and gets() // will automatically work for this stream. - virtual std::istream *input_stream (void) { return 0; } + virtual std::istream * input_stream (void) { return 0; } // If the derived class provides this function and it returns a // pointer to a valid ostream, flush(), write(), and printf() will // automatically work for this stream. - virtual std::ostream *output_stream (void) { return 0; } + virtual std::ostream * output_stream (void) { return 0; } // Return TRUE if this stream is open. @@ -361,12 +361,12 @@ static std::string mode_as_string (int mode); - std::istream *input_stream (void) + std::istream * input_stream (void) { return rep ? rep->input_stream () : 0; } - std::ostream *output_stream (void) + std::ostream * output_stream (void) { return rep ? rep->output_stream () : 0; }
--- a/libinterp/corefcn/oct-strstrm.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/oct-strstrm.h Thu Apr 27 09:48:57 2017 -0700 @@ -64,7 +64,7 @@ std::string name (void) const { return ""; } - virtual std::streambuf *rdbuf (void) = 0; + virtual std::streambuf * rdbuf (void) = 0; virtual bool bad (void) const = 0; @@ -115,13 +115,13 @@ bool eof (void) const { return is.eof (); } - std::istream *input_stream (void) { return &is; } + std::istream * input_stream (void) { return &is; } - std::ostream *output_stream (void) { return 0; } + std::ostream * output_stream (void) { return 0; } off_t tell (void) { return is.tellg (); } - std::streambuf *rdbuf (void) { return is ? is.rdbuf () : 0; } + std::streambuf * rdbuf (void) { return is ? is.rdbuf () : 0; } bool bad (void) const { return is.bad (); } @@ -163,13 +163,13 @@ bool eof (void) const { return os.eof (); } - std::istream *input_stream (void) { return 0; } + std::istream * input_stream (void) { return 0; } - std::ostream *output_stream (void) { return &os; } + std::ostream * output_stream (void) { return &os; } std::string str (void) { return os.str (); } - std::streambuf *rdbuf (void) { return os ? os.rdbuf () : 0; } + std::streambuf * rdbuf (void) { return os ? os.rdbuf () : 0; } bool bad (void) const { return os.bad (); }
--- a/libinterp/corefcn/octave-link.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/octave-link.h Thu Apr 27 09:48:57 2017 -0700 @@ -311,7 +311,7 @@ static void connect_link (octave_link *); - static octave_link *disconnect_link (bool delete_instance = true) + static octave_link * disconnect_link (bool delete_instance = true) { if (delete_instance) {
--- a/libinterp/corefcn/sighandlers.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/sighandlers.cc Thu Apr 27 09:48:57 2017 -0700 @@ -321,7 +321,7 @@ return retval; } - static base_interrupt_manager *create_instance (void) + static base_interrupt_manager * create_instance (void) { #if defined (OCTAVE_USE_WINDOWS_API) return new w32_interrupt_manager ();
--- a/libinterp/corefcn/symtab.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/symtab.h Thu Apr 27 09:48:57 2017 -0700 @@ -455,7 +455,7 @@ curr_fcn = fcn; } - symbol_record_rep *dup (scope_id new_scope) const + symbol_record_rep * dup (scope_id new_scope) const { return new symbol_record_rep (new_scope, name, varval (), storage_class); @@ -2233,7 +2233,7 @@ return retval; } - static octave_user_function *get_curr_fcn (scope_id scope = xcurrent_scope) + static octave_user_function * get_curr_fcn (scope_id scope = xcurrent_scope) { symbol_table *inst = get_instance (scope); return inst->curr_fcn; @@ -2358,7 +2358,7 @@ ~symbol_table (void) = default; - static symbol_table *get_instance (scope_id scope, bool create = true) + static symbol_table * get_instance (scope_id scope, bool create = true) { symbol_table *retval = 0; @@ -2471,7 +2471,7 @@ } } - static fcn_info *get_fcn_info (const std::string& name) + static fcn_info * get_fcn_info (const std::string& name) { fcn_table_iterator p = fcn_table.find (name); return p != fcn_table.end () ? &p->second : 0;
--- a/libinterp/corefcn/sysdep.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/sysdep.h Thu Apr 27 09:48:57 2017 -0700 @@ -40,7 +40,9 @@ extern OCTINTERP_API void raw_mode (bool, bool wait = true); -extern OCTINTERP_API FILE *octave_popen (const char *command, const char *mode); +extern OCTINTERP_API FILE * octave_popen (const char *command, + const char *mode); + extern OCTINTERP_API int octave_pclose (FILE *f); extern OCTINTERP_API int octave_kbhit (bool wait = true);
--- a/libinterp/corefcn/utils.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/corefcn/utils.h Thu Apr 27 09:48:57 2017 -0700 @@ -84,7 +84,7 @@ extern OCTINTERP_API std::string do_string_escapes (const std::string& s); -extern OCTINTERP_API const char *undo_string_escape (char c); +extern OCTINTERP_API const char * undo_string_escape (char c); extern OCTINTERP_API std::string undo_string_escapes (const std::string& s);
--- a/libinterp/dldfcn/audiodevinfo.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/dldfcn/audiodevinfo.cc Thu Apr 27 09:48:57 2017 -0700 @@ -503,7 +503,7 @@ charMatrix get_tag (void); void set_userdata (const octave_value& userdata); octave_value get_userdata (void); - PaStream *get_stream (void); + PaStream * get_stream (void); void playblocking (void); void play (void); @@ -1258,10 +1258,10 @@ charMatrix get_tag (void); void set_userdata (const octave_value& userdata); octave_value get_userdata (void); - PaStream *get_stream (void); + PaStream * get_stream (void); octave_value getaudiodata (void); - audioplayer *getplayer (void); + audioplayer * getplayer (void); bool isrecording (void); audioplayer play (void); void record (void);
--- a/libinterp/octave-value/ov-base-diag.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-base-diag.h Thu Apr 27 09:48:57 2017 -0700 @@ -206,7 +206,7 @@ oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const; - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; bool print_as_scalar (void) const;
--- a/libinterp/octave-value/ov-base-int.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-base-int.h Thu Apr 27 09:48:57 2017 -0700 @@ -53,13 +53,13 @@ ~octave_base_int_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_base_int_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_base_int_matrix (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); bool is_real_type (void) const { return true; } @@ -112,12 +112,12 @@ ~octave_base_int_scalar (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_base_int_scalar (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_base_int_scalar (); } - octave_base_value *try_narrowing_conversion (void) { return 0; } + octave_base_value * try_narrowing_conversion (void) { return 0; } bool is_real_type (void) const { return true; }
--- a/libinterp/octave-value/ov-base-scalar.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-base-scalar.h Thu Apr 27 09:48:57 2017 -0700 @@ -143,7 +143,7 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return const_cast<ST *> (&scalar); } + void * mex_get_data (void) const { return const_cast<ST *> (&scalar); } const ST& scalar_ref (void) const { return scalar; }
--- a/libinterp/octave-value/ov-base-sparse.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-base-sparse.h Thu Apr 27 09:48:57 2017 -0700 @@ -167,11 +167,11 @@ // Unsafe. These functions exists to support the MEX interface. // You should not use them anywhere else. - void *mex_get_data (void) const { return matrix.mex_get_data (); } + void * mex_get_data (void) const { return matrix.mex_get_data (); } - octave_idx_type *mex_get_ir (void) const { return matrix.mex_get_ir (); } + octave_idx_type * mex_get_ir (void) const { return matrix.mex_get_ir (); } - octave_idx_type *mex_get_jc (void) const { return matrix.mex_get_jc (); } + octave_idx_type * mex_get_jc (void) const { return matrix.mex_get_jc (); } octave_value fast_elem_extract (octave_idx_type n) const;
--- a/libinterp/octave-value/ov-base.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-base.h Thu Apr 27 09:48:57 2017 -0700 @@ -253,7 +253,7 @@ virtual octave_value as_uint32 (void) const; virtual octave_value as_uint64 (void) const; - virtual octave_base_value *try_narrowing_conversion (void) { return 0; } + virtual octave_base_value * try_narrowing_conversion (void) { return 0; } virtual void maybe_economize (void) { } @@ -597,26 +597,26 @@ virtual string_vector parent_class_names (void) const; - virtual octave_base_value *find_parent_class (const std::string&) + virtual octave_base_value * find_parent_class (const std::string&) { return 0; } - virtual octave_base_value *unique_parent_class (const std::string&) + virtual octave_base_value * unique_parent_class (const std::string&) { return 0; } virtual bool is_instance_of (const std::string&) const { return false; } - virtual octave_function *function_value (bool silent = false); + virtual octave_function * function_value (bool silent = false); - virtual octave_user_function *user_function_value (bool silent = false); + virtual octave_user_function * user_function_value (bool silent = false); - virtual octave_user_script *user_script_value (bool silent = false); + virtual octave_user_script * user_script_value (bool silent = false); - virtual octave_user_code *user_code_value (bool silent = false); + virtual octave_user_code * user_code_value (bool silent = false); - virtual octave_fcn_handle *fcn_handle_value (bool silent = false); + virtual octave_fcn_handle * fcn_handle_value (bool silent = false); - virtual octave_fcn_inline *fcn_inline_value (bool silent = false); + virtual octave_fcn_inline * fcn_inline_value (bool silent = false); virtual octave_value_list list_value (void) const; @@ -670,13 +670,13 @@ oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const; - virtual void *mex_get_data (void) const { return 0; } + virtual void * mex_get_data (void) const { return 0; } - virtual octave_idx_type *mex_get_ir (void) const { return 0; } + virtual octave_idx_type * mex_get_ir (void) const { return 0; } - virtual octave_idx_type *mex_get_jc (void) const { return 0; } + virtual octave_idx_type * mex_get_jc (void) const { return 0; } - virtual mxArray *as_mxArray (void) const; + virtual mxArray * as_mxArray (void) const; virtual octave_value diag (octave_idx_type k = 0) const; @@ -840,7 +840,7 @@ // (think of an empty cell array with >2G elements). octave::refcount<octave_idx_type> count; - static const char *get_umap_name (unary_mapper_t); + static const char * get_umap_name (unary_mapper_t); void warn_load (const char *type) const; void warn_save (const char *type) const;
--- a/libinterp/octave-value/ov-bool-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-bool-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -77,15 +77,15 @@ ~octave_bool_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_bool_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_bool_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); idx_vector index_vector (bool /* require_integers */ = false) const { @@ -229,9 +229,9 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return matrix.mex_get_data (); } + void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; // Mapper functions are converted to double for treatment octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-bool-sparse.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-bool-sparse.h Thu Apr 27 09:48:57 2017 -0700 @@ -75,14 +75,14 @@ ~octave_sparse_bool_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_sparse_bool_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_sparse_bool_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); // FIXME: Adapt idx_vector to allow sparse logical indexing without overflow! idx_vector index_vector (bool /* require_integers */ = false) const @@ -141,7 +141,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; // Mapper functions are converted to double for treatment octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-bool.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-bool.h Thu Apr 27 09:48:57 2017 -0700 @@ -62,8 +62,8 @@ ~octave_bool (void) = default; - octave_base_value *clone (void) const { return new octave_bool (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * clone (void) const { return new octave_bool (*this); } + octave_base_value * empty_clone (void) const { return new octave_bool_matrix (); } type_conv_info numeric_conversion_function (void) const; @@ -243,7 +243,7 @@ skip, flt_fmt); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; // Mapper functions are converted to double for treatment octave_value map (unary_mapper_t umap) const
--- a/libinterp/octave-value/ov-builtin.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-builtin.h Thu Apr 27 09:48:57 2017 -0700 @@ -82,7 +82,7 @@ int nargout, const std::list<octave_lvalue>* lvalue_list); - octave_function *function_value (bool = false) { return this; } + octave_function * function_value (bool = false) { return this; } bool is_builtin_function (void) const { return true; } @@ -93,7 +93,7 @@ do_multi_index_op (int nargout, const octave_value_list& args, const std::list<octave_lvalue>* lvalue_list); - jit_type *to_jit (void) const; + jit_type * to_jit (void) const; void stash_jit (jit_type& type);
--- a/libinterp/octave-value/ov-cell.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-cell.h Thu Apr 27 09:48:57 2017 -0700 @@ -64,11 +64,11 @@ ~octave_cell (void) = default; - octave_base_value *clone (void) const { return new octave_cell (*this); } - octave_base_value *empty_clone (void) const { return new octave_cell (); } + octave_base_value * clone (void) const { return new octave_cell (*this); } + octave_base_value * empty_clone (void) const { return new octave_cell (); } #if 0 - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); #endif octave_value subsref (const std::string& type, @@ -171,11 +171,11 @@ octave_value map (unary_mapper_t umap) const; - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const; + void * mex_get_data (void) const; private:
--- a/libinterp/octave-value/ov-ch-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-ch-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -82,9 +82,9 @@ ~octave_char_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_char_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_char_matrix (); } idx_vector index_vector (bool require_integers = false) const; @@ -163,9 +163,9 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return matrix.mex_get_data (); } + void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; };
--- a/libinterp/octave-value/ov-class.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-class.h Thu Apr 27 09:48:57 2017 -0700 @@ -68,11 +68,11 @@ ~octave_class (void) = default; - octave_base_value *clone (void) const { return new octave_class (*this); } + octave_base_value * clone (void) const { return new octave_class (*this); } - octave_base_value *unique_clone (void); + octave_base_value * unique_clone (void); - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_class (octave_map (map.keys ()), c_name, parent_list); } @@ -164,9 +164,9 @@ string_vector parent_class_names (void) const { return string_vector (parent_list); } - octave_base_value *find_parent_class (const std::string&); + octave_base_value * find_parent_class (const std::string&); - octave_base_value *unique_parent_class (const std::string&); + octave_base_value * unique_parent_class (const std::string&); bool is_instance_of (const std::string&) const; @@ -200,7 +200,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; private: octave_map map;
--- a/libinterp/octave-value/ov-classdef.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-classdef.h Thu Apr 27 09:48:57 2017 -0700 @@ -705,7 +705,7 @@ bool is_meta_class (void) const { return meta; } - octave::tree_evaluator *evaluator (void) const { return m_evaluator; } + octave::tree_evaluator * evaluator (void) const { return m_evaluator; } private: void load_all_methods (void); @@ -896,7 +896,7 @@ const cdef_class_rep* get_rep (void) const { return dynamic_cast<const cdef_class_rep *> (cdef_object::get_rep ()); } - octave::tree_evaluator *evaluator (void) const + octave::tree_evaluator * evaluator (void) const { return get_rep ()->evaluator (); } friend bool operator == (const cdef_class&, const cdef_class&);
--- a/libinterp/octave-value/ov-colon.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-colon.h Thu Apr 27 09:48:57 2017 -0700 @@ -54,9 +54,9 @@ ~octave_magic_colon (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_magic_colon (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_magic_colon (); } idx_vector index_vector (bool /* require_integers */ = false) const { return idx_vector (':'); }
--- a/libinterp/octave-value/ov-complex.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-complex.cc Thu Apr 27 09:48:57 2017 -0700 @@ -80,7 +80,7 @@ } // ID of error to throw. - const char *err_id (void) const + const char * err_id (void) const { return "Octave:invalid-index"; }
--- a/libinterp/octave-value/ov-complex.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-complex.h Thu Apr 27 09:48:57 2017 -0700 @@ -62,18 +62,18 @@ ~octave_complex (void) = default; - octave_base_value *clone (void) const { return new octave_complex (*this); } + octave_base_value * clone (void) const { return new octave_complex (*this); } // We return an octave_complex_matrix object here instead of an // octave_complex object so that in expressions like A(2,2,2) = 2 // (for A previously undefined), A will be empty instead of a 1x1 // object. - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_complex_matrix (); } type_conv_info numeric_demotion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); @@ -187,7 +187,7 @@ skip, flt_fmt); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-cs-list.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-cs-list.h Thu Apr 27 09:48:57 2017 -0700 @@ -58,8 +58,8 @@ ~octave_cs_list (void) = default; - octave_base_value *clone (void) const { return new octave_cs_list (*this); } - octave_base_value *empty_clone (void) const { return new octave_cs_list (); } + octave_base_value * clone (void) const { return new octave_cs_list (*this); } + octave_base_value * empty_clone (void) const { return new octave_cs_list (); } dim_vector dims (void) const { return dim_vector (1, lst.length ()); }
--- a/libinterp/octave-value/ov-cx-diag.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-cx-diag.h Thu Apr 27 09:48:57 2017 -0700 @@ -50,16 +50,16 @@ ~octave_complex_diag_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_complex_diag_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_complex_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; type_conv_info numeric_demotion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_complex; }
--- a/libinterp/octave-value/ov-cx-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-cx-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -81,14 +81,14 @@ ~octave_complex_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_complex_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_complex_matrix (); } type_conv_info numeric_demotion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_complex; } @@ -173,7 +173,7 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-cx-sparse.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-cx-sparse.h Thu Apr 27 09:48:57 2017 -0700 @@ -86,12 +86,12 @@ ~octave_sparse_complex_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_sparse_complex_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_sparse_complex_matrix (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_complex; } @@ -147,7 +147,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-fcn-handle.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.h Thu Apr 27 09:48:57 2017 -0700 @@ -74,9 +74,9 @@ ~octave_fcn_handle (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_fcn_handle (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_fcn_handle (); } octave_value subsref (const std::string& type, @@ -112,13 +112,13 @@ dim_vector dims (void) const; - octave_function *function_value (bool = false) + octave_function * function_value (bool = false) { return fcn.function_value (); } - octave_user_function *user_function_value (bool = false) + octave_user_function * user_function_value (bool = false) { return fcn.user_function_value (); } - octave_fcn_handle *fcn_handle_value (bool = false) { return this; } + octave_fcn_handle * fcn_handle_value (bool = false) { return this; } octave_value fcn_val (void) const { return fcn; } @@ -205,8 +205,8 @@ public: // Factory method. - static octave_fcn_handle *maybe_binder (const octave_value& f, - octave::tree_evaluator *tw); + static octave_fcn_handle * maybe_binder (const octave_value& f, + octave::tree_evaluator *tw); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args);
--- a/libinterp/octave-value/ov-fcn-inline.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-fcn-inline.h Thu Apr 27 09:48:57 2017 -0700 @@ -54,14 +54,14 @@ ~octave_fcn_inline (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_fcn_inline (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_fcn_inline (); } bool is_inline_function (void) const { return true; } - octave_fcn_inline *fcn_inline_value (bool = false) { return this; } + octave_fcn_inline * fcn_inline_value (bool = false) { return this; } std::string fcn_text (void) const { return iftext; }
--- a/libinterp/octave-value/ov-fcn.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-fcn.h Thu Apr 27 09:48:57 2017 -0700 @@ -61,8 +61,8 @@ ~octave_function (void) = default; - octave_base_value *clone (void) const; - octave_base_value *empty_clone (void) const; + octave_base_value * clone (void) const; + octave_base_value * empty_clone (void) const; bool is_defined (void) const { return true; }
--- a/libinterp/octave-value/ov-float.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-float.h Thu Apr 27 09:48:57 2017 -0700 @@ -64,13 +64,13 @@ ~octave_float_scalar (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_float_scalar (*this); } // We return an octave_matrix here instead of an octave_float_scalar so // that in expressions like A(2,2,2) = 2 (for A previously // undefined), A will be empty instead of a 1x1 object. - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_float_matrix (); } octave_value do_index_op (const octave_value_list& idx, @@ -258,7 +258,7 @@ skip, flt_fmt); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-flt-complex.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-flt-complex.h Thu Apr 27 09:48:57 2017 -0700 @@ -62,17 +62,17 @@ ~octave_float_complex (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_float_complex (*this); } // We return an octave_float_complex_matrix object here instead of an // octave_float_complex object so that in expressions like A(2,2,2) = 2 // (for A previously undefined), A will be empty instead of a 1x1 // object. - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_float_complex_matrix (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); @@ -183,7 +183,7 @@ skip, flt_fmt); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-flt-cx-diag.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-flt-cx-diag.h Thu Apr 27 09:48:57 2017 -0700 @@ -50,14 +50,14 @@ ~octave_float_complex_diag_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_float_complex_diag_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_float_complex_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_float_complex; }
--- a/libinterp/octave-value/ov-flt-cx-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-flt-cx-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -81,12 +81,12 @@ ~octave_float_complex_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_float_complex_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_float_complex_matrix (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_float_complex; } @@ -169,7 +169,7 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-flt-re-diag.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-flt-re-diag.h Thu Apr 27 09:48:57 2017 -0700 @@ -50,14 +50,14 @@ ~octave_float_diag_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_float_diag_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_float_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_float; }
--- a/libinterp/octave-value/ov-flt-re-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-flt-re-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -81,12 +81,12 @@ ~octave_float_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_float_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_float_matrix (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); idx_vector index_vector (bool /* require_integers */ = false) const { @@ -213,9 +213,9 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return matrix.mex_get_data (); } + void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-intx.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-intx.h Thu Apr 27 09:48:57 2017 -0700 @@ -66,10 +66,10 @@ ~OCTAVE_VALUE_INT_MATRIX_T (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new OCTAVE_VALUE_INT_MATRIX_T (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new OCTAVE_VALUE_INT_MATRIX_T (); } bool OCTAVE_TYPE_PREDICATE_FUNCTION (void) const { return true; } @@ -311,9 +311,9 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return matrix.mex_get_data (); } + void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray *as_mxArray (void) const + mxArray * as_mxArray (void) const { mxArray *retval = new mxArray (OCTAVE_INT_MX_CLASS, dims (), mxREAL); @@ -389,10 +389,10 @@ ~OCTAVE_VALUE_INT_SCALAR_T (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new OCTAVE_VALUE_INT_SCALAR_T (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new OCTAVE_VALUE_INT_MATRIX_T (); } octave_value do_index_op (const octave_value_list& idx, @@ -621,9 +621,9 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return scalar.mex_get_data (); } + void * mex_get_data (void) const { return scalar.mex_get_data (); } - mxArray *as_mxArray (void) const + mxArray * as_mxArray (void) const { mxArray *retval = new mxArray (OCTAVE_INT_MX_CLASS, 1, 1, mxREAL);
--- a/libinterp/octave-value/ov-java.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-java.cc Thu Apr 27 09:48:57 2017 -0700 @@ -202,7 +202,7 @@ clean (); } - JavaVMInitArgs *to_args () + JavaVMInitArgs * to_args () { update (); return &vm_args;
--- a/libinterp/octave-value/ov-java.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-java.h Thu Apr 27 09:48:57 2017 -0700 @@ -46,8 +46,8 @@ ~octave_java (void) { release (); } - void *to_java (void) const { return java_object; } - void *to_class (void) const { return java_class; } + void * to_java (void) const { return java_object; } + void * to_class (void) const { return java_class; } std::string java_class_name (void) const { return java_classname; }
--- a/libinterp/octave-value/ov-lazy-idx.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-lazy-idx.h Thu Apr 27 09:48:57 2017 -0700 @@ -47,13 +47,13 @@ ~octave_lazy_index (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_lazy_index (*this); } - octave_base_value *empty_clone (void) const { return new octave_matrix (); } + octave_base_value * empty_clone (void) const { return new octave_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); octave_value fast_elem_extract (octave_idx_type n) const; @@ -210,12 +210,12 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const + void * mex_get_data (void) const { return make_value ().mex_get_data (); } - mxArray *as_mxArray (void) const + mxArray * as_mxArray (void) const { return make_value ().as_mxArray (); }
--- a/libinterp/octave-value/ov-mex-fcn.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-mex-fcn.h Thu Apr 27 09:48:57 2017 -0700 @@ -69,9 +69,9 @@ const std::list<octave_value_list>& idx, int nargout); - octave_function *function_value (bool = false) { return this; } + octave_function * function_value (bool = false) { return this; } - const octave_function *function_value (bool = false) const { return this; } + const octave_function * function_value (bool = false) const { return this; } void mark_fcn_file_up_to_date (const octave::sys::time& t) { t_checked = t; }
--- a/libinterp/octave-value/ov-oncleanup.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-oncleanup.h Thu Apr 27 09:48:57 2017 -0700 @@ -39,7 +39,7 @@ octave_oncleanup (const octave_value& fcn); - octave_base_value *clone (void) const + octave_base_value * clone (void) const { if (fcn.is_defined ()) error ("onCleanup: internal error: cloning nonempty object"); @@ -47,7 +47,7 @@ return empty_clone (); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_oncleanup (); }
--- a/libinterp/octave-value/ov-perm.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-perm.h Thu Apr 27 09:48:57 2017 -0700 @@ -41,14 +41,14 @@ octave_perm_matrix (const PermMatrix& p) : matrix (p), dense_cache () { } - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_perm_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_perm_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); size_t byte_size (void) const { return matrix.byte_size (); } @@ -222,7 +222,7 @@ oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const; - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; bool print_as_scalar (void) const;
--- a/libinterp/octave-value/ov-range.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-range.h Thu Apr 27 09:48:57 2017 -0700 @@ -82,16 +82,16 @@ ~octave_range (void) { clear_cached_info (); } - octave_base_value *clone (void) const { return new octave_range (*this); } + octave_base_value * clone (void) const { return new octave_range (*this); } // A range is really just a special kind of real matrix object. In // the places where we need to call empty_clone, it makes more sense // to create an empty matrix (0x0) instead of an empty range (1x0). - octave_base_value *empty_clone (void) const { return new octave_matrix (); } + octave_base_value * empty_clone (void) const { return new octave_matrix (); } type_conv_info numeric_conversion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); @@ -291,7 +291,7 @@ return os.write (matrix_value (), block_size, output_type, skip, flt_fmt); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const {
--- a/libinterp/octave-value/ov-re-diag.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-re-diag.h Thu Apr 27 09:48:57 2017 -0700 @@ -50,16 +50,16 @@ ~octave_diag_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_diag_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; type_conv_info numeric_demotion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false);
--- a/libinterp/octave-value/ov-re-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-re-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -96,12 +96,12 @@ ~octave_matrix (void) = default; - octave_base_value *clone (void) const { return new octave_matrix (*this); } - octave_base_value *empty_clone (void) const { return new octave_matrix (); } + octave_base_value * clone (void) const { return new octave_matrix (*this); } + octave_base_value * empty_clone (void) const { return new octave_matrix (); } type_conv_info numeric_demotion_function (void) const; - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); idx_vector index_vector (bool /* require_integers */ = false) const { return idx_cache ? *idx_cache : set_idx_cache (idx_vector (matrix)); } @@ -237,9 +237,9 @@ // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return matrix.mex_get_data (); } + void * mex_get_data (void) const { return matrix.mex_get_data (); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-re-sparse.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-re-sparse.h Thu Apr 27 09:48:57 2017 -0700 @@ -84,12 +84,12 @@ ~octave_sparse_matrix (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_sparse_matrix (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_sparse_matrix (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); idx_vector index_vector (bool require_integers = false) const; @@ -150,7 +150,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-scalar.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-scalar.h Thu Apr 27 09:48:57 2017 -0700 @@ -63,12 +63,12 @@ ~octave_scalar (void) = default; - octave_base_value *clone (void) const { return new octave_scalar (*this); } + octave_base_value * clone (void) const { return new octave_scalar (*this); } // We return an octave_matrix here instead of an octave_scalar so // that in expressions like A(2,2,2) = 2 (for A previously // undefined), A will be empty instead of a 1x1 object. - octave_base_value *empty_clone (void) const { return new octave_matrix (); } + octave_base_value * empty_clone (void) const { return new octave_matrix (); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); @@ -261,7 +261,7 @@ skip, flt_fmt); } - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value map (unary_mapper_t umap) const;
--- a/libinterp/octave-value/ov-str-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-str-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -84,9 +84,9 @@ ~octave_char_matrix_str (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_char_matrix_str (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_char_matrix_str (); } type_conv_info numeric_conversion_function (void) const; @@ -213,9 +213,9 @@ ~octave_char_matrix_sq_str (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_char_matrix_sq_str (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_char_matrix_sq_str (); } octave_value squeeze (void) const
--- a/libinterp/octave-value/ov-struct.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-struct.h Thu Apr 27 09:48:57 2017 -0700 @@ -58,10 +58,10 @@ ~octave_struct (void) = default; - octave_base_value *clone (void) const { return new octave_struct (*this); } - octave_base_value *empty_clone (void) const { return new octave_struct (); } + octave_base_value * clone (void) const { return new octave_struct (*this); } + octave_base_value * empty_clone (void) const { return new octave_struct (); } - octave_base_value *try_narrowing_conversion (void); + octave_base_value * try_narrowing_conversion (void); Cell dotref (const octave_value_list& idx, bool auto_add = false); @@ -144,7 +144,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; octave_value fast_elem_extract (octave_idx_type n) const; @@ -178,9 +178,9 @@ ~octave_scalar_struct (void) = default; - octave_base_value *clone (void) const + octave_base_value * clone (void) const { return new octave_scalar_struct (*this); } - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_scalar_struct (); } octave_value dotref (const octave_value_list& idx, bool auto_add = false); @@ -262,7 +262,7 @@ bool load_hdf5 (octave_hdf5_id loc_id, const char *name); - mxArray *as_mxArray (void) const; + mxArray * as_mxArray (void) const; bool fast_elem_insert_self (void *where, builtin_type_t btyp) const;
--- a/libinterp/octave-value/ov-usr-fcn.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov-usr-fcn.h Thu Apr 27 09:48:57 2017 -0700 @@ -79,7 +79,7 @@ virtual std::map<std::string, octave_value> subfunctions (void) const; - virtual octave::tree_statement_list *body (void) = 0; + virtual octave::tree_statement_list * body (void) = 0; }; // Scripts. @@ -106,11 +106,11 @@ ~octave_user_script (void); - octave_function *function_value (bool = false) { return this; } + octave_function * function_value (bool = false) { return this; } - octave_user_script *user_script_value (bool = false) { return this; } + octave_user_script * user_script_value (bool = false) { return this; } - octave_user_code *user_code_value (bool = false) { return this; } + octave_user_code * user_code_value (bool = false) { return this; } // Scripts and user functions are both considered "scripts" because // they are written in Octave's scripting language. @@ -147,7 +147,7 @@ octave_value_list do_multi_index_op (int nargout, const octave_value_list& args); - octave::tree_statement_list *body (void) { return cmd_list; } + octave::tree_statement_list * body (void) { return cmd_list; } void accept (octave::tree_walker& tw); @@ -198,15 +198,15 @@ ? 0 : static_cast<symbol_table::context_id>(call_depth); } - octave_function *function_value (bool = false) { return this; } + octave_function * function_value (bool = false) { return this; } - octave_user_function *user_function_value (bool = false) { return this; } + octave_user_function * user_function_value (bool = false) { return this; } - octave_user_code *user_code_value (bool = false) { return this; } + octave_user_code * user_code_value (bool = false) { return this; } - octave_user_function *define_param_list (octave::tree_parameter_list *t); + octave_user_function * define_param_list (octave::tree_parameter_list *t); - octave_user_function *define_ret_list (octave::tree_parameter_list *t); + octave_user_function * define_ret_list (octave::tree_parameter_list *t); void stash_fcn_file_name (const std::string& nm); @@ -382,19 +382,19 @@ do_multi_index_op (int nargout, const octave_value_list& args, const std::list<octave_lvalue>* lvalue_list); - octave::tree_parameter_list *parameter_list (void) { return param_list; } + octave::tree_parameter_list * parameter_list (void) { return param_list; } - octave::tree_parameter_list *return_list (void) { return ret_list; } + octave::tree_parameter_list * return_list (void) { return ret_list; } - octave::tree_statement_list *body (void) { return cmd_list; } + octave::tree_statement_list * body (void) { return cmd_list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } // If is_special_expr is true, retrieve the sigular expression that forms the // body. May be null (even if is_special_expr is true). - octave::tree_expression *special_expr (void); + octave::tree_expression * special_expr (void); bool subsasgn_optimization_ok (void); @@ -413,7 +413,7 @@ } #if defined (HAVE_LLVM) - jit_function_info *get_info (void) { return jit_info; } + jit_function_info * get_info (void) { return jit_info; } void stash_info (jit_function_info *info) { jit_info = info; } #endif
--- a/libinterp/octave-value/ov.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave-value/ov.h Thu Apr 27 09:48:57 2017 -0700 @@ -315,9 +315,9 @@ // This should only be called for derived types. - octave_base_value *clone (void) const; + octave_base_value * clone (void) const; - octave_base_value *empty_clone (void) const + octave_base_value * empty_clone (void) const { return rep->empty_clone (); } // Delete the representation of this constant if the count drops to zero. @@ -405,7 +405,7 @@ octave_value as_uint32 (void) const { return rep->as_uint32 (); } octave_value as_uint64 (void) const { return rep->as_uint64 (); } - octave_base_value *try_narrowing_conversion (void) + octave_base_value * try_narrowing_conversion (void) { return rep->try_narrowing_conversion (); } // Close to dims (), but can be overloaded for classes. @@ -950,17 +950,17 @@ bool is_instance_of (const std::string& cls_name) const { return rep->is_instance_of (cls_name); } - octave_function *function_value (bool silent = false) const; + octave_function * function_value (bool silent = false) const; - octave_user_function *user_function_value (bool silent = false) const; + octave_user_function * user_function_value (bool silent = false) const; - octave_user_script *user_script_value (bool silent = false) const; + octave_user_script * user_script_value (bool silent = false) const; - octave_user_code *user_code_value (bool silent = false) const; + octave_user_code * user_code_value (bool silent = false) const; - octave_fcn_handle *fcn_handle_value (bool silent = false) const; + octave_fcn_handle * fcn_handle_value (bool silent = false) const; - octave_fcn_inline *fcn_inline_value (bool silent = false) const; + octave_fcn_inline * fcn_inline_value (bool silent = false) const; octave_value_list list_value (void) const; @@ -1174,12 +1174,12 @@ Array<FloatComplex> xfloat_complex_vector_value (const char *fmt, ...) const; - octave_function *xfunction_value (const char *fmt, ...) const; - octave_user_function *xuser_function_value (const char *fmt, ...) const; - octave_user_script *xuser_script_value (const char *fmt, ...) const; - octave_user_code *xuser_code_value (const char *fmt, ...) const; - octave_fcn_handle *xfcn_handle_value (const char *fmt, ...) const; - octave_fcn_inline *xfcn_inline_value (const char *fmt, ...) const; + octave_function * xfunction_value (const char *fmt, ...) const; + octave_user_function * xuser_function_value (const char *fmt, ...) const; + octave_user_script * xuser_script_value (const char *fmt, ...) const; + octave_user_code * xuser_code_value (const char *fmt, ...) const; + octave_fcn_handle * xfcn_handle_value (const char *fmt, ...) const; + octave_fcn_inline * xfcn_inline_value (const char *fmt, ...) const; octave_value_list xlist_value (const char *fmt, ...) const; @@ -1300,17 +1300,17 @@ oct_data_conv::data_type output_type, int skip, octave::mach_info::float_format flt_fmt) const; - octave_base_value *internal_rep (void) const { return rep; } + octave_base_value * internal_rep (void) const { return rep; } // Unsafe. These functions exist to support the MEX interface. // You should not use them anywhere else. - void *mex_get_data (void) const { return rep->mex_get_data (); } + void * mex_get_data (void) const { return rep->mex_get_data (); } - octave_idx_type *mex_get_ir (void) const { return rep->mex_get_ir (); } + octave_idx_type * mex_get_ir (void) const { return rep->mex_get_ir (); } - octave_idx_type *mex_get_jc (void) const { return rep->mex_get_jc (); } + octave_idx_type * mex_get_jc (void) const { return rep->mex_get_jc (); } - mxArray *as_mxArray (void) const { return rep->as_mxArray (); } + mxArray * as_mxArray (void) const { return rep->as_mxArray (); } octave_value diag (octave_idx_type k = 0) const { return rep->diag (k); }
--- a/libinterp/octave.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/octave.h Thu Apr 27 09:48:57 2017 -0700 @@ -231,7 +231,7 @@ void interactive (bool arg); - static application *app (void) { return instance; } + static application * app (void) { return instance; } static std::string program_invocation_name (void) { @@ -253,7 +253,7 @@ return instance ? instance->gui_running () : false; } - static interpreter *the_interpreter (void) + static interpreter * the_interpreter (void) { return instance ? instance->m_interpreter : 0; }
--- a/libinterp/parse-tree/bp-table.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/bp-table.h Thu Apr 27 09:48:57 2017 -0700 @@ -200,6 +200,6 @@ extern std::string get_file_line (const std::string& fname, size_t line); -extern octave_user_code *get_user_code (const std::string& fname = ""); +extern octave_user_code * get_user_code (const std::string& fname = ""); #endif
--- a/libinterp/parse-tree/jit-ir.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/jit-ir.h Thu Apr 27 09:48:57 2017 -0700 @@ -110,7 +110,7 @@ const value_list& constants (void) const { return mconstants; } template <typename T> - T *create (void) + T * create (void) { T *ret = new T (); track_value (ret); @@ -121,7 +121,7 @@ #define JIT_CREATE(N) \ template <typename T, OCT_MAKE_DECL_LIST (typename, ARG, N)> \ - T *create (OCT_MAKE_LIST (DECL_ARG, N)) \ + T * create (OCT_MAKE_LIST (DECL_ARG, N)) \ { \ T *ret = new T (OCT_MAKE_ARG_LIST (arg, N)); \ track_value (ret); \ @@ -156,7 +156,7 @@ typedef std::list<jit_block *>::iterator iterator; typedef std::list<jit_block *>::const_iterator const_iterator; - jit_block *back (void) const { return mlist.back (); } + jit_block * back (void) const { return mlist.back (); } iterator begin (void) { return mlist.begin (); } @@ -168,7 +168,7 @@ iterator erase (iterator iter) { return mlist.erase (iter); } - jit_block *front (void) const { return mlist.front (); } + jit_block * front (void) const { return mlist.front (); } void insert_after (iterator iter, jit_block *ablock); @@ -212,14 +212,14 @@ // The block of the first use which is not a jit_error_check // So this is not necessarily first_use ()->parent (). - jit_block *first_use_block (void); + jit_block * first_use_block (void); // replace all uses with virtual void replace_with (jit_value *value); - jit_type *type (void) const { return ty; } + jit_type * type (void) const { return ty; } - llvm::Type *type_llvm (void) const + llvm::Type * type_llvm (void) const { return ty ? ty->to_llvm () : 0; } @@ -238,7 +238,7 @@ return ss.str (); } - jit_instruction *last_use (void) const { return mlast_use; } + jit_instruction * last_use (void) const { return mlast_use; } void stash_last_use (jit_instruction *alast_use) { @@ -259,7 +259,7 @@ return llvm_value; } - llvm::Value *to_llvm (void) const + llvm::Value * to_llvm (void) const { assert (llvm_value); return llvm_value; @@ -312,9 +312,9 @@ size_t index (void) const { return mindex; } - jit_instruction *user (void) const { return muser; } + jit_instruction * user (void) const { return muser; } - jit_block *user_parent (void) const; + jit_block * user_parent (void) const; std::list<jit_block *> user_parent_location (void) const; @@ -374,23 +374,23 @@ next_id (true); } - jit_value *argument (size_t i) const + jit_value * argument (size_t i) const { return marguments[i].value (); } - llvm::Value *argument_llvm (size_t i) const + llvm::Value * argument_llvm (size_t i) const { assert (argument (i)); return argument (i)->to_llvm (); } - jit_type *argument_type (size_t i) const + jit_type * argument_type (size_t i) const { return argument (i)->type (); } - llvm::Type *argument_type_llvm (size_t i) const + llvm::Type * argument_type_llvm (size_t i) const { assert (argument (i)); return argument_type (i)->to_llvm (); @@ -453,14 +453,14 @@ virtual std::ostream& short_print (std::ostream& os) const; - jit_block *parent (void) const { return mparent; } + jit_block * parent (void) const { return mparent; } std::list<jit_instruction *>::iterator location (void) const { return mlocation; } - llvm::BasicBlock *parent_llvm (void) const; + llvm::BasicBlock * parent_llvm (void) const; void stash_parent (jit_block *aparent, std::list<jit_instruction *>::iterator alocation) @@ -575,7 +575,7 @@ void replace_in_phi (jit_block *ablock, jit_block *with); // we have a new internal list, but we want to stay compatible with jit_value - jit_use *first_use (void) const { return jit_value::first_use (); } + jit_use * first_use (void) const { return jit_value::first_use (); } size_t use_count (void) const { return jit_value::use_count (); } @@ -585,34 +585,34 @@ void mark_alive (void) { malive = true; } // If we can merge with a successor, do so and return the now empty block - jit_block *maybe_merge (); + jit_block * maybe_merge (); // merge another block into this block, leaving the merge block empty void merge (jit_block& merge); const std::string& name (void) const { return mname; } - jit_instruction *prepend (jit_instruction *instr); + jit_instruction * prepend (jit_instruction *instr); - jit_instruction *prepend_after_phi (jit_instruction *instr); + jit_instruction * prepend_after_phi (jit_instruction *instr); template <typename T> - T *append (T *instr) + T * append (T *instr) { internal_append (instr); return instr; } - jit_instruction *insert_before (iterator loc, jit_instruction *instr); + jit_instruction * insert_before (iterator loc, jit_instruction *instr); - jit_instruction *insert_before (jit_instruction *loc, jit_instruction *instr) + jit_instruction * insert_before (jit_instruction *loc, jit_instruction *instr) { return insert_before (loc->location (), instr); } - jit_instruction *insert_after (iterator loc, jit_instruction *instr); + jit_instruction * insert_after (iterator loc, jit_instruction *instr); - jit_instruction *insert_after (jit_instruction *loc, jit_instruction *instr) + jit_instruction * insert_after (jit_instruction *loc, jit_instruction *instr) { return insert_after (loc->location (), instr); } @@ -625,12 +625,12 @@ return iter; } - jit_terminator *terminator (void) const; + jit_terminator * terminator (void) const; // is the jump from pred alive? bool branch_alive (jit_block *asucc) const; - jit_block *successor (size_t i) const; + jit_block * successor (size_t i) const; size_t successor_count (void) const; @@ -690,7 +690,7 @@ create_dom_tree (mvisit_count); } - jit_block *dom_successor (size_t idx) const + jit_block * dom_successor (size_t idx) const { return dom_succ[idx]; } @@ -705,11 +705,11 @@ virtual std::ostream& print (std::ostream& os, size_t indent = 0) const; - jit_block *maybe_split (jit_factory& factory, jit_block_list& blocks, - jit_block *asuccessor); + jit_block * maybe_split (jit_factory& factory, jit_block_list& blocks, + jit_block *asuccessor); - jit_block *maybe_split (jit_factory& factory, jit_block_list& blocks, - jit_block& asuccessor) + jit_block * maybe_split (jit_factory& factory, jit_block_list& blocks, + jit_block& asuccessor) { return maybe_split (factory, blocks, &asuccessor); } @@ -727,7 +727,7 @@ return os; } - llvm::BasicBlock *to_llvm (void) const; + llvm::BasicBlock * to_llvm (void) const; std::list<jit_block *>::iterator location (void) const { return mlocation; } @@ -751,9 +751,9 @@ return true; } - jit_instruction *front (void) { return instructions.front (); } + jit_instruction * front (void) { return instructions.front (); } - jit_instruction *back (void) { return instructions.back (); } + jit_instruction * back (void) { return instructions.back (); } JIT_VALUE_ACCEPT; private: @@ -765,7 +765,7 @@ void create_dom_tree (size_t avisit_count); - static jit_block *idom_intersect (jit_block *i, jit_block *j); + static jit_block * idom_intersect (jit_block *i, jit_block *j); size_t mvisit_count; size_t mid; @@ -799,9 +799,9 @@ return *this; } - jit_phi *user (void) const { return muser; } + jit_phi * user (void) const { return muser; } - jit_block *user_parent (void) const; + jit_block * user_parent (void) const; private: jit_phi *muser; }; @@ -822,7 +822,7 @@ return ! value_stack.empty (); } - jit_value *top (void) const + jit_value * top (void) const { return value_stack.top (); } @@ -838,7 +838,7 @@ value_stack.pop (); } - jit_instruction *last_use (void) const + jit_instruction * last_use (void) const { return mlast_use; } @@ -883,7 +883,7 @@ jit_assign_base (jit_variable *adest, jit_value *arg0, jit_value *arg1) : jit_instruction (arg0, arg1), mdest (adest) { } - jit_variable *dest (void) const { return mdest; } + jit_variable * dest (void) const { return mdest; } virtual void push_variable (void) { @@ -914,12 +914,12 @@ jit_assign (jit_variable *adest, jit_value *asrc) : jit_assign_base (adest, adest, asrc), martificial (false) { } - jit_value *overwrite (void) const + jit_value * overwrite (void) const { return argument (0); } - jit_value *src (void) const + jit_value * src (void) const { return argument (1); } @@ -978,12 +978,12 @@ mincomming[mincomming.size () - 1].stash_value (from); } - jit_block *incomming (size_t i) const + jit_block * incomming (size_t i) const { return mincomming[i].value (); } - llvm::BasicBlock *incomming_llvm (size_t i) const + llvm::BasicBlock * incomming_llvm (size_t i) const { return incomming (i)->to_llvm (); } @@ -1017,7 +1017,7 @@ return os; } - llvm::PHINode *to_llvm (void) const; + llvm::PHINode * to_llvm (void) const; JIT_VALUE_ACCEPT; private: @@ -1041,12 +1041,12 @@ #undef JIT_TERMINATOR_CONST - jit_block *successor (size_t idx = 0) const + jit_block * successor (size_t idx = 0) const { return static_cast<jit_block *> (argument (idx)); } - llvm::BasicBlock *successor_llvm (size_t idx = 0) const + llvm::BasicBlock * successor_llvm (size_t idx = 0) const { return successor (idx)->to_llvm (); } @@ -1077,7 +1077,7 @@ virtual bool infer (void); - llvm::TerminatorInst *to_llvm (void) const; + llvm::TerminatorInst * to_llvm (void) const; protected: virtual bool check_alive (size_t) const { return true; } private: @@ -1108,14 +1108,14 @@ jit_cond_branch (jit_value *c, jit_block *ctrue, jit_block *cfalse) : jit_terminator (2, ctrue, cfalse, c) { } - jit_value *cond (void) const { return argument (2); } + jit_value * cond (void) const { return argument (2); } std::ostream& print_cond (std::ostream& os) const { return cond ()->short_print (os); } - llvm::Value *cond_llvm (void) const + llvm::Value * cond_llvm (void) const { return cond ()->to_llvm (); } @@ -1242,7 +1242,7 @@ return argument_count () == 3; } - jit_call *check_for (void) const + jit_call * check_for (void) const { assert (has_check_for ()); return static_cast<jit_call *> (argument (2)); @@ -1350,17 +1350,17 @@ return jit_typeinfo::cast (jit_typeinfo::get_any (), result_type ()); } - jit_value *result (void) const + jit_value * result (void) const { return argument (0); } - jit_type *result_type (void) const + jit_type * result_type (void) const { return result ()->type (); } - llvm::Value *result_llvm (void) const + llvm::Value * result_llvm (void) const { return result ()->to_llvm (); } @@ -1393,12 +1393,12 @@ jit_return (jit_value *retval) : jit_instruction (retval) { } - jit_value *result (void) const + jit_value * result (void) const { return argument_count () ? argument (0) : 0; } - jit_type *result_type (void) const + jit_type * result_type (void) const { jit_value *res = result (); return res ? res->type () : 0;
--- a/libinterp/parse-tree/jit-typeinfo.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/jit-typeinfo.h Thu Apr 27 09:48:57 2017 -0700 @@ -146,13 +146,13 @@ int type_id (void) const { return mid; } // An abstract base type, may be null - jit_type *parent (void) const { return mparent; } + jit_type * parent (void) const { return mparent; } // convert to an llvm type - llvm::Type *to_llvm (void) const { return llvm_type; } + llvm::Type * to_llvm (void) const { return llvm_type; } // how this type gets passed as a function argument - llvm::Type *to_llvm_arg (void) const; + llvm::Type * to_llvm_arg (void) const; size_t depth (void) const { return mdepth; } @@ -191,7 +191,7 @@ { munpack[cc] = fn; } // The resulting type after pack is called. - llvm::Type *packed_type (jit_convention::type cc) + llvm::Type * packed_type (jit_convention::type cc) { return mpacked_type[cc]; } void set_packed_type (jit_convention::type cc, llvm::Type *ty) @@ -252,15 +252,15 @@ std::string name (void) const; - llvm::BasicBlock *new_block (const std::string& aname = "body", - llvm::BasicBlock *insert_before = 0); + llvm::BasicBlock * new_block (const std::string& aname = "body", + llvm::BasicBlock *insert_before = 0); - llvm::Value *call (llvm::IRBuilderD& builder, - const std::vector<jit_value *>& in_args) const; + llvm::Value * call (llvm::IRBuilderD& builder, + const std::vector<jit_value *>& in_args) const; - llvm::Value *call (llvm::IRBuilderD& builder, - const std::vector<llvm::Value *>& in_args - = std::vector<llvm::Value *> ()) const; + llvm::Value * call (llvm::IRBuilderD& builder, + const std::vector<llvm::Value *>& in_args + = std::vector<llvm::Value *> ()) const; #define JIT_PARAM_ARGS llvm::IRBuilderD& builder, #define JIT_PARAMS builder, @@ -284,12 +284,12 @@ #undef JIT_PARAMS #undef JIT_PARAM_ARGS - llvm::Value *argument (llvm::IRBuilderD& builder, size_t idx) const; + llvm::Value * argument (llvm::IRBuilderD& builder, size_t idx) const; void do_return (llvm::IRBuilderD& builder, llvm::Value *rval = 0, bool verify = true); - llvm::Function *to_llvm (void) const { return llvm_function; } + llvm::Function * to_llvm (void) const { return llvm_function; } // If true, then the return value is passed as a pointer in the first argument bool sret (void) const { return mresult && mresult->sret (call_conv); } @@ -298,9 +298,9 @@ void mark_can_error (void) { mcan_error = true; } - jit_type *result (void) const { return mresult; } + jit_type * result (void) const { return mresult; } - jit_type *argument_type (size_t idx) const + jit_type * argument_type (size_t idx) const { assert (idx < args.size ()); return args[idx]; @@ -341,7 +341,7 @@ const jit_function& overload (const signature_vec& types) const; - jit_type *result (const signature_vec& types) const + jit_type * result (const signature_vec& types) const { const jit_function& temp = overload (types); return temp.result (); @@ -364,7 +364,7 @@ void stash_name (const std::string& aname) { mname = aname; } protected: - virtual jit_function *generate (const signature_vec& types) const; + virtual jit_function * generate (const signature_vec& types) const; private: Array<octave_idx_type> to_idx (const signature_vec& types) const; @@ -398,17 +398,17 @@ do_initialize (); } protected: - virtual jit_function *generate (const signature_vec& types) const; + virtual jit_function * generate (const signature_vec& types) const; - virtual jit_function *generate_matrix (const signature_vec& types) const = 0; + virtual jit_function * generate_matrix (const signature_vec& types) const = 0; virtual void do_initialize (void) = 0; // helper functions // [start_idx, end_idx). - llvm::Value *create_arg_array (llvm::IRBuilderD& builder, - const jit_function& fn, size_t start_idx, - size_t end_idx) const; + llvm::Value * create_arg_array (llvm::IRBuilderD& builder, + const jit_function& fn, size_t start_idx, + size_t end_idx) const; llvm::Module *module; llvm::ExecutionEngine *engine; @@ -418,7 +418,7 @@ jit_paren_subsref : public jit_index_operation { protected: - virtual jit_function *generate_matrix (const signature_vec& types) const; + virtual jit_function * generate_matrix (const signature_vec& types) const; virtual void do_initialize (void); private: @@ -429,7 +429,7 @@ jit_paren_subsasgn : public jit_index_operation { protected: - jit_function *generate_matrix (const signature_vec& types) const; + jit_function * generate_matrix (const signature_vec& types) const; virtual void do_initialize (void); private: @@ -444,39 +444,39 @@ public: static void initialize (llvm::Module *m, llvm::ExecutionEngine *e); - static jit_type *join (jit_type *lhs, jit_type *rhs) + static jit_type * join (jit_type *lhs, jit_type *rhs) { return instance->do_join (lhs, rhs); } - static jit_type *get_any (void) { return instance->any; } + static jit_type * get_any (void) { return instance->any; } - static jit_type *get_matrix (void) { return instance->matrix; } + static jit_type * get_matrix (void) { return instance->matrix; } - static jit_type *get_scalar (void) { return instance->scalar; } + static jit_type * get_scalar (void) { return instance->scalar; } - static llvm::Type *get_scalar_llvm (void) + static llvm::Type * get_scalar_llvm (void) { return instance->scalar->to_llvm (); } - static jit_type *get_scalar_ptr (void) { return instance->scalar_ptr; } + static jit_type * get_scalar_ptr (void) { return instance->scalar_ptr; } - static jit_type *get_any_ptr (void) { return instance->any_ptr; } + static jit_type * get_any_ptr (void) { return instance->any_ptr; } - static jit_type *get_range (void) { return instance->range; } + static jit_type * get_range (void) { return instance->range; } - static jit_type *get_string (void) { return instance->string; } + static jit_type * get_string (void) { return instance->string; } - static jit_type *get_bool (void) { return instance->boolean; } + static jit_type * get_bool (void) { return instance->boolean; } - static jit_type *get_index (void) { return instance->index; } + static jit_type * get_index (void) { return instance->index; } - static llvm::Type *get_index_llvm (void) + static llvm::Type * get_index_llvm (void) { return instance->index->to_llvm (); } - static jit_type *get_complex (void) { return instance->complex; } + static jit_type * get_complex (void) { return instance->complex; } // Get the jit_type of an octave_value - static jit_type *type_of (const octave_value& ov) + static jit_type * type_of (const octave_value& ov) { return instance->do_type_of (ov); } @@ -563,12 +563,12 @@ return instance->do_cast (to, from); } - static llvm::Value *insert_error_check (llvm::IRBuilderD& bld) + static llvm::Value * insert_error_check (llvm::IRBuilderD& bld) { return instance->do_insert_error_check (bld); } - static llvm::Value *insert_interrupt_check (llvm::IRBuilderD& bld) + static llvm::Value * insert_interrupt_check (llvm::IRBuilderD& bld) { return instance->do_insert_interrupt_check (bld); } @@ -589,7 +589,7 @@ return instance->create_undef_fn; } - static llvm::Value *create_complex (llvm::Value *real, llvm::Value *imag) + static llvm::Value * create_complex (llvm::Value *real, llvm::Value *imag) { return instance->complex_new (real, imag); } @@ -597,7 +597,7 @@ jit_typeinfo (llvm::Module *m, llvm::ExecutionEngine *e); // FIXME: Do these methods really need to be in jit_typeinfo? - jit_type *do_join (jit_type *lhs, jit_type *rhs) + jit_type * do_join (jit_type *lhs, jit_type *rhs) { // empty case if (! lhs) @@ -628,13 +628,13 @@ return lhs; } - jit_type *do_difference (jit_type *lhs, jit_type *) + jit_type * do_difference (jit_type *lhs, jit_type *) { // FIXME: Maybe we can do something smarter? return lhs; } - jit_type *do_type_of (const octave_value& ov) const; + jit_type * do_type_of (const octave_value& ov) const; const jit_operation& do_binary_op (int op) const { @@ -668,8 +668,8 @@ const jit_function& do_end (jit_value *value, jit_value *index, jit_value *count); - jit_type *new_type (const std::string& name, jit_type *parent, - llvm::Type *llvm_type, bool skip_paren = false); + jit_type * new_type (const std::string& name, jit_type *parent, + llvm::Type *llvm_type, bool skip_paren = false); void add_print (jit_type *ty, void *fptr); @@ -739,9 +739,9 @@ jit_function create_identity (jit_type *type); - llvm::Value *do_insert_error_check (llvm::IRBuilderD& bld); + llvm::Value * do_insert_error_check (llvm::IRBuilderD& bld); - llvm::Value *do_insert_interrupt_check (llvm::IRBuilderD& bld); + llvm::Value * do_insert_interrupt_check (llvm::IRBuilderD& bld); void add_builtin (const std::string& name); @@ -765,31 +765,31 @@ void register_generic (const std::string& name, jit_type *result, const std::vector<jit_type *>& args); - octave_builtin *find_builtin (const std::string& name); + octave_builtin * find_builtin (const std::string& name); jit_function mirror_binary (const jit_function& fn); - llvm::Function *wrap_complex (llvm::Function *wrap); + llvm::Function * wrap_complex (llvm::Function *wrap); - static llvm::Value *pack_complex (llvm::IRBuilderD& bld, - llvm::Value *cplx); + static llvm::Value * pack_complex (llvm::IRBuilderD& bld, + llvm::Value *cplx); - static llvm::Value *unpack_complex (llvm::IRBuilderD& bld, - llvm::Value *result); + static llvm::Value * unpack_complex (llvm::IRBuilderD& bld, + llvm::Value *result); - llvm::Value *complex_real (llvm::Value *cx); + llvm::Value * complex_real (llvm::Value *cx); - llvm::Value *complex_real (llvm::Value *cx, llvm::Value *real); + llvm::Value * complex_real (llvm::Value *cx, llvm::Value *real); - llvm::Value *complex_imag (llvm::Value *cx); + llvm::Value * complex_imag (llvm::Value *cx); - llvm::Value *complex_imag (llvm::Value *cx, llvm::Value *imag); + llvm::Value * complex_imag (llvm::Value *cx, llvm::Value *imag); - llvm::Value *complex_new (llvm::Value *real, llvm::Value *imag); + llvm::Value * complex_new (llvm::Value *real, llvm::Value *imag); void create_int (size_t nbits); - jit_type *intN (size_t nbits) const; + jit_type * intN (size_t nbits) const; static jit_typeinfo *instance;
--- a/libinterp/parse-tree/jit-util.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/jit-util.h Thu Apr 27 09:48:57 2017 -0700 @@ -120,7 +120,7 @@ use_head->stash_value (0); } - NODE_T *first_use (void) const { return use_head; } + NODE_T * first_use (void) const { return use_head; } size_t use_count (void) const { return muse_count; } private: @@ -141,7 +141,7 @@ ~jit_internal_node (void) { remove (); } - LIST_T *value (void) const { return mvalue; } + LIST_T * value (void) const { return mvalue; } void stash_value (LIST_T *avalue) { @@ -166,9 +166,9 @@ } } - NODE_T *next (void) const { return mnext; } + NODE_T * next (void) const { return mnext; } - NODE_T *prev (void) const { return mprev; } + NODE_T * prev (void) const { return mprev; } private: void remove () {
--- a/libinterp/parse-tree/lex.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/lex.h Thu Apr 27 09:48:57 2017 -0700 @@ -218,33 +218,33 @@ } // Direct access. - token *at (size_t n) + token * at (size_t n) { return empty () ? 0 : buffer.at (n); } - const token *at (size_t n) const + const token * at (size_t n) const { return empty () ? 0 : buffer.at (n); } // Most recently pushed. - token *front (void) + token * front (void) { return empty () ? 0 : buffer.front (); } - const token *front (void) const + const token * front (void) const { return empty () ? 0 : buffer.front (); } - token *back (void) + token * back (void) { return empty () ? 0 : buffer.back (); } - const token *back (void) const + const token * back (void) const { return empty () ? 0 : buffer.back (); } @@ -525,7 +525,7 @@ // Caller is expected to delete the returned value. - octave_comment_list *get_comment (void) + octave_comment_list * get_comment (void) { octave_comment_list *retval = comment_list; @@ -579,7 +579,7 @@ int handle_end_of_input (void); - char *flex_yytext (void); + char * flex_yytext (void); int flex_yyleng (void); @@ -607,7 +607,7 @@ void finish_comment (octave_comment_elt::comment_type typ); - octave_comment_list *get_comment (void) { return comment_buf.get_comment (); } + octave_comment_list * get_comment (void) { return comment_buf.get_comment (); } int handle_close_bracket (int bracket_type); @@ -635,7 +635,7 @@ void push_token (token *); - token *current_token (void); + token * current_token (void); void display_token (int tok);
--- a/libinterp/parse-tree/parse.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/parse.h Thu Apr 27 09:48:57 2017 -0700 @@ -169,13 +169,13 @@ void maybe_warn_variable_switch_label (tree_expression *expr); // Finish building a range. - tree_expression *finish_colon_expression (tree_colon_expression *e); + tree_expression * finish_colon_expression (tree_colon_expression *e); // Build a constant. - tree_constant *make_constant (int op, token *tok_val); + tree_constant * make_constant (int op, token *tok_val); // Build a function handle. - tree_fcn_handle *make_fcn_handle (token *tok_val); + tree_fcn_handle * make_fcn_handle (token *tok_val); // Build an anonymous function handle. tree_anon_fcn_handle * @@ -231,13 +231,13 @@ octave_comment_list *lc); // Build a break command. - tree_command *make_break_command (token *break_tok); + tree_command * make_break_command (token *break_tok); // Build a continue command. - tree_command *make_continue_command (token *continue_tok); + tree_command * make_continue_command (token *continue_tok); // Build a return command. - tree_command *make_return_command (token *return_tok); + tree_command * make_return_command (token *return_tok); // Start an if command. tree_if_command_list * @@ -278,7 +278,7 @@ tree_statement *end_function); // Create a no-op statement for end_function. - tree_statement *make_end (const std::string& type, bool eof, int l, int c); + tree_statement * make_end (const std::string& type, bool eof, int l, int c); // Do most of the work for defining a function. octave_user_function * @@ -361,17 +361,17 @@ bool validate_array_list (tree_expression *e); // Validate matrix object used in "[lhs] = ..." assignments. - tree_argument_list *validate_matrix_for_assignment (tree_expression *e); + tree_argument_list * validate_matrix_for_assignment (tree_expression *e); // Finish building an array_list (common action for finish_matrix // and finish_cell). - tree_expression *finish_array_list (tree_array_list *a); + tree_expression * finish_array_list (tree_array_list *a); // Finish building a matrix list. - tree_expression *finish_matrix (tree_matrix *m); + tree_expression * finish_matrix (tree_matrix *m); // Finish building a cell list. - tree_expression *finish_cell (tree_cell *c); + tree_expression * finish_cell (tree_cell *c); // Maybe print a warning. Duh. void maybe_warn_missing_semi (tree_statement_list *); @@ -382,10 +382,10 @@ // Finish building a statement. template <typename T> - tree_statement *make_statement (T *arg); + tree_statement * make_statement (T *arg); // Create a statement list. - tree_statement_list *make_statement_list (tree_statement *stmt); + tree_statement_list * make_statement_list (tree_statement *stmt); // Append a statement to an existing statement list. tree_statement_list *
--- a/libinterp/parse-tree/pt-arg-list.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-arg-list.h Thu Apr 27 09:48:57 2017 -0700 @@ -72,7 +72,7 @@ bool has_magic_tilde (void) const { return list_includes_magic_tilde; } - tree_expression *remove_front (void) + tree_expression * remove_front (void) { iterator p = begin (); tree_expression *retval = *p; @@ -99,8 +99,8 @@ std::list<std::string> variable_names (void) const; - tree_argument_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_argument_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-array-list.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-array-list.h Thu Apr 27 09:48:57 2017 -0700 @@ -80,8 +80,8 @@ symbol_table::scope_id scope, symbol_table::context_id context); - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw); };
--- a/libinterp/parse-tree/pt-assign.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-assign.h Thu Apr 27 09:48:57 2017 -0700 @@ -72,12 +72,12 @@ std::string oper (void) const; - tree_expression *left_hand_side (void) { return lhs; } + tree_expression * left_hand_side (void) { return lhs; } - tree_expression *right_hand_side (void) { return rhs; } + tree_expression * right_hand_side (void) { return rhs; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -137,12 +137,12 @@ std::string oper (void) const; - tree_argument_list *left_hand_side (void) { return lhs; } + tree_argument_list * left_hand_side (void) { return lhs; } - tree_expression *right_hand_side (void) { return rhs; } + tree_expression * right_hand_side (void) { return rhs; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-binop.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-binop.h Thu Apr 27 09:48:57 2017 -0700 @@ -95,16 +95,16 @@ octave_value::binary_op op_type (void) const { return etype; } - tree_expression *lhs (void) { return op_lhs; } - tree_expression *rhs (void) { return op_rhs; } + tree_expression * lhs (void) { return op_lhs; } + tree_expression * rhs (void) { return op_rhs; } bool is_eligible_for_braindead_shortcircuit (void) const { return eligible_for_braindead_shortcircuit; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -171,8 +171,8 @@ type op_type (void) const { return etype; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-cell.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-cell.h Thu Apr 27 09:48:57 2017 -0700 @@ -60,8 +60,8 @@ bool rvalue_ok (void) const { return true; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-classdef.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-classdef.h Thu Apr 27 09:48:57 2017 -0700 @@ -60,9 +60,9 @@ delete expr; } - tree_identifier *ident (void) { return id; } + tree_identifier * ident (void) { return id; } - tree_expression *expression (void) { return expr; } + tree_expression * expression (void) { return expr; } bool negate (void) { return neg; } @@ -185,13 +185,13 @@ delete trail_comm; } - tree_classdef_attribute_list *attribute_list (void) { return attr_list; } + tree_classdef_attribute_list * attribute_list (void) { return attr_list; } - octave::base_list<T> *element_list (void) { return elt_list; } + octave::base_list<T> * element_list (void) { return elt_list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } void accept (tree_walker&) { } @@ -229,9 +229,9 @@ delete expr; } - tree_identifier *ident (void) { return id; } + tree_identifier * ident (void) { return id; } - tree_expression *expression (void) { return expr; } + tree_expression * expression (void) { return expr; } void accept (tree_walker& tw) { @@ -365,7 +365,7 @@ delete id; } - tree_identifier *ident (void) { return id; } + tree_identifier * ident (void) { return id; } void accept (tree_walker& tw) { @@ -450,9 +450,9 @@ delete expr; } - tree_identifier *ident (void) { return id; } + tree_identifier * ident (void) { return id; } - tree_expression *expression (void) { return expr; } + tree_expression * expression (void) { return expr; } void accept (tree_walker& tw) { @@ -655,24 +655,24 @@ delete trail_comm; } - tree_classdef_attribute_list *attribute_list (void) { return attr_list; } + tree_classdef_attribute_list * attribute_list (void) { return attr_list; } - tree_identifier *ident (void) { return id; } + tree_identifier * ident (void) { return id; } - tree_classdef_superclass_list *superclass_list (void) { return supclass_list; } + tree_classdef_superclass_list * superclass_list (void) { return supclass_list; } - tree_classdef_body *body (void) { return element_list; } + tree_classdef_body * body (void) { return element_list; } - octave_comment_list *leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } const std::string& package_name (void) const { return pack_name; } octave_function* make_meta_class (tree_evaluator *tw, bool is_at_folder = false); - tree_classdef *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_classdef * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-cmd.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-cmd.h Thu Apr 27 09:48:57 2017 -0700 @@ -52,8 +52,8 @@ virtual ~tree_command (void) = default; - virtual tree_command *dup (symbol_table::scope_id, - symbol_table::context_id context) const = 0; + virtual tree_command * dup (symbol_table::scope_id, + symbol_table::context_id context) const = 0; }; // No-op. @@ -74,8 +74,8 @@ ~tree_no_op_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -115,8 +115,8 @@ ~tree_function_def (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-colon.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-colon.h Thu Apr 27 09:48:57 2017 -0700 @@ -79,23 +79,23 @@ void preserve_base (void) { save_base = true; } - tree_colon_expression *append (tree_expression *t); + tree_colon_expression * append (tree_expression *t); bool rvalue_ok (void) const { return true; } void eval_error (const std::string& s) const; - tree_expression *base (void) { return op_base; } + tree_expression * base (void) { return op_base; } - tree_expression *limit (void) { return op_limit; } + tree_expression * limit (void) { return op_limit; } - tree_expression *increment (void) { return op_increment; } + tree_expression * increment (void) { return op_increment; } int line (void) const; int column (void) const; - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-const.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-const.h Thu Apr 27 09:48:57 2017 -0700 @@ -78,8 +78,8 @@ octave_value value (void) { return val; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-decl.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-decl.h Thu Apr 27 09:48:57 2017 -0700 @@ -74,14 +74,14 @@ return id ? id->lvalue (tw) : octave_lvalue (); } - tree_identifier *ident (void) { return id; } + tree_identifier * ident (void) { return id; } std::string name (void) { return id ? id->name () : ""; } - tree_expression *expression (void) { return expr; } + tree_expression * expression (void) { return expr; } - tree_decl_elt *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_decl_elt * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -121,8 +121,8 @@ } } - tree_decl_init_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_decl_init_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -151,7 +151,7 @@ ~tree_decl_command (void); - tree_decl_init_list *initializer_list (void) { return init_list; } + tree_decl_init_list * initializer_list (void) { return init_list; } std::string name (void) { return cmd_name; } @@ -184,8 +184,8 @@ ~tree_global_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -217,8 +217,8 @@ ~tree_persistent_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-except.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-except.h Thu Apr 27 09:48:57 2017 -0700 @@ -62,20 +62,20 @@ ~tree_try_catch_command (void); - tree_identifier *identifier (void) { return expr_id; } + tree_identifier * identifier (void) { return expr_id; } - tree_statement_list *body (void) { return try_code; } + tree_statement_list * body (void) { return try_code; } - tree_statement_list *cleanup (void) { return catch_code; } + tree_statement_list * cleanup (void) { return catch_code; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *middle_comment (void) { return mid_comm; } + octave_comment_list * middle_comment (void) { return mid_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -131,18 +131,18 @@ ~tree_unwind_protect_command (void); - tree_statement_list *body (void) { return unwind_protect_code; } + tree_statement_list * body (void) { return unwind_protect_code; } - tree_statement_list *cleanup (void) { return cleanup_code; } + tree_statement_list * cleanup (void) { return cleanup_code; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *middle_comment (void) { return mid_comm; } + octave_comment_list * middle_comment (void) { return mid_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-exp.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-exp.h Thu Apr 27 09:48:57 2017 -0700 @@ -58,8 +58,8 @@ virtual bool has_magic_end (void) const = 0; - virtual tree_expression *dup (symbol_table::scope_id, - symbol_table::context_id context) const = 0; + virtual tree_expression * dup (symbol_table::scope_id, + symbol_table::context_id context) const = 0; virtual bool is_constant (void) const { return false; } @@ -110,19 +110,19 @@ bool is_for_cmd_expr (void) const { return for_cmd_expr; } - tree_expression *mark_in_parens (void) + tree_expression * mark_in_parens (void) { num_parens++; return this; } - tree_expression *set_postfix_index (char type) + tree_expression * set_postfix_index (char type) { postfix_index_type = type; return this; } - tree_expression *set_print_flag (bool print) + tree_expression * set_print_flag (bool print) { print_flag = print; return this;
--- a/libinterp/parse-tree/pt-fcn-handle.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-fcn-handle.h Thu Apr 27 09:48:57 2017 -0700 @@ -73,8 +73,8 @@ bool rvalue_ok (void) const { return true; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -113,17 +113,17 @@ bool rvalue_ok (void) const { return true; } - tree_parameter_list *parameter_list (void) const + tree_parameter_list * parameter_list (void) const { return fcn ? fcn->parameter_list () : 0; } - tree_parameter_list *return_list (void) const + tree_parameter_list * return_list (void) const { return fcn ? fcn->return_list () : 0; } - tree_statement_list *body (void) const + tree_statement_list * body (void) const { return fcn ? fcn->body () : 0; } @@ -133,8 +133,8 @@ return fcn ? fcn->scope () : -1; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-funcall.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-funcall.h Thu Apr 27 09:48:57 2017 -0700 @@ -66,8 +66,8 @@ void print_raw (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); - tree_funcall *dup (symbol_table::scope_id, - symbol_table::context_id context) const; + tree_funcall * dup (symbol_table::scope_id, + symbol_table::context_id context) const; octave_value function (void) const { return fcn; }
--- a/libinterp/parse-tree/pt-id.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-id.h Thu Apr 27 09:48:57 2017 -0700 @@ -122,8 +122,8 @@ name ().c_str ()); } - tree_identifier *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_identifier * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -153,8 +153,8 @@ bool is_black_hole (void) { return true; } - tree_black_hole *dup (symbol_table::scope_id, - symbol_table::context_id) const + tree_black_hole * dup (symbol_table::scope_id, + symbol_table::context_id) const { return new tree_black_hole; }
--- a/libinterp/parse-tree/pt-idx.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-idx.h Thu Apr 27 09:48:57 2017 -0700 @@ -78,7 +78,7 @@ std::string name (void) const; - tree_expression *expression (void) { return expr; } + tree_expression * expression (void) { return expr; } std::list<tree_argument_list *> arg_lists (void) { return args; } @@ -94,8 +94,8 @@ octave_lvalue lvalue (tree_evaluator *tw); - tree_index_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_index_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-jit.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-jit.h Thu Apr 27 09:48:57 2017 -0700 @@ -51,7 +51,7 @@ #define DECL_ARG(n) const ARG ## n& arg ## n #define JIT_CREATE_CHECKED(N) \ template <OCT_MAKE_DECL_LIST (typename, ARG, N)> \ - jit_call *create_checked (OCT_MAKE_LIST (DECL_ARG, N)) \ + jit_call * create_checked (OCT_MAKE_LIST (DECL_ARG, N)) \ { \ jit_call *ret = factory.create<jit_call> (OCT_MAKE_ARG_LIST (arg, N)); \ return create_checked_impl (ret); \ @@ -198,20 +198,20 @@ void initialize (symbol_table::scope_id s); - jit_call *create_checked_impl (jit_call *ret); + jit_call * create_checked_impl (jit_call *ret); // get an existing vairable. If the variable does not exist, it will not be // created - jit_variable *find_variable (const std::string& vname) const; + jit_variable * find_variable (const std::string& vname) const; // get a variable, create it if it does not exist. The type will default to // the variable's current type in the symbol table. - jit_variable *get_variable (const std::string& vname); + jit_variable * get_variable (const std::string& vname); // create a variable of the given name and given type. Will also insert an // extract statement - jit_variable *create_variable (const std::string& vname, jit_type *type, - bool isarg = true); + jit_variable * create_variable (const std::string& vname, jit_type *type, + bool isarg = true); // The name of the next for loop iterator. If inc is false, then the // iterator counter will not be incremented. @@ -226,18 +226,18 @@ std::string next_name (const char *prefix, size_t& count, bool inc); - jit_instruction *resolve (tree_index_expression& exp, - jit_value *extra_arg = 0, bool lhs = false); + jit_instruction * resolve (tree_index_expression& exp, + jit_value *extra_arg = 0, bool lhs = false); - jit_value *do_assign (tree_expression *exp, jit_value *rhs, - bool artificial = false); + jit_value * do_assign (tree_expression *exp, jit_value *rhs, + bool artificial = false); - jit_value *do_assign (const std::string& lhs, jit_value *rhs, bool print, - bool artificial = false); + jit_value * do_assign (const std::string& lhs, jit_value *rhs, bool print, + bool artificial = false); - jit_value *visit (tree *tee) { return visit (*tee); } + jit_value * visit (tree *tee) { return visit (*tee); } - jit_value *visit (tree& tee); + jit_value * visit (tree& tee); typedef std::list<jit_block *> block_list; block_list breaks; @@ -251,9 +251,9 @@ jit_convert_llvm : public jit_ir_walker { public: - llvm::Function *convert_loop (llvm::Module *module, - const jit_block_list& blocks, - const std::list<jit_value *>& constants); + llvm::Function * convert_loop (llvm::Module *module, + const jit_block_list& blocks, + const std::list<jit_value *>& constants); jit_function convert_function (llvm::Module *module, const jit_block_list& blocks, @@ -366,9 +366,9 @@ static bool execute (octave_user_function& fcn, const octave_value_list& args, octave_value_list& retval); - llvm::ExecutionEngine *get_engine (void) const { return engine; } + llvm::ExecutionEngine * get_engine (void) const { return engine; } - llvm::Module *get_module (void) const { return module; } + llvm::Module * get_module (void) const { return module; } void optimize (llvm::Function *fn); private:
--- a/libinterp/parse-tree/pt-jump.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-jump.h Thu Apr 27 09:48:57 2017 -0700 @@ -48,8 +48,8 @@ ~tree_break_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -76,8 +76,8 @@ ~tree_continue_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -104,8 +104,8 @@ ~tree_return_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-loop.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-loop.h Thu Apr 27 09:48:57 2017 -0700 @@ -84,16 +84,16 @@ ~tree_while_command (void); - tree_expression *condition (void) { return expr; } + tree_expression * condition (void) { return expr; } - tree_statement_list *body (void) { return list; } + tree_statement_list * body (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -102,7 +102,7 @@ #if defined (HAVE_LLVM) // some functions use by tree_jit - jit_info *get_info (void) const + jit_info * get_info (void) const { return compiled; } @@ -164,8 +164,8 @@ ~tree_do_until_command (void) = default; - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -212,20 +212,20 @@ bool in_parallel (void) { return parallel; } - tree_expression *left_hand_side (void) { return lhs; } + tree_expression * left_hand_side (void) { return lhs; } - tree_expression *control_expr (void) { return expr; } + tree_expression * control_expr (void) { return expr; } - tree_expression *maxproc_expr (void) { return maxproc; } + tree_expression * maxproc_expr (void) { return maxproc; } - tree_statement_list *body (void) { return list; } + tree_statement_list * body (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -234,7 +234,7 @@ #if defined (HAVE_LLVM) // some functions use by tree_jit - jit_info *get_info (void) const + jit_info * get_info (void) const { return compiled; } @@ -299,18 +299,18 @@ ~tree_complex_for_command (void); - tree_argument_list *left_hand_side (void) { return lhs; } + tree_argument_list * left_hand_side (void) { return lhs; } - tree_expression *control_expr (void) { return expr; } + tree_expression * control_expr (void) { return expr; } - tree_statement_list *body (void) { return list; } + tree_statement_list * body (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-mat.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-mat.h Thu Apr 27 09:48:57 2017 -0700 @@ -66,8 +66,8 @@ bool rvalue_ok (void) const { return true; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-misc.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-misc.h Thu Apr 27 09:48:57 2017 -0700 @@ -84,8 +84,8 @@ std::list<std::string> variable_names (void) const; - tree_parameter_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_parameter_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -120,8 +120,8 @@ ~tree_return_list (void); - tree_return_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_return_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-select.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-select.h Thu Apr 27 09:48:57 2017 -0700 @@ -64,14 +64,14 @@ bool is_else_clause (void) { return ! expr; } - tree_expression *condition (void) { return expr; } + tree_expression * condition (void) { return expr; } - tree_statement_list *commands (void) { return list; } + tree_statement_list * commands (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - tree_if_clause *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_if_clause * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -114,8 +114,8 @@ } } - tree_if_command_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_if_command_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -142,14 +142,14 @@ ~tree_if_command (void); - tree_if_command_list *cmd_list (void) { return list; } + tree_if_command_list * cmd_list (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -196,14 +196,14 @@ bool is_default_case (void) { return ! label; } - tree_expression *case_label (void) { return label; } + tree_expression * case_label (void) { return label; } - tree_statement_list *commands (void) { return list; } + tree_statement_list * commands (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - tree_switch_case *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_switch_case * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -246,8 +246,8 @@ } } - tree_switch_case_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_switch_case_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -277,16 +277,16 @@ ~tree_switch_command (void); - tree_expression *switch_value (void) { return expr; } + tree_expression * switch_value (void) { return expr; } - tree_switch_case_list *case_list (void) { return list; } + tree_switch_case_list * case_list (void) { return list; } - octave_comment_list *leading_comment (void) { return lead_comm; } + octave_comment_list * leading_comment (void) { return lead_comm; } - octave_comment_list *trailing_comment (void) { return trail_comm; } + octave_comment_list * trailing_comment (void) { return trail_comm; } - tree_command *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_command * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-stmt.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-stmt.h Thu Apr 27 09:48:57 2017 -0700 @@ -87,11 +87,11 @@ void echo_code (void); - tree_command *command (void) { return cmd; } + tree_command * command (void) { return cmd; } - tree_expression *expression (void) { return expr; } + tree_expression * expression (void) { return expr; } - octave_comment_list *comment_text (void) { return comm; } + octave_comment_list * comment_text (void) { return comm; } bool is_null_statement (void) const { return ! (cmd || expr || comm); } @@ -107,8 +107,8 @@ void set_expression (tree_expression *e) { expr = e; } - tree_statement *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_statement * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -185,8 +185,8 @@ bp_table::intmap remove_all_breakpoints (const std::string& file); - tree_statement_list *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_statement_list * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/pt-unop.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/pt-unop.h Thu Apr 27 09:48:57 2017 -0700 @@ -66,7 +66,7 @@ bool has_magic_end (void) const { return (op && op->has_magic_end ()); } - tree_expression *operand (void) { return op; } + tree_expression * operand (void) { return op; } std::string oper (void) const; @@ -105,8 +105,8 @@ bool rvalue_ok (void) const { return true; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) { @@ -140,8 +140,8 @@ bool rvalue_ok (void) const { return true; } - tree_expression *dup (symbol_table::scope_id scope, - symbol_table::context_id context) const; + tree_expression * dup (symbol_table::scope_id scope, + symbol_table::context_id context) const; void accept (tree_walker& tw) {
--- a/libinterp/parse-tree/token.h Thu Apr 27 12:31:17 2017 -0400 +++ b/libinterp/parse-tree/token.h Thu Apr 27 09:48:57 2017 -0700 @@ -111,7 +111,7 @@ double number (void) const; token_type ttype (void) const; end_tok_type ettype (void) const; - symbol_table::symbol_record *sym_rec (void) const; + symbol_table::symbol_record * sym_rec (void) const; std::string superclass_method_name (void) const; std::string superclass_class_name (void) const;
--- a/liboctave/array/Array.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/array/Array.cc Thu Apr 27 09:48:57 2017 -0700 @@ -400,7 +400,7 @@ // Recursive N-D generalized transpose template <typename T> - T *do_permute (const T *src, T *dest, int lev) const + T * do_permute (const T *src, T *dest, int lev) const { if (lev == 0) { @@ -566,7 +566,7 @@ // Recursive N-D indexing template <typename T> - T *do_index (const T *src, T *dest, int lev) const + T * do_index (const T *src, T *dest, int lev) const { if (lev == 0) dest += idx[0].index (src, dim[0], dest); @@ -583,7 +583,7 @@ // Recursive N-D indexed assignment template <typename T> - const T *do_assign (const T *src, T *dest, int lev) const + const T * do_assign (const T *src, T *dest, int lev) const { if (lev == 0) src += idx[0].assign (src, dim[0], dest);
--- a/liboctave/array/Array.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/array/Array.h Thu Apr 27 09:48:57 2017 -0700 @@ -585,11 +585,11 @@ Array<T> transpose (void) const; Array<T> hermitian (T (*fcn) (const T&) = 0) const; - const T *data (void) const { return slice_data; } + const T * data (void) const { return slice_data; } - const T *fortran_vec (void) const { return data (); } + const T * fortran_vec (void) const { return data (); } - T *fortran_vec (void); + T * fortran_vec (void); bool is_shared (void) { return rep->count > 1; } @@ -709,7 +709,7 @@ //! Give a pointer to the data in mex format. Unsafe. This function //! exists to support the MEX interface. You should not use it //! anywhere else. - void *mex_get_data (void) const { return const_cast<T *> (data ()); } + void * mex_get_data (void) const { return const_cast<T *> (data ()); } Array<T> sort (int dim = 0, sortmode mode = ASCENDING) const; Array<T> sort (Array<octave_idx_type> &sidx, int dim = 0, @@ -847,13 +847,13 @@ //@{ //! WARNING: Only call these functions from jit - int *jit_ref_count (void) { return rep->count.get (); } + int * jit_ref_count (void) { return rep->count.get (); } - T *jit_slice_data (void) const { return slice_data; } + T * jit_slice_data (void) const { return slice_data; } - octave_idx_type *jit_dimensions (void) const { return dimensions.to_jit (); } + octave_idx_type * jit_dimensions (void) const { return dimensions.to_jit (); } - void *jit_array_rep (void) const { return rep; } + void * jit_array_rep (void) const { return rep; } //@} private:
--- a/liboctave/array/DiagArray2.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/array/DiagArray2.h Thu Apr 27 09:48:57 2017 -0700 @@ -173,11 +173,11 @@ Array<T> array_value (void) const; - const T *data (void) const { return Array<T>::data (); } + const T * data (void) const { return Array<T>::data (); } - const T *fortran_vec (void) const { return Array<T>::fortran_vec (); } + const T * fortran_vec (void) const { return Array<T>::fortran_vec (); } - T *fortran_vec (void) { return Array<T>::fortran_vec (); } + T * fortran_vec (void) { return Array<T>::fortran_vec (); } void print_info (std::ostream& os, const std::string& prefix) const { Array<T>::print_info (os, prefix); }
--- a/liboctave/array/Sparse.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/array/Sparse.h Thu Apr 27 09:48:57 2017 -0700 @@ -561,14 +561,14 @@ // Unsafe. These functions exist to support the MEX interface. // You should not use them anywhere else. - void *mex_get_data (void) const { return const_cast<T *> (data ()); } + void * mex_get_data (void) const { return const_cast<T *> (data ()); } - octave_idx_type *mex_get_ir (void) const + octave_idx_type * mex_get_ir (void) const { return const_cast<octave_idx_type *> (ridx ()); } - octave_idx_type *mex_get_jc (void) const + octave_idx_type * mex_get_jc (void) const { return const_cast<octave_idx_type *> (cidx ()); }
--- a/liboctave/array/dim-vector.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/array/dim-vector.h Thu Apr 27 09:48:57 2017 -0700 @@ -95,7 +95,7 @@ //! Construct a new rep with count = 1 and ndims given. - static octave_idx_type *newrep (int ndims) + static octave_idx_type * newrep (int ndims) { octave_idx_type *r = new octave_idx_type [ndims + 2]; @@ -107,7 +107,7 @@ //! Clone this->rep. - octave_idx_type *clonerep (void) + octave_idx_type * clonerep (void) { int nd = ndims (); @@ -120,7 +120,7 @@ //! Clone and resize this->rep to length n, filling by given value. - octave_idx_type *resizerep (int n, octave_idx_type fill_value) + octave_idx_type * resizerep (int n, octave_idx_type fill_value) { int nd = ndims (); @@ -248,7 +248,7 @@ void chop_all_singletons (void); // WARNING: Only call by jit - octave_idx_type *to_jit (void) const + octave_idx_type * to_jit (void) const { return rep; }
--- a/liboctave/array/idx-vector.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/array/idx-vector.h Thu Apr 27 09:48:57 2017 -0700 @@ -99,9 +99,9 @@ virtual idx_class_type idx_class (void) const { return class_invalid; } // Sorts, maybe uniqifies, and returns a clone object pointer. - virtual idx_base_rep *sort_uniq_clone (bool uniq = false) = 0; + virtual idx_base_rep * sort_uniq_clone (bool uniq = false) = 0; // Sorts, and returns a sorting permutation (aka Array::sort). - virtual idx_base_rep *sort_idx (Array<octave_idx_type>&) = 0; + virtual idx_base_rep * sort_idx (Array<octave_idx_type>&) = 0; // Checks whether the index is colon or a range equivalent to colon. virtual bool is_colon_equiv (octave_idx_type) const { return false; } @@ -144,10 +144,10 @@ idx_class_type idx_class (void) const { return class_colon; } - idx_base_rep *sort_uniq_clone (bool = false) + idx_base_rep * sort_uniq_clone (bool = false) { count++; return this; } - OCTAVE_NORETURN idx_base_rep *sort_idx (Array<octave_idx_type>&); + OCTAVE_NORETURN idx_base_rep * sort_idx (Array<octave_idx_type>&); bool is_colon_equiv (octave_idx_type) const { return true; } @@ -195,9 +195,9 @@ idx_class_type idx_class (void) const { return class_range; } - idx_base_rep *sort_uniq_clone (bool uniq = false); + idx_base_rep * sort_uniq_clone (bool uniq = false); - idx_base_rep *sort_idx (Array<octave_idx_type>&); + idx_base_rep * sort_idx (Array<octave_idx_type>&); bool is_colon_equiv (octave_idx_type n) const { return start == 0 && step == 1 && len == n; } @@ -253,10 +253,10 @@ idx_class_type idx_class (void) const { return class_scalar; } - idx_base_rep *sort_uniq_clone (bool = false) + idx_base_rep * sort_uniq_clone (bool = false) { count++; return this; } - idx_base_rep *sort_idx (Array<octave_idx_type>&); + idx_base_rep * sort_idx (Array<octave_idx_type>&); bool is_colon_equiv (octave_idx_type n) const { return n == 1 && data == 0; } @@ -326,13 +326,13 @@ idx_class_type idx_class (void) const { return class_vector; } - idx_base_rep *sort_uniq_clone (bool uniq = false); + idx_base_rep * sort_uniq_clone (bool uniq = false); - idx_base_rep *sort_idx (Array<octave_idx_type>&); + idx_base_rep * sort_idx (Array<octave_idx_type>&); dim_vector orig_dimensions (void) const { return orig_dims; } - const octave_idx_type *get_data (void) const { return data; } + const octave_idx_type * get_data (void) const { return data; } std::ostream& print (std::ostream& os) const; @@ -395,17 +395,17 @@ idx_class_type idx_class (void) const { return class_mask; } - idx_base_rep *sort_uniq_clone (bool = false) + idx_base_rep * sort_uniq_clone (bool = false) { count++; return this; } - idx_base_rep *sort_idx (Array<octave_idx_type>&); + idx_base_rep * sort_idx (Array<octave_idx_type>&); dim_vector orig_dimensions (void) const { return orig_dims; } bool is_colon_equiv (octave_idx_type n) const { return len == n && ext == n; } - const bool *get_data (void) const { return data; } + const bool * get_data (void) const { return data; } std::ostream& print (std::ostream& os) const; @@ -1025,7 +1025,7 @@ // Raw pointer to index array. This is non-const because it may be // necessary to mutate the index. - const octave_idx_type *raw (void); + const octave_idx_type * raw (void); bool is_vector (void) const;
--- a/liboctave/numeric/sparse-chol.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/numeric/sparse-chol.cc Thu Apr 27 09:48:57 2017 -0700 @@ -86,7 +86,7 @@ } #if defined (HAVE_CHOLMOD) - cholmod_sparse *L (void) const + cholmod_sparse * L (void) const { return Lsparse; }
--- a/liboctave/util/cmd-edit.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/cmd-edit.cc Thu Apr 27 09:48:57 2017 -0700 @@ -51,7 +51,7 @@ namespace octave { - char *do_completer_word_break_hook (); + char * do_completer_word_break_hook (); command_editor *command_editor::instance = 0; @@ -88,11 +88,11 @@ void do_set_input_stream (FILE *f); - FILE *do_get_input_stream (void); + FILE * do_get_input_stream (void); void do_set_output_stream (FILE *f); - FILE *do_get_output_stream (void); + FILE * do_get_output_stream (void); void do_redisplay (void); @@ -221,18 +221,18 @@ static std::string completer_quote_characters; - static char *command_generator (const char *text, int state); + static char * command_generator (const char *text, int state); - static char *command_quoter (char *text, int match_type, char *quote_pointer); - static char *command_dequoter (char *text, int match_type); + static char * command_quoter (char *text, int match_type, char *quote_pointer); + static char * command_dequoter (char *text, int match_type); static int command_char_is_quoted (char *text, int index); static int command_accept_line (int count, int key); - static char **command_completer (const char *text, int start, int end); + static char ** command_completer (const char *text, int start, int end); - static char *do_completer_word_break_hook (); + static char * do_completer_word_break_hook (); }; std::string gnu_readline::completer_quote_characters = ""; @@ -935,11 +935,11 @@ void do_set_input_stream (FILE *f); - FILE *do_get_input_stream (void); + FILE * do_get_input_stream (void); void do_set_output_stream (FILE *f); - FILE *do_get_output_stream (void); + FILE * do_get_output_stream (void); string_vector do_generate_filename_completions (const std::string& text);
--- a/liboctave/util/cmd-edit.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/cmd-edit.h Thu Apr 27 09:48:57 2017 -0700 @@ -79,11 +79,11 @@ static void set_input_stream (FILE *f); - static FILE *get_input_stream (void); + static FILE * get_input_stream (void); static void set_output_stream (FILE *f); - static FILE *get_output_stream (void); + static FILE * get_output_stream (void); static void redisplay (void); @@ -239,11 +239,11 @@ virtual void do_set_input_stream (FILE *) = 0; - virtual FILE *do_get_input_stream (void) = 0; + virtual FILE * do_get_input_stream (void) = 0; virtual void do_set_output_stream (FILE *) = 0; - virtual FILE *do_get_output_stream (void) = 0; + virtual FILE * do_get_output_stream (void) = 0; virtual void do_redisplay (void) { }
--- a/liboctave/util/lo-array-errwarn.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/lo-array-errwarn.cc Thu Apr 27 09:48:57 2017 -0700 @@ -183,7 +183,7 @@ } // ID of error to throw - const char *err_id (void) const + const char * err_id (void) const { return error_id_invalid_index; } @@ -253,7 +253,7 @@ } // ID of error to throw. - const char *err_id (void) const + const char * err_id (void) const { return error_id_index_out_of_bounds; }
--- a/liboctave/util/lo-array-errwarn.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/lo-array-errwarn.h Thu Apr 27 09:48:57 2017 -0700 @@ -57,7 +57,7 @@ virtual std::string details (void) const = 0; // ID of error to throw. - virtual const char *err_id (void) const = 0; + virtual const char * err_id (void) const = 0; virtual std::string message (void) const;
--- a/liboctave/util/lo-array-gripes.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/lo-array-gripes.cc Thu Apr 27 09:48:57 2017 -0700 @@ -127,7 +127,7 @@ } // ID of error to throw - const char *err_id (void) const + const char * err_id (void) const { return error_id_invalid_index; } @@ -220,7 +220,7 @@ } // ID of error to throw. - const char *err_id (void) const + const char * err_id (void) const { return error_id_index_out_of_bounds; }
--- a/liboctave/util/lo-utils.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/lo-utils.h Thu Apr 27 09:48:57 2017 -0700 @@ -74,7 +74,7 @@ extern OCTAVE_API bool xis_zero (float x); extern OCTAVE_API bool xtoo_large_for_float (float x); -extern OCTAVE_API char *strsave (const char *); +extern OCTAVE_API char * strsave (const char *); extern OCTAVE_API void octave_putenv (const std::string&, const std::string&);
--- a/liboctave/util/oct-inttypes.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-inttypes.h Thu Apr 27 09:48:57 2017 -0700 @@ -951,14 +951,14 @@ static int byte_size (void) { return sizeof (T); } - static const char *type_name (); + static const char * type_name (); // The following are provided for convenience. static const octave_int zero, one; // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. - void *mex_get_data (void) const { return const_cast<T *> (&ival); } + void * mex_get_data (void) const { return const_cast<T *> (&ival); } private:
--- a/liboctave/util/oct-locbuf.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-locbuf.h Thu Apr 27 09:48:57 2017 -0700 @@ -87,7 +87,7 @@ OCTAVE_API virtual ~chunk_buffer (void); - char *data (void) const { return dat; } + char * data (void) const { return dat; } static OCTAVE_API void clear (void);
--- a/liboctave/util/oct-refcount.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-refcount.h Thu Apr 27 09:48:57 2017 -0700 @@ -106,7 +106,7 @@ return static_cast<count_type const volatile&> (count); } - count_type *get (void) + count_type * get (void) { return &count; }
--- a/liboctave/util/oct-rl-edit.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-rl-edit.h Thu Apr 27 09:48:57 2017 -0700 @@ -80,7 +80,7 @@ extern void octave_rl_restore_terminal_state (void); -extern char *octave_rl_copy_line (void); +extern char * octave_rl_copy_line (void); extern void octave_rl_replace_line (const char *s, int clear_undo); @@ -90,7 +90,7 @@ extern int octave_rl_newline (int, int); -extern const char *octave_rl_line_buffer (void); +extern const char * octave_rl_line_buffer (void); extern int octave_rl_point (void); @@ -100,15 +100,15 @@ extern void octave_rl_set_name (const char *); -extern char *octave_rl_readline (const char *); +extern char * octave_rl_readline (const char *); extern void octave_rl_set_input_stream (FILE *); -extern FILE *octave_rl_get_input_stream (void); +extern FILE * octave_rl_get_input_stream (void); extern void octave_rl_set_output_stream (FILE *); -extern FILE *octave_rl_get_output_stream (void); +extern FILE * octave_rl_get_output_stream (void); extern void octave_rl_read_init_file (const char *); @@ -122,13 +122,13 @@ extern void octave_rl_done (int); -extern char *octave_rl_filename_completion_function (const char *, int); +extern char * octave_rl_filename_completion_function (const char *, int); extern void octave_rl_set_basic_word_break_characters (const char *); extern void octave_rl_set_completer_word_break_characters (const char *); -extern char *octave_rl_get_completer_word_break_characters (void); +extern char * octave_rl_get_completer_word_break_characters (void); extern void octave_rl_set_completion_word_break_hook (rl_completion_hook_fcn_ptr);
--- a/liboctave/util/oct-rl-hist.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-rl-hist.h Thu Apr 27 09:48:57 2017 -0700 @@ -71,11 +71,11 @@ extern void octave_clear_history (void); -extern char *octave_history_goto_mark (int n); +extern char * octave_history_goto_mark (int n); -extern char *octave_history_get (int n); +extern char * octave_history_get (int n); -extern char **octave_history_list (int, int); +extern char ** octave_history_list (int, int); extern void octave_replace_history_entry (int, const char *);
--- a/liboctave/util/oct-shlib.cc Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-shlib.cc Thu Apr 27 09:48:57 2017 -0700 @@ -42,9 +42,9 @@ # if defined (HAVE_DLFCN_H) # include <dlfcn.h> # else -extern void *dlopen (const char *, int); -extern const char *dlerror (void); -extern void *dlsym (void *, const char *); +extern void * dlopen (const char *, int); +extern const char * dlerror (void); +extern void * dlsym (void *, const char *); extern int dlclose (void *); # endif #elif defined (HAVE_SHL_LOAD_API) @@ -172,8 +172,8 @@ ~octave_dlopen_shlib (void); - void *search (const std::string& name, - dynamic_library::name_mangler mangler = 0); + void * search (const std::string& name, + dynamic_library::name_mangler mangler = 0); // FIXME: this is possibly redundant because failure to open a library will // normally throw an exception, avoiding the construction of an invalid @@ -263,8 +263,8 @@ ~octave_shl_load_shlib (void); - void *search (const std::string& name, - dynamic_library::name_mangler mangler = 0); + void * search (const std::string& name, + dynamic_library::name_mangler mangler = 0); bool is_open (void) const { return (library != 0); } @@ -331,8 +331,8 @@ ~octave_w32_shlib (void); - void *search (const std::string& name, - dynamic_library::name_mangler mangler = 0); + void * search (const std::string& name, + dynamic_library::name_mangler mangler = 0); bool is_open (void) const { return (handle != 0); } @@ -432,8 +432,8 @@ void open (const std::string& f); - void *search (const std::string& name, - dynamic_library::name_mangler mangler = 0); + void * search (const std::string& name, + dynamic_library::name_mangler mangler = 0); void close (dynamic_library::close_hook cl_hook = 0);
--- a/liboctave/util/oct-shlib.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/oct-shlib.h Thu Apr 27 09:48:57 2017 -0700 @@ -64,15 +64,15 @@ virtual bool is_open (void) const { return false; } - virtual void *search (const std::string&, name_mangler = 0) + virtual void * search (const std::string&, name_mangler = 0) { return 0; } bool is_out_of_date (void) const; // This method will be overridden conditionally. - static dynlib_rep *new_instance (const std::string& f); + static dynlib_rep * new_instance (const std::string& f); - static dynlib_rep *get_instance (const std::string& f, bool fake); + static dynlib_rep * get_instance (const std::string& f, bool fake); octave::sys::time time_loaded (void) const { return tm_loaded; } @@ -161,7 +161,7 @@ *this = dynamic_library (); } - void *search (const std::string& nm, name_mangler mangler = 0) const + void * search (const std::string& nm, name_mangler mangler = 0) const { void *f = rep->search (nm, mangler); if (f)
--- a/liboctave/util/str-vec.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/util/str-vec.h Thu Apr 27 09:48:57 2017 -0700 @@ -115,7 +115,7 @@ std::string join (const std::string& sep = "") const; - char **c_str_vec (void) const; + char ** c_str_vec (void) const; std::list<std::string> std_list (void) const;
--- a/liboctave/wrappers/canonicalize-file-name-wrapper.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/canonicalize-file-name-wrapper.h Thu Apr 27 09:48:57 2017 -0700 @@ -27,7 +27,7 @@ extern "C" { #endif -extern char *octave_canonicalize_file_name_wrapper (const char *name); +extern char * octave_canonicalize_file_name_wrapper (const char *name); #if defined __cplusplus }
--- a/liboctave/wrappers/dirent-wrappers.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/dirent-wrappers.h Thu Apr 27 09:48:57 2017 -0700 @@ -31,9 +31,9 @@ extern "C" { #endif -extern void *octave_opendir_wrapper (const char *dname); +extern void * octave_opendir_wrapper (const char *dname); -extern char *octave_readdir_wrapper (void *dir); +extern char * octave_readdir_wrapper (void *dir); extern void octave_rewinddir_wrapper (void *dir);
--- a/liboctave/wrappers/getopt-wrapper.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/getopt-wrapper.h Thu Apr 27 09:48:57 2017 -0700 @@ -45,7 +45,7 @@ const struct octave_getopt_options *longopts, int *longind); -extern char *octave_optarg_wrapper (void); +extern char * octave_optarg_wrapper (void); extern int octave_optind_wrapper (void);
--- a/liboctave/wrappers/glob-wrappers.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/glob-wrappers.h Thu Apr 27 09:48:57 2017 -0700 @@ -27,7 +27,7 @@ extern "C" { #endif -extern void *octave_create_glob_info_struct (void); +extern void * octave_create_glob_info_struct (void); // Does not call globfree. extern void octave_destroy_glob_info_struct (void *glob_info); @@ -39,7 +39,7 @@ extern int octave_glob_num_matches (void *glob_info); -extern char **octave_glob_match_list (void *glob_info); +extern char ** octave_glob_match_list (void *glob_info); extern void octave_globfree_wrapper (void *glob_info);
--- a/liboctave/wrappers/localcharset-wrapper.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/localcharset-wrapper.h Thu Apr 27 09:48:57 2017 -0700 @@ -27,7 +27,7 @@ extern "C" { #endif -extern const char *octave_locale_charset_wrapper (void); +extern const char * octave_locale_charset_wrapper (void); #if defined __cplusplus }
--- a/liboctave/wrappers/set-program-name-wrapper.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/set-program-name-wrapper.h Thu Apr 27 09:48:57 2017 -0700 @@ -27,7 +27,7 @@ extern "C" { #endif -extern const char *octave_set_program_name_wrapper (const char *pname); +extern const char * octave_set_program_name_wrapper (const char *pname); #if defined __cplusplus }
--- a/liboctave/wrappers/signal-wrappers.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/signal-wrappers.h Thu Apr 27 09:48:57 2017 -0700 @@ -37,7 +37,7 @@ extern int octave_kill_wrapper (pid_t pid, int signum); -extern char *octave_strsignal_wrapper (int signum); +extern char * octave_strsignal_wrapper (int signum); extern bool octave_have_kill (void); @@ -54,7 +54,7 @@ extern int octave_num_signals (void); -extern void *octave_block_child (void); +extern void * octave_block_child (void); extern void octave_unblock_child (void *context);
--- a/liboctave/wrappers/strdup-wrapper.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/strdup-wrapper.h Thu Apr 27 09:48:57 2017 -0700 @@ -27,7 +27,7 @@ extern "C" { #endif -extern char *octave_strdup_wrapper (const char *str); +extern char * octave_strdup_wrapper (const char *str); #if defined __cplusplus }
--- a/liboctave/wrappers/tmpfile-wrapper.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/tmpfile-wrapper.h Thu Apr 27 09:48:57 2017 -0700 @@ -36,7 +36,7 @@ // c++11 provides std::tmpfile but it appears to fail on 64-bit // Windows systems. -extern FILE *octave_tmpfile_wrapper (void); +extern FILE * octave_tmpfile_wrapper (void); #if defined __cplusplus }
--- a/liboctave/wrappers/unistd-wrappers.h Thu Apr 27 12:31:17 2017 -0400 +++ b/liboctave/wrappers/unistd-wrappers.h Thu Apr 27 09:48:57 2017 -0700 @@ -47,7 +47,7 @@ extern int octave_close_wrapper (int fd); -extern const char *octave_ctermid_wrapper (void); +extern const char * octave_ctermid_wrapper (void); extern int octave_dup2_wrapper (int fd1, int fd2); @@ -59,7 +59,7 @@ extern int octave_ftruncate_wrapper (int fd, off_t sz); -extern char *octave_getcwd_wrapper (char *nm, size_t len); +extern char * octave_getcwd_wrapper (char *nm, size_t len); extern gid_t octave_getegid_wrapper (void);
--- a/src/display-available.h Thu Apr 27 12:31:17 2017 -0400 +++ b/src/display-available.h Thu Apr 27 09:48:57 2017 -0700 @@ -28,7 +28,7 @@ extern "C" { #endif -extern const char *display_available (int *dpy_avail); +extern const char * display_available (int *dpy_avail); #if defined (__cplusplus) }