Mercurial > octave

comparison libinterp/corefcn/genprops.awk @ 31771:21f9b34eb893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.
author Rik <rik@octave.org>
date Tue, 24 Jan 2023 17:19:44 -0800
parents 597f3ee61a48
children 1daf8bfceac3
comparison
equal deleted inserted replaced
31770:1d1eff97670e 31771:21f9b34eb893
42 ## 42 ##
43 ## If QUALIFIERS is omitted, we generate the following functions directly 43 ## If QUALIFIERS is omitted, we generate the following functions directly
44 ## in the class declaration: 44 ## in the class declaration:
45 ## 45 ##
46 ## TYPE 46 ## TYPE
47 ## get_NAME (void) const 47 ## get_NAME () const
48 ## { 48 ## {
49 ## return NAME; 49 ## return NAME;
50 ## } 50 ## }
51 ## 51 ##
52 ## void 52 ## void
149 149
150 ## simple accessor 150 ## simple accessor
151 151
152 function emit_get_accessor (i, rtype, faccess) 152 function emit_get_accessor (i, rtype, faccess)
153 { 153 {
154 printf (" %s get_%s (void) const", rtype, name[i]); 154 printf (" %s get_%s () const", rtype, name[i]);
155 155
156 if (emit_get[i] == "definition" && deprecated[i]) 156 if (emit_get[i] == "definition" && deprecated[i])
157 printf ("\n {\n warning_with_id (\"Octave:deprecated-property\",\"'%s' is deprecated and will be removed from a future version of Octave\");\n return m_%s.%s ();\n }\n", name[i], name[i], faccess); 157 printf ("\n {\n warning_with_id (\"Octave:deprecated-property\",\"'%s' is deprecated and will be removed from a future version of Octave\");\n return m_%s.%s ();\n }\n", name[i], name[i], faccess);
158 else if (emit_get[i] == "definition") 158 else if (emit_get[i] == "definition")
159 printf (" { return m_%s.%s (); }\n", name[i], faccess); 159 printf (" { return m_%s.%s (); }\n", name[i], faccess);
163 163
164 ## bool_property 164 ## bool_property
165 165
166 function emit_get_bool (i) 166 function emit_get_bool (i)
167 { 167 {
168 printf (" bool is_%s (void) const", name[i]); 168 printf (" bool is_%s () const", name[i]);
169 169
170 if (emit_get[i] == "definition") 170 if (emit_get[i] == "definition")
171 printf (" { return m_%s.is_on (); }\n", name[i]); 171 printf (" { return m_%s.is_on (); }\n", name[i]);
172 else 172 else
173 printf (";\n"); 173 printf (";\n");
191 191
192 ## color_property 192 ## color_property
193 193
194 function emit_get_color (i) 194 function emit_get_color (i)
195 { 195 {
196 printf (" bool %s_is_rgb (void) const { return m_%s.is_rgb (); }\n", name[i], name[i]); 196 printf (" bool %s_is_rgb () const { return m_%s.is_rgb (); }\n", name[i], name[i]);
197 197
198 printf (" bool %s_is (const std::string& v) const", name[i]); 198 printf (" bool %s_is (const std::string& v) const", name[i]);
199 199
200 if (emit_get[i] == "definition") 200 if (emit_get[i] == "definition")
201 printf (" { return m_%s.is (v); }\n", name[i]); 201 printf (" { return m_%s.is (v); }\n", name[i]);
202 else 202 else
203 printf (";\n"); 203 printf (";\n");
204 204
205 printf (" Matrix get_%s_rgb (void) const", name[i]); 205 printf (" Matrix get_%s_rgb () const", name[i]);
206 206
207 if (emit_get[i] == "definition") 207 if (emit_get[i] == "definition")
208 printf (" { return (m_%s.is_rgb () ? m_%s.rgb () : Matrix ()); }\n", name[i], name[i]); 208 printf (" { return (m_%s.is_rgb () ? m_%s.rgb () : Matrix ()); }\n", name[i], name[i]);
209 else 209 else
210 printf (";\n"); 210 printf (";\n");
214 214
215 ## double_radio_property 215 ## double_radio_property
216 216
217 function emit_get_double_radio (i) 217 function emit_get_double_radio (i)
218 { 218 {
219 printf (" bool %s_is_double (void) const { return m_%s.is_double (); }\n", name[i], name[i]); 219 printf (" bool %s_is_double () const { return m_%s.is_double (); }\n", name[i], name[i]);
220 220
221 printf (" bool %s_is (const std::string& v) const", name[i]); 221 printf (" bool %s_is (const std::string& v) const", name[i]);
222 222
223 if (emit_get[i] == "definition") 223 if (emit_get[i] == "definition")
224 printf (" { return m_%s.is (v); }\n", name[i]); 224 printf (" { return m_%s.is (v); }\n", name[i]);
225 else 225 else
226 printf (";\n"); 226 printf (";\n");
227 227
228 printf (" double get_%s_double (void) const", name[i]); 228 printf (" double get_%s_double () const", name[i]);
229 229
230 if (emit_get[i] == "definition") 230 if (emit_get[i] == "definition")
231 printf (" { return (m_%s.is_double () ? m_%s.double_value () : 0); }\n", name[i], name[i]); 231 printf (" { return (m_%s.is_double () ? m_%s.double_value () : 0); }\n", name[i], name[i]);
232 else 232 else
233 printf (";\n"); 233 printf (";\n");
258 258
259 ## string_array_property 259 ## string_array_property
260 260
261 function emit_get_string_array (i) 261 function emit_get_string_array (i)
262 { 262 {
263 printf (" std::string get_%s_string (void) const", name[i]); 263 printf (" std::string get_%s_string () const", name[i]);
264 264
265 if (emit_get[i] == "definition") 265 if (emit_get[i] == "definition")
266 printf (" { return m_%s.string_value (); }\n", name[i]); 266 printf (" { return m_%s.string_value (); }\n", name[i]);
267 else 267 else
268 printf (";\n"); 268 printf (";\n");
269 269
270 printf (" string_vector get_%s_vector (void) const", name[i]); 270 printf (" string_vector get_%s_vector () const", name[i]);
271 271
272 if (emit_get[i] == "definition") 272 if (emit_get[i] == "definition")
273 printf (" { return m_%s.string_vector_value (); }\n", name[i]); 273 printf (" { return m_%s.string_vector_value (); }\n", name[i]);
274 else 274 else
275 printf (";\n"); 275 printf (";\n");
281 281
282 function emit_common_declarations () 282 function emit_common_declarations ()
283 { 283 {
284 printf ("public:\n"); 284 printf ("public:\n");
285 printf (" properties (const graphics_handle& mh, const graphics_handle& p);\n\n"); 285 printf (" properties (const graphics_handle& mh, const graphics_handle& p);\n\n");
286 printf (" ~properties (void) { }\n\n"); 286 printf (" ~properties () { }\n\n");
287 printf (" void set (const caseless_str& pname, const octave_value& val);\n\n"); 287 printf (" void set (const caseless_str& pname, const octave_value& val);\n\n");
288 printf (" octave_value get (bool all = false) const;\n\n"); 288 printf (" octave_value get (bool all = false) const;\n\n");
289 printf (" octave_value get (const caseless_str& pname) const;\n\n"); 289 printf (" octave_value get (const caseless_str& pname) const;\n\n");
290 printf (" octave_value get (const std::string& pname) const\n {\n return get (caseless_str (pname));\n }\n\n"); 290 printf (" octave_value get (const std::string& pname) const\n {\n return get (caseless_str (pname));\n }\n\n");
291 printf (" octave_value get (const char *pname) const\n {\n return get (caseless_str (pname));\n }\n\n"); 291 printf (" octave_value get (const char *pname) const\n {\n return get (caseless_str (pname));\n }\n\n");
292 printf (" property get_property (const caseless_str& pname);\n\n"); 292 printf (" property get_property (const caseless_str& pname);\n\n");
293 printf (" std::string graphics_object_name (void) const { return s_go_name; }\n\n"); 293 printf (" std::string graphics_object_name () const { return s_go_name; }\n\n");
294 printf (" static property_list::pval_map_type factory_defaults (void);\n\n"); 294 printf (" static property_list::pval_map_type factory_defaults ();\n\n");
295 printf ("private:\n static std::string s_go_name;\n\n"); 295 printf ("private:\n static std::string s_go_name;\n\n");
296 } 296 }
297 297
298 function emit_declarations () 298 function emit_declarations ()
299 { 299 {
300 if (class_name && ! base) 300 if (class_name && ! base)
301 emit_common_declarations(); 301 emit_common_declarations();
302 302
303 printf ("public:\n\n\n static std::set<std::string> core_property_names (void);\n\n static std::set<std::string> readonly_property_names (void);\n\n static bool has_core_property (const caseless_str& pname);\n\n static bool has_readonly_property (const caseless_str& pname);\n\n std::set<std::string> all_property_names (void) const;\n\n"); 303 printf ("public:\n\n\n static std::set<std::string> core_property_names ();\n\n static std::set<std::string> readonly_property_names ();\n\n static bool has_core_property (const caseless_str& pname);\n\n static bool has_readonly_property (const caseless_str& pname);\n\n std::set<std::string> all_property_names () const;\n\n");
304 304
305 if (! base) 305 if (! base)
306 printf (" bool has_property (const caseless_str& pname) const;\n\n"); 306 printf (" bool has_property (const caseless_str& pname) const;\n\n");
307 307
308 if (idx > 0) 308 if (idx > 0)
355 emit_get_callback(i); 355 emit_get_callback(i);
356 else if (type[i] == "string_array_property") 356 else if (type[i] == "string_array_property")
357 emit_get_string_array(i); 357 emit_get_string_array(i);
358 else 358 else
359 { 359 {
360 printf (" %s get_%s (void) const", type[i], name[i]); 360 printf (" %s get_%s () const", type[i], name[i]);
361 361
362 if (emit_get[i] == "definition") 362 if (emit_get[i] == "definition")
363 printf (" { return m_%s; }\n", name[i]); 363 printf (" { return m_%s; }\n", name[i]);
364 else 364 else
365 printf (";\n"); 365 printf (";\n");
416 printf (";\n\n"); 416 printf (";\n\n");
417 } 417 }
418 418
419 if (updater[i] == "extern") 419 if (updater[i] == "extern")
420 { 420 {
421 printf (" void update_%s (void);\n\n", name[i]); 421 printf (" void update_%s ();\n\n", name[i]);
422 } 422 }
423 423
424 ## if (emit_ov_set[i]) 424 ## if (emit_ov_set[i])
425 ## { 425 ## {
426 ## printf (" void set_%s (const octave_value& val)", name[i]); 426 ## printf (" void set_%s (const octave_value& val)", name[i]);
591 591
592 ## factory defaults method 592 ## factory defaults method
593 593
594 if (base) 594 if (base)
595 { 595 {
596 printf ("property_list::pval_map_type\nbase_properties::factory_defaults (void)\n{\n"); 596 printf ("property_list::pval_map_type\nbase_properties::factory_defaults ()\n{\n");
597 printf (" property_list::pval_map_type m;\n\n"); 597 printf (" property_list::pval_map_type m;\n\n");
598 } 598 }
599 else 599 else
600 { 600 {
601 printf ("property_list::pval_map_type\n%s::properties::factory_defaults (void)\n{\n", 601 printf ("property_list::pval_map_type\n%s::properties::factory_defaults ()\n{\n",
602 class_name); 602 class_name);
603 printf (" property_list::pval_map_type m = base_properties::factory_defaults ();\n\n"); 603 printf (" property_list::pval_map_type m = base_properties::factory_defaults ();\n\n");
604 } 604 }
605 605
606 for (i = 1; i <= idx; i++) 606 for (i = 1; i <= idx; i++)
636 printf ("std::set<std::string>\n"); 636 printf ("std::set<std::string>\n");
637 if (base) 637 if (base)
638 printf ("base_properties"); 638 printf ("base_properties");
639 else 639 else
640 printf ("%s::properties", class_name); 640 printf ("%s::properties", class_name);
641 printf ("::core_property_names (void)\n{\n static std::set<std::string> all_pnames;\n\n static bool initialized = false;\n\n if (! initialized)\n {\n"); 641 printf ("::core_property_names ()\n{\n static std::set<std::string> all_pnames;\n\n static bool initialized = false;\n\n if (! initialized)\n {\n");
642 for (i = 1; i <= idx; i++) 642 for (i = 1; i <= idx; i++)
643 printf (" all_pnames.insert (\"%s\");\n", name[i]); 643 printf (" all_pnames.insert (\"%s\");\n", name[i]);
644 if (! base) 644 if (! base)
645 printf ("\n std::set<std::string> base_pnames = base_properties::core_property_names ();\n all_pnames.insert (base_pnames.begin (), base_pnames.end ());\n"); 645 printf ("\n std::set<std::string> base_pnames = base_properties::core_property_names ();\n all_pnames.insert (base_pnames.begin (), base_pnames.end ());\n");
646 printf ("\n initialized = true;\n }\n\n return all_pnames;\n}\n\n"); 646 printf ("\n initialized = true;\n }\n\n return all_pnames;\n}\n\n");
656 printf ("std::set<std::string>\n"); 656 printf ("std::set<std::string>\n");
657 if (base) 657 if (base)
658 printf ("base_properties"); 658 printf ("base_properties");
659 else 659 else
660 printf ("%s::properties", class_name); 660 printf ("%s::properties", class_name);
661 printf ("::readonly_property_names (void)\n{\n static std::set<std::string> all_pnames;\n\n static bool initialized = false;\n\n if (! initialized)\n {\n"); 661 printf ("::readonly_property_names ()\n{\n static std::set<std::string> all_pnames;\n\n static bool initialized = false;\n\n if (! initialized)\n {\n");
662 for (i = 1; i <= idx; i++) 662 for (i = 1; i <= idx; i++)
663 if (readonly[i]) 663 if (readonly[i])
664 { 664 {
665 printf (" all_pnames.insert (\"%s\");\n", name[i]); 665 printf (" all_pnames.insert (\"%s\");\n", name[i]);
666 } 666 }
679 printf ("std::set<std::string>\n"); 679 printf ("std::set<std::string>\n");
680 if (base) 680 if (base)
681 printf ("base_properties"); 681 printf ("base_properties");
682 else 682 else
683 printf ("%s::properties", class_name); 683 printf ("%s::properties", class_name);
684 printf ("::all_property_names (void) const\n{\n static std::set<std::string> all_pnames = core_property_names ();\n\n"); 684 printf ("::all_property_names () const\n{\n static std::set<std::string> all_pnames = core_property_names ();\n\n");
685 if (base) 685 if (base)
686 printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> dyn_props = dynamic_property_names ();\n retval.insert (dyn_props.begin (), dyn_props.end ());\n for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator p = m_all_props.begin ();\n p != m_all_props.end (); p++)\n retval.insert (p->first);\n\n return retval;\n}\n\n"); 686 printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> dyn_props = dynamic_property_names ();\n retval.insert (dyn_props.begin (), dyn_props.end ());\n for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator p = m_all_props.begin ();\n p != m_all_props.end (); p++)\n retval.insert (p->first);\n\n return retval;\n}\n\n");
687 else 687 else
688 printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> base_props = base_properties::all_property_names ();\n retval.insert (base_props.begin (), base_props.end ());\n\n return retval;\n}\n\n"); 688 printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> base_props = base_properties::all_property_names ();\n retval.insert (base_props.begin (), base_props.end ());\n\n return retval;\n}\n\n");
689 689