Mercurial > octave
changeset 20946:6eff66fb8a02
style fixes for comments
* find-dialog.cc, find-dialog.h, display.cc, error.cc, gl-render.cc,
graphics.cc, graphics.in.h, max.cc, oct-handle.h, oct-obj.h,
oct-stream.cc, oct.h, pr-output.cc, profiler.cc, str2double.cc,
symtab.cc, toplev.cc, toplev.h, xgl2ps.c, zfstream.cc, zfstream.h,
__glpk__.cc, audiodevinfo.cc, colamd.cc, symbfact.cc, ov-classdef.cc,
ov-classdef.h, ov-java.cc, op-int.h, pt-pr-code.cc, pt-walk.h:
Use C++-style comments where possible.
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libgui/src/m-editor/find-dialog.cc Fri Dec 18 22:39:36 2015 -0500 @@ -1,4 +1,4 @@ -/**************************************************************************** +/* Find dialog derived from an example from Qt Toolkit (license below (**)) @@ -56,7 +56,8 @@ ** Nokia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** -****************************************************************************/ + +*/ #ifdef HAVE_CONFIG_H #include <config.h>
--- a/libgui/src/m-editor/find-dialog.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libgui/src/m-editor/find-dialog.h Fri Dec 18 22:39:36 2015 -0500 @@ -1,4 +1,4 @@ -/**************************************************************************** +/* Find dialog derived from an example from Qt Toolkit (license below (**)) @@ -56,7 +56,8 @@ ** Nokia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** -****************************************************************************/ + +*/ #ifndef FIND_DIALOG_H #define FIND_DIALOG_H
--- a/libinterp/corefcn/display.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/display.cc Fri Dec 18 22:39:36 2015 -0500 @@ -72,8 +72,9 @@ #else - /* FIXME: This will only work for MacOS > 10.5. For earlier versions - this code is not needed (use CGDisplayBitsPerPixel instead). */ + // FIXME: This will only work for MacOS > 10.5. For earlier + // versions this code is not needed (use CGDisplayBitsPerPixel + // instead). CGDisplayModeRef mode = CGDisplayCopyDisplayMode (display); CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding (mode); @@ -93,9 +94,9 @@ CGSize sz_mm = CGDisplayScreenSize (display); - /* For MacOS >= 10.6, CGSize is a struct keeping 2 CGFloat - values, but the CGFloat typedef is not present on older - systems, so use double instead. */ + // For MacOS >= 10.6, CGSize is a struct keeping 2 CGFloat + // values, but the CGFloat typedef is not present on older + // systems, so use double instead. double ht_mm = sz_mm.height; double wd_mm = sz_mm.width;
--- a/libinterp/corefcn/error.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/error.cc Fri Dec 18 22:39:36 2015 -0500 @@ -2034,7 +2034,8 @@ return ovl (); } -/* FIXME: Deprecated in 4.0 and scheduled for removal in 4.4 */ +// FIXME: Deprecated in 4.0 and scheduled for removal in 4.4. + DEFUN (__usage__, args, , "-*- texinfo -*-\n\ @deftypefn {} {} usage (@var{msg})\n\
--- a/libinterp/corefcn/gl-render.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/gl-render.cc Fri Dec 18 22:39:36 2015 -0500 @@ -590,7 +590,7 @@ else if (go.isa ("uimenu") || go.isa ("uicontrol") || go.isa ("uicontextmenu") || go.isa ("uitoolbar") || go.isa ("uipushtool") || go.isa ("uitoggletool")) - /* SKIP */; + ; // SKIP else if (go.isa ("uipanel")) { if (toplevel)
--- a/libinterp/corefcn/graphics.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/graphics.cc Fri Dec 18 22:39:36 2015 -0500 @@ -5548,7 +5548,7 @@ ypTickN = (zSign ? yPlane : yPlaneN); zpTickN = (zSign ? zPlaneN : zPlane); - /* 2D mode */ + // 2D mode x2Dtop = false; y2Dright = false; layer2Dtop = false; @@ -8036,10 +8036,10 @@ renderer.text_to_pixels (sv.join ("\n"), pixels, bbox, halign, valign, get_rotation (), get_interpreter ()); - /* The bbox is relative to the text's position. - We'll leave it that way, because get_position () does not return - valid results when the text is first constructed. - Conversion to proper coordinates is performed in get_extent. */ + // The bbox is relative to the text's position. We'll leave it that + // way, because get_position does not return valid results when the + // text is first constructed. Conversion to proper coordinates is + // performed in get_extent. set_extent (bbox); #endif
--- a/libinterp/corefcn/graphics.in.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/graphics.in.h Fri Dec 18 22:39:36 2015 -0500 @@ -1949,7 +1949,7 @@ property clone (void) const { return property (rep->clone ()); } - /* +#if 0 const string_property& as_string_property (void) const { return *(dynamic_cast<string_property*> (rep)); } @@ -1967,7 +1967,7 @@ const handle_property& as_handle_property (void) const { return *(dynamic_cast<handle_property*> (rep)); } - */ +#endif private: base_property *rep; @@ -2524,8 +2524,8 @@ virtual graphics_toolkit get_toolkit (void) const; virtual Matrix - get_boundingbox (bool /*internal*/ = false, - const Matrix& /*parent_pix_size*/ = Matrix ()) const + get_boundingbox (bool /* finternal */ = false, + const Matrix& /* parent_pix_size */ = Matrix ()) const { return Matrix (1, 4, 0.0); } virtual void update_boundingbox (void);
--- a/libinterp/corefcn/max.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/max.cc Fri Dec 18 22:39:36 2015 -0500 @@ -343,11 +343,9 @@ builtin_type_t rtyp; if (xtyp == btyp_char && ytyp == btyp_char) rtyp = btyp_char; - /* - FIXME: This is what should happen when boolNDArray has max() - else if (xtyp == btyp_bool && ytyp == btyp_bool) - rtyp = btyp_bool; - */ + // FIXME: This is what should happen when boolNDArray has max() + // else if (xtyp == btyp_bool && ytyp == btyp_bool) + // rtyp = btyp_bool; else rtyp = btyp_mixed_numeric (xtyp, ytyp); @@ -404,12 +402,11 @@ #undef MAKE_INT_BRANCH - /* - FIXME: This is what should happen when boolNDArray has max() - case btyp_bool: - retval = do_minmax_bin_op<boolNDArray> (argx, argy, ismin); - break; - */ + // FIXME: This is what should happen when boolNDArray has max() + // case btyp_bool: + // retval = do_minmax_bin_op<boolNDArray> (argx, argy, ismin); + // break; + default: error ("%s: cannot compute %s (%s, %s)", func, func, argx.type_name ().c_str (), argy.type_name ().c_str ());
--- a/libinterp/corefcn/oct-handle.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/oct-handle.h Fri Dec 18 22:39:36 2015 -0500 @@ -39,7 +39,7 @@ : val (octave_NaN) { if (a.is_empty ()) - /* do nothing */; + ; // do nothing else { try
--- a/libinterp/corefcn/oct-obj.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/oct-obj.h Fri Dec 18 22:39:36 2015 -0500 @@ -20,11 +20,11 @@ */ -//////////////////////////////////////////////////////////////////////////////// -// oct-obj.h was deprecated in version 4.2 and will be removed in version 4.6. -//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////// +// Note: oct-obj.h was deprecated in version 4.2 and will be removed in +// version 4.6. +//////////////////////////////////////////////////////////////////////// #warning oct-obj.h has been deprecated; use ovl.h instead #include "ovl.h" -
--- a/libinterp/corefcn/oct-stream.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/oct-stream.cc Fri Dec 18 22:39:36 2015 -0500 @@ -211,7 +211,7 @@ *buf << " "; while (++i < n && isspace (s[i])) - /* skip whitespace */; + ; // skip whitespace add_elt_to_list (width, discard, type, modifier, num_elts); @@ -1130,7 +1130,7 @@ int c1 = EOF; while (is && (c1 = is.get ()) != EOF && isspace (c1)) - { /* skip whitespace */ } + ; // skip whitespace if (c1 != EOF) { @@ -1223,7 +1223,7 @@ int c1 = EOF; while (is && (c1 = is.get ()) != EOF && isspace (c1)) - { /* skip whitespace */ } + ; // skip whitespace if (c1 != EOF) {
--- a/libinterp/corefcn/oct.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/oct.h Fri Dec 18 22:39:36 2015 -0500 @@ -25,7 +25,7 @@ // Things that are often included to create .oct files. -// config.h needs to be first because it includes #defines that can */ +// config.h needs to be first because it includes #defines that can // affect other header files. #include <config.h>
--- a/libinterp/corefcn/pr-output.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/pr-output.cc Fri Dec 18 22:39:36 2015 -0500 @@ -218,18 +218,21 @@ return x; else return x - 3*static_cast<int> (x/3); - /* The expression above is equivalent to x - (x % 3). - * According to the ISO specification for C++ the modulo operator is - * compiler dependent if any of the arguments are negative. Since this - * function will need to work on negative arguments, and we want to avoid - * portability issues, we re-implement the modulo function to the desired - * behavior (truncation). There may be a gnulib replacement. - * - * ISO/IEC 14882:2003 : Programming languages -- C++. 5.6.4: ISO, IEC. 2003 . - * "the binary % operator yields the remainder from the division of the first - * expression by the second. .... If both operands are nonnegative then the - * remainder is nonnegative; if not, the sign of the remainder is - * implementation-defined". */ + + // The expression above is equivalent to x - (x % 3). + + // According to the ISO specification for C++ the modulo operator is + // compiler dependent if any of the arguments are negative. Since + // this function will need to work on negative arguments, and we want + // to avoid portability issues, we re-implement the modulo function to + // the desired behavior (truncation). There may be a gnulib + // replacement. + + // ISO/IEC 14882:2003 : Programming languages -- C++. 5.6.4: ISO, + // IEC. 2003 . "the binary % operator yields the remainder from the + // division of the first expression by the second. .... If both + // operands are nonnegative then the remainder is nonnegative; if not, + // the sign of the remainder is implementation-defined". } static int @@ -240,8 +243,8 @@ { double absval = (x < 0.0 ? -x : x); int logabsval = static_cast<int> (gnulib::floor (log10 (absval))); - /* Avoid using modulo function with negative arguments for portability. - * See extended comment at calc_scale_exp */ + // Avoid using modulo function with negative arguments for + // portability. See extended comment at calc_scale_exp if (logabsval < 0.0) ex = logabsval - 2 + ((-logabsval + 2) % 3); else
--- a/libinterp/corefcn/profiler.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/profiler.cc Fri Dec 18 22:39:36 2015 -0500 @@ -130,10 +130,10 @@ octave_value profile_data_accumulator::tree_node::get_hierarchical (double* total) const { - /* Note that we don't generate the entry just for this node, but rather - a struct-array with entries for all children. This way, the top-node - (for which we don't want a real entry) generates already the final - hierarchical profile data. */ + // Note that we don't generate the entry just for this node, but + // rather a struct-array with entries for all children. This way, the + // top-node (for which we don't want a real entry) generates already + // the final hierarchical profile data. const octave_idx_type n = children.size ();
--- a/libinterp/corefcn/str2double.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/str2double.cc Fri Dec 18 22:39:36 2015 -0500 @@ -410,4 +410,4 @@ %!assert (str2double (''), NaN) %!assert (str2double ([]), NaN) %!assert (str2double (char(zeros(3,0))), NaN) - */ +*/
--- a/libinterp/corefcn/symtab.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/symtab.cc Fri Dec 18 22:39:36 2015 -0500 @@ -1896,4 +1896,4 @@ %! assert (strcmp (which ("bar"), "")); %! clear bar; %! assert (! strcmp (which ("bar"), "")); - */ +*/
--- a/libinterp/corefcn/toplev.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/toplev.cc Fri Dec 18 22:39:36 2015 -0500 @@ -1554,7 +1554,7 @@ { void *p; - /* malloc (0) is unpredictable; avoid it. */ + // malloc (0) is unpredictable; avoid it. if (sz == 0) sz = 1; p = gnulib::malloc (sz);
--- a/libinterp/corefcn/toplev.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/toplev.h Fri Dec 18 22:39:36 2015 -0500 @@ -206,12 +206,13 @@ return instance_ok () ? instance->do_current_context () : 0; } - /* +#if 0 static stack_frame frame (size_t idx) { return instance_ok () ? instance->do_frame (idx) : stack_frame (); } - */ +#endif + // Function at location N on the call stack (N == 0 is current), may // be built-in. static octave_function *element (size_t n) @@ -385,13 +386,15 @@ ? cs[curr_frame].m_context : 0; } - /* const stack_frame& do_frame (size_t idx) +#if 0 + const stack_frame& do_frame (size_t idx) { static stack_frame foobar; return idx < cs.size () ? cs[idx] : foobar; } - */ +#endif + octave_function *do_element (size_t n) { octave_function *retval = 0;
--- a/libinterp/corefcn/xgl2ps.c Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/xgl2ps.c Fri Dec 18 22:39:36 2015 -0500 @@ -20,10 +20,8 @@ */ -/* - * Wrapper for "imported" file gl2ps.c so that config.h will be included - * before any other system or gnulib headers. - */ +/* Wrapper for "imported" file gl2ps.c so that config.h will be included + before any other system or gnulib headers. */ #ifdef HAVE_CONFIG_H #include <config.h>
--- a/libinterp/corefcn/zfstream.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/zfstream.cc Fri Dec 18 22:39:36 2015 -0500 @@ -51,8 +51,6 @@ #define BIGBUFSIZE (256 * 1024 + STASHED_CHARACTERS) #define SMALLBUFSIZE 1 -/*****************************************************************************/ - // Default constructor gzfilebuf::gzfilebuf () : file(0), io_mode(std::ios_base::openmode(0)), own_fd(false), @@ -517,8 +515,6 @@ return ret; } -/*****************************************************************************/ - // Default constructor initializes stream buffer gzifstream::gzifstream () : std::istream (0), sb () @@ -568,8 +564,6 @@ this->setstate (std::ios_base::failbit); } -/*****************************************************************************/ - // Default constructor initializes stream buffer gzofstream::gzofstream () : std::ostream (0), sb ()
--- a/libinterp/corefcn/zfstream.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/corefcn/zfstream.h Fri Dec 18 22:39:36 2015 -0500 @@ -39,8 +39,6 @@ #include "zlib.h" -/*****************************************************************************/ - /** * @brief Gzipped file stream buffer class. * @@ -270,8 +268,6 @@ bool own_buffer; }; -/*****************************************************************************/ - /** * @brief Gzipped file input stream class. * @@ -359,8 +355,6 @@ gzfilebuf sb; }; -/*****************************************************************************/ - /** * @brief Gzipped file output stream class. * @@ -448,8 +442,6 @@ gzfilebuf sb; }; -/*****************************************************************************/ - /** * @brief Gzipped file output stream manipulator class. * @@ -480,8 +472,6 @@ T2 val2; }; -/*****************************************************************************/ - // Manipulator function thunks through to stream buffer inline gzofstream& setcompression (gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY)
--- a/libinterp/dldfcn/__glpk__.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/dldfcn/__glpk__.cc Fri Dec 18 22:39:36 2015 -0500 @@ -71,7 +71,7 @@ double tolobj; }; -static jmp_buf mark; //-- Address for long jump to jump to +static jmp_buf mark; // Address for long jump to jump to int glpk (int sense, int n, int m, double *c, int nz, int *rn, int *cn, @@ -88,7 +88,7 @@ glp_prob *lp = glp_create_prob (); - //-- Set the sense of optimization + // Set the sense of optimization if (sense == 1) glp_set_obj_dir (lp, GLP_MIN); else @@ -97,7 +97,7 @@ glp_add_cols (lp, n); for (int i = 0; i < n; i++) { - //-- Define type of the structural variables + // Define type of the structural variables if (! freeLB[i] && ! freeUB[i]) { if (lb[i] != ub[i]) @@ -130,13 +130,11 @@ for (int i = 0; i < m; i++) { - /* If the i-th row has no lower bound (types F,U), the - corrispondent parameter will be ignored. - If the i-th row has no upper bound (types F,L), the corrispondent - parameter will be ignored. - If the i-th row is of S type, the i-th LB is used, but - the i-th UB is ignored. - */ + // If the i-th row has no lower bound (types F,U), the + // corrispondent parameter will be ignored. If the i-th row has + // no upper bound (types F,L), the corrispondent parameter will be + // ignored. If the i-th row is of S type, the i-th LB is used, + // but the i-th UB is ignored. switch (ctype[i]) { @@ -177,16 +175,16 @@ } } - //-- scale the problem data + // scale the problem data if (!par->presol || lpsolver != 1) glp_scale_prob (lp, scale); - //-- build advanced initial basis (if required) + // build advanced initial basis (if required) if (lpsolver == 1 && !par->presol) glp_adv_basis (lp, 0); - /* For MIP problems without a presolver, a first pass with glp_simplex - is required */ + // For MIP problems without a presolver, a first pass with glp_simplex + // is required if ((!isMIP && lpsolver == 1) || (isMIP && !par->presol)) { @@ -261,7 +259,7 @@ } else { - /* Primal values */ + // Primal values for (int i = 0; i < n; i++) { if (lpsolver == 1) @@ -270,7 +268,7 @@ xmin[i] = glp_ipt_col_prim (lp, i+1); } - /* Dual values */ + // Dual values for (int i = 0; i < m; i++) { if (lpsolver == 1) @@ -279,7 +277,7 @@ lambda[i] = glp_ipt_row_dual (lp, i+1); } - /* Reduced costs */ + // Reduced costs for (int i = 0; i < glp_get_num_cols (lp); i++) { if (lpsolver == 1) @@ -403,14 +401,14 @@ } - //-- 3rd Input. A column array containing the right-hand side value + // 3rd Input. A column array containing the right-hand side value // for each constraint in the constraint matrix. Matrix B = args(2).xmatrix_value ("__glpk__: invalid value of B"); double *b = B.fortran_vec (); - //-- 4th Input. An array of length mrowsc containing the lower - //-- bound on each of the variables. + // 4th Input. An array of length mrowsc containing the lower + // bound on each of the variables. Matrix LB = args(3).xmatrix_value ("__glpk__: invalid value of LB"); if (LB.numel () < mrowsc) @@ -418,7 +416,7 @@ double *lb = LB.fortran_vec (); - //-- LB argument, default: Free + // LB argument, default: Free Array<int> freeLB (dim_vector (mrowsc, 1)); for (int i = 0; i < mrowsc; i++) { @@ -431,8 +429,8 @@ freeLB(i) = 0; } - //-- 5th Input. An array of at least length numcols containing the upper - //-- bound on each of the variables. + // 5th Input. An array of at least length numcols containing the upper + // bound on each of the variables. Matrix UB = args(4).xmatrix_value ("__glpk__: invalid value of UB"); if (UB.numel () < mrowsc) @@ -452,13 +450,13 @@ freeUB(i) = 0; } - //-- 6th Input. A column array containing the sense of each constraint - //-- in the constraint matrix. + // 6th Input. A column array containing the sense of each constraint + // in the constraint matrix. charMatrix CTYPE = args(5).char_matrix_value ("__glpk__: invalid value of CTYPE"); char *ctype = CTYPE.fortran_vec (); - //-- 7th Input. A column array containing the types of the variables. + // 7th Input. A column array containing the types of the variables. charMatrix VTYPE = args(6).char_matrix_value ("__glpk__: invalid value of VARTYPE"); Array<int> vartype (dim_vector (mrowsc, 1)); @@ -474,7 +472,7 @@ vartype(i) = GLP_CV; } - //-- 8th Input. Sense of optimization. + // 8th Input. Sense of optimization. volatile int sense; double SENSE = args(7).scalar_value ("__glpk__: invalid value of SENSE"); @@ -483,72 +481,70 @@ else sense = -1; - //-- 9th Input. A structure containing the control parameters. + // 9th Input. A structure containing the control parameters. octave_scalar_map PARAM = args(8).xscalar_map_value ("__glpk__: invalid value of PARAM"); control_params par; - //-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - //-- Integer parameters - //-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // Integer parameters - //-- Level of messages output by the solver + // Level of messages output by the solver par.msglev = 1; OCTAVE_GLPK_GET_INT_PARAM ("msglev", par.msglev); if (par.msglev < 0 || par.msglev > 3) error ("__glpk__: PARAM.msglev must be 0 (no output) or 1 (error and warning messages only [default]) or 2 (normal output) or 3 (full output)"); - //-- scaling option + // scaling option volatile int scale = 16; OCTAVE_GLPK_GET_INT_PARAM ("scale", scale); if (scale < 0 || scale > 128) error ("__glpk__: PARAM.scale must either be 128 (automatic selection of scaling options), or a bitwise or of: 1 (geometric mean scaling), 16 (equilibration scaling), 32 (round scale factors to power of two), 64 (skip if problem is well scaled"); - //-- Dual simplex option + // Dual simplex option par.dual = 1; OCTAVE_GLPK_GET_INT_PARAM ("dual", par.dual); if (par.dual < 1 || par.dual > 3) error ("__glpk__: PARAM.dual must be 1 (use two-phase primal simplex [default]) or 2 (use two-phase dual simplex) or 3 (use two-phase dual simplex, and if it fails, switch to the primal simplex)"); - //-- Pricing option + // Pricing option par.price = 34; OCTAVE_GLPK_GET_INT_PARAM ("price", par.price); if (par.price != 17 && par.price != 34) error ("__glpk__: PARAM.price must be 17 (textbook pricing) or 34 (steepest edge pricing [default])"); - //-- Simplex iterations limit + // Simplex iterations limit par.itlim = std::numeric_limits<int>::max (); OCTAVE_GLPK_GET_INT_PARAM ("itlim", par.itlim); - //-- Output frequency, in iterations + // Output frequency, in iterations par.outfrq = 200; OCTAVE_GLPK_GET_INT_PARAM ("outfrq", par.outfrq); - //-- Branching heuristic option + // Branching heuristic option par.branch = 4; OCTAVE_GLPK_GET_INT_PARAM ("branch", par.branch); if (par.branch < 1 || par.branch > 5) error ("__glpk__: PARAM.branch must be 1 (first fractional variable) or 2 (last fractional variable) or 3 (most fractional variable) or 4 (heuristic by Driebeck and Tomlin [default]) or 5 (hybrid pseudocost heuristic)"); - //-- Backtracking heuristic option + // Backtracking heuristic option par.btrack = 4; OCTAVE_GLPK_GET_INT_PARAM ("btrack", par.btrack); if (par.btrack < 1 || par.btrack > 4) error ("__glpk__: PARAM.btrack must be 1 (depth first search) or 2 (breadth first search) or 3 (best local bound) or 4 (best projection heuristic [default]"); - //-- Presolver option + // Presolver option par.presol = 1; OCTAVE_GLPK_GET_INT_PARAM ("presol", par.presol); if (par.presol < 0 || par.presol > 1) error ("__glpk__: PARAM.presol must be 0 (do NOT use LP presolver) or 1 (use LP presolver [default])"); - //-- LPsolver option + // LPsolver option volatile int lpsolver = 1; OCTAVE_GLPK_GET_INT_PARAM ("lpsolver", lpsolver); if (lpsolver < 1 || lpsolver > 2) error ("__glpk__: PARAM.lpsolver must be 1 (simplex method) or 2 (interior point method)"); - //-- Ratio test option + // Ratio test option par.rtest = 34; OCTAVE_GLPK_GET_INT_PARAM ("rtest", par.rtest); if (par.rtest != 17 && par.rtest != 34) @@ -560,27 +556,25 @@ par.outdly = 0; OCTAVE_GLPK_GET_INT_PARAM ("outdly", par.outdly); - //-- Save option + // Save option volatile int save_pb = 0; OCTAVE_GLPK_GET_INT_PARAM ("save", save_pb); save_pb = save_pb != 0; - //-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - //-- Real parameters - //-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // Real parameters - //-- Relative tolerance used to check if the current basic solution - //-- is primal feasible + // Relative tolerance used to check if the current basic solution + // is primal feasible par.tolbnd = 1e-7; OCTAVE_GLPK_GET_REAL_PARAM ("tolbnd", par.tolbnd); - //-- Absolute tolerance used to check if the current basic solution - //-- is dual feasible + // Absolute tolerance used to check if the current basic solution + // is dual feasible par.toldj = 1e-7; OCTAVE_GLPK_GET_REAL_PARAM ("toldj", par.toldj); - //-- Relative tolerance used to choose eligible pivotal elements of - //-- the simplex table in the ratio test + // Relative tolerance used to choose eligible pivotal elements of + // the simplex table in the ratio test par.tolpiv = 1e-10; OCTAVE_GLPK_GET_REAL_PARAM ("tolpiv", par.tolpiv); @@ -596,7 +590,7 @@ par.tolobj = 1e-7; OCTAVE_GLPK_GET_REAL_PARAM ("tolobj", par.tolobj); - //-- Assign pointers to the output parameters + // Assign pointers to the output parameters ColumnVector xmin (mrowsc, octave_NA); double fmin = octave_NA; ColumnVector lambda (mrowsA, octave_NA);
--- a/libinterp/dldfcn/audiodevinfo.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/dldfcn/audiodevinfo.cc Fri Dec 18 22:39:36 2015 -0500 @@ -66,9 +66,9 @@ #endif -#define NO_PORTAUDIO_MSG\ - error ("portaudio not found on your system and thus audio functionality is not present");\ - (void) args; /*silence compiler warning "unused parameter"*/ +#define NO_PORTAUDIO_MSG \ + error ("portaudio not found on your system and thus audio functionality is not present"); \ + (void) args; /* silence compiler warning "unused parameter" */ DEFUN_DLD (audiodevinfo, args, , "-*- texinfo -*-\n\
--- a/libinterp/dldfcn/colamd.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/dldfcn/colamd.cc Fri Dec 18 22:39:36 2015 -0500 @@ -149,7 +149,7 @@ // Set up structure describing children for (octave_idx_type v = 0; v <= n; first_kid[v++] = -1) - /* do nothing */; + ; // do nothing for (octave_idx_type v = n-1; v >= 0; v--) { @@ -173,7 +173,7 @@ // Compute firstcol[row] = first nonzero column in row for (octave_idx_type row = 0; row < nr; firstcol[row++] = nc) - /* do nothing */; + ; // do nothing for (octave_idx_type col = 0; col < nc; col++) for (octave_idx_type p = colbeg[col]; p < colend[col]; p++)
--- a/libinterp/dldfcn/symbfact.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/dldfcn/symbfact.cc Fri Dec 18 22:39:36 2015 -0500 @@ -274,7 +274,7 @@ L.xcidx(n) = lnz; - /* create a copy of the column pointers */ + // create a copy of the column pointers octave_idx_type *W = First; for (octave_idx_type j = 0 ; j < n ; j++) W[j] = L.xcidx (j); @@ -330,7 +330,7 @@ if (nargout > 1) { - /* compute the elimination tree height */ + // compute the elimination tree height octave_idx_type height = 0 ; for (int i = 0 ; i < n ; i++) height = (height > Level[i] ? height : Level[i]);
--- a/libinterp/octave-value/ov-classdef.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/octave-value/ov-classdef.cc Fri Dec 18 22:39:36 2015 -0500 @@ -2011,13 +2011,13 @@ void visit_do_until_command (tree_do_until_command&) { } private: - /* The name of the constructor being analyzed */ + // The name of the constructor being analyzed. std::string who; - /* The name of the first output argument of the constructor */ + // The name of the first output argument of the constructor. std::string obj_name; - /* The list of superclass constructors that are explicitly called */ + // The list of superclass constructors that are explicitly called. std::list<cdef_class> ctor_list; }; @@ -3505,13 +3505,13 @@ { octave_classdef::register_type (); - /* bootstrap */ + // bootstrap cdef_class handle = make_class ("handle"); cdef_class meta_class = cdef_class::_meta_class = make_meta_class ("meta.class", handle); handle.set_class (meta_class); meta_class.set_class (meta_class); - /* meta classes */ + // meta classes cdef_class meta_property = cdef_class::_meta_property = make_meta_class ("meta.property", handle); cdef_class meta_method = cdef_class::_meta_method = make_meta_class ("meta.method", handle); cdef_class meta_package = cdef_class::_meta_package = make_meta_class ("meta.package", handle); @@ -3519,7 +3519,7 @@ cdef_class meta_event = make_meta_class ("meta.event", handle); cdef_class meta_dynproperty = make_meta_class ("meta.dynamicproperty", handle); - /* meta.class properties */ + // meta.class properties meta_class.install_property (make_attribute (meta_class, "Abstract")); meta_class.install_property (make_attribute (meta_class, "ConstructOnLoad")); meta_class.install_property (make_property (meta_class, "ContainingPackage")); @@ -3558,7 +3558,7 @@ (make_property (meta_class, "SuperClassList", make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClassList"), "public", Matrix (), "private")); - /* meta.class methods */ + // meta.class methods meta_class.install_method (make_method (meta_class, "fromName", class_fromName, "public", true)); meta_class.install_method (make_method (meta_class, "fevalStatic", class_fevalStatic, @@ -3572,7 +3572,7 @@ meta_class.install_method (make_method (meta_class, "gt", class_gt)); meta_class.install_method (make_method (meta_class, "ge", class_ge)); - /* meta.method properties */ + // meta.method properties meta_method.install_property (make_attribute (meta_method, "Abstract")); meta_method.install_property (make_attribute (meta_method, "Access")); meta_method.install_property (make_attribute (meta_method, "DefiningClass")); @@ -3583,7 +3583,7 @@ meta_method.install_property (make_attribute (meta_method, "Sealed")); meta_method.install_property (make_attribute (meta_method, "Static")); - /* meta.property properties */ + // meta.property properties meta_property.install_property (make_attribute (meta_property, "Name")); meta_property.install_property (make_attribute (meta_property, "Description")); meta_property.install_property (make_attribute (meta_property, "DetailedDescription")); @@ -3604,13 +3604,13 @@ make_fcn_handle (property_get_defaultvalue, "meta.property>get.DefaultValue"), "public", Matrix (), "private")); meta_property.install_property (make_attribute (meta_property, "HasDefault")); - /* meta.property events */ + // meta.property events // FIXME: add events - /* handle methods */ + // handle methods handle.install_method (make_method (handle, "delete", handle_delete)); - /* meta.package properties */ + // meta.package properties meta_package.install_property (make_attribute (meta_package, "Name")); meta_package.install_property (make_property (meta_package, "ContainingPackage")); meta_package.install_property @@ -3642,7 +3642,7 @@ meta_package.install_method (make_method (meta_package, "getAllPackages", package_getAllPackages, "public", true)); - /* create "meta" package */ + // create "meta" package cdef_package package_meta = cdef_package::_meta = make_package ("meta"); package_meta.install_class (meta_class, "class"); package_meta.install_class (meta_property, "property"); @@ -3651,7 +3651,7 @@ package_meta.install_class (meta_event, "event"); package_meta.install_class (meta_dynproperty, "dynproperty"); - /* install built-in classes into the symbol table */ + // install built-in classes into the symbol table symbol_table::install_built_in_function ("meta.class", octave_value (meta_class.get_constructor_function ())); symbol_table::install_built_in_function @@ -3814,7 +3814,7 @@ return to_ov (lookup_package (cname)); } -DEFUN (__superclass_reference__, args, /* nargout */, +DEFUN (__superclass_reference__, args, , "-*- texinfo -*-\n\ @deftypefn {} {} __superclass_reference__ ()\n\ Undocumented internal function.\n\ @@ -3823,7 +3823,7 @@ return octave_value (new octave_classdef_superclass_ref (args)); } -DEFUN (__meta_class_query__, args, /* nargout */, +DEFUN (__meta_class_query__, args, , "-*- texinfo -*-\n\ @deftypefn {} {} __meta_class_query__ ()\n\ Undocumented internal function.\n\ @@ -3843,7 +3843,7 @@ return to_ov (lookup_class (cls)); } -DEFUN (metaclass, args, /* nargout */, +DEFUN (metaclass, args, , "-*- texinfo -*-\n\ @deftypefn {} {} metaclass (obj)\n\ Returns the meta.class object corresponding to the class of @var{obj}.\n\
--- a/libinterp/octave-value/ov-classdef.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/octave-value/ov-classdef.h Fri Dec 18 22:39:36 2015 -0500 @@ -168,16 +168,16 @@ virtual dim_vector dims (void) const { return dim_vector (); } protected: - /* reference count */ + // Reference count octave_refcount<octave_idx_type> refcount; protected: - /* Restricted copying */ + // Restricted copying cdef_object_rep (const cdef_object_rep&) : refcount (1) { } private: - /* No assignment */ + // No assignment cdef_object_rep& operator = (const cdef_object_rep& ); void gripe_invalid_object (const char *who) const @@ -188,7 +188,7 @@ cdef_object { public: - /* FIXME: use a null object */ + // FIXME: use a null object cdef_object (void) : rep (new cdef_object_rep ()) { } @@ -1124,13 +1124,13 @@ return *this; } - /* normal invokation */ + // normal invocation octave_value_list execute (const octave_value_list& args, int nargout, bool do_check_access = true, const std::string& who = std::string ()) { return get_rep ()->execute (args, nargout, do_check_access, who); } - /* dot-invokation: object is pushed as 1st argument */ + // dot-invocation: object is pushed as 1st argument octave_value_list execute (const cdef_object& obj, const octave_value_list& args, int nargout, bool do_check_access = true,
--- a/libinterp/octave-value/ov-java.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/octave-value/ov-java.cc Fri Dec 18 22:39:36 2015 -0500 @@ -760,7 +760,7 @@ { jni_env->ExceptionClear (); - /* Try the netbeans way */ + // Try the netbeans way std::replace (class_loader.begin (), class_loader.end (), '/', '.'); jclass_ref jcls2 (jni_env, jni_env->FindClass ("org/openide/util/Lookup"));
--- a/libinterp/operators/op-int.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/operators/op-int.h Fri Dec 18 22:39:36 2015 -0500 @@ -152,8 +152,8 @@ INSTALL_CATOP (octave_ ## TYPE ## _matrix, octave_ ## TYPE ## _scalar, TYPE ## _m_s) \ INSTALL_CATOP (octave_ ## TYPE ## _matrix, octave_ ## TYPE ## _matrix, TYPE ## _m_m) +// scalar unary ops. #define OCTAVE_S_INT_UNOPS(TYPE) \ - /* scalar unary ops. */ \ \ DEFUNOP_OP (s_not, TYPE ## _scalar, !) \ DEFUNOP_OP (s_uplus, TYPE ## _scalar, /* no-op */) \ @@ -169,8 +169,8 @@ DEFNCUNOP_METHOD (s_incr, TYPE ## _scalar, increment) \ DEFNCUNOP_METHOD (s_decr, TYPE ## _scalar, decrement) +// scalar by scalar ops. #define OCTAVE_SS_INT_ARITH_OPS(PFX, T1, T2, T3) \ - /* scalar by scalar ops. */ \ \ DEFINTBINOP_OP (PFX ## _add, T1 ## scalar, T2 ## scalar, +, T3) \ DEFINTBINOP_OP (PFX ## _sub, T1 ## scalar, T2 ## scalar, -, T3) \ @@ -299,8 +299,8 @@ OCTAVE_SS_INT_BOOL_OPS (sfx, TYPE ## _, float_, octave_ ## TYPE (0), 0) \ OCTAVE_SS_INT_BOOL_OPS (fxs, float_, TYPE ## _, 0, octave_ ## TYPE (0)) +// scalar by matrix ops. #define OCTAVE_SM_INT_ARITH_OPS(PFX, TS, TM, TI) \ - /* scalar by matrix ops. */ \ \ DEFINTNDBINOP_OP (PFX ## _add, TS ## scalar, TM ## matrix, TS ## scalar, TM ## array, +, TI) \ DEFINTNDBINOP_OP (PFX ## _sub, TS ## scalar, TM ## matrix, TS ## scalar, TM ## array, -, TI) \ @@ -456,8 +456,8 @@ OCTAVE_SM_CONV (TYPE ## _, complex_) \ OCTAVE_SM_CONV (TYPE ## _, float_complex_) +// matrix by scalar ops. #define OCTAVE_MS_INT_ARITH_OPS(PFX, TM, TS, TI) \ - /* matrix by scalar ops. */ \ \ DEFINTNDBINOP_OP (PFX ## _add, TM ## matrix, TS ## scalar, TM ## array, TS ## scalar, +, TI) \ DEFINTNDBINOP_OP (PFX ## _sub, TM ## matrix, TS ## scalar, TM ## array, TS ## scalar, -, TI) \ @@ -611,8 +611,8 @@ OCTAVE_MS_INT_ASSIGN_OPS (mx, TYPE ## _, , ) \ OCTAVE_MS_INT_ASSIGN_OPS (mfx, TYPE ## _, float_, float_) +// matrix unary ops. #define OCTAVE_M_INT_UNOPS(TYPE) \ - /* matrix unary ops. */ \ \ DEFNDUNOP_OP (m_not, TYPE ## _matrix, TYPE ## _array, !) \ DEFNDUNOP_OP (m_uplus, TYPE ## _matrix, TYPE ## _array, /* no-op */) \ @@ -637,8 +637,8 @@ DEFNCUNOP_METHOD (m_decr, TYPE ## _matrix, decrement) \ DEFNCUNOP_METHOD (m_changesign, TYPE ## _matrix, changesign) +// matrix by matrix ops. #define OCTAVE_MM_INT_ARITH_OPS(PFX, T1, T2, T3) \ - /* matrix by matrix ops. */ \ \ DEFINTNDBINOP_OP (PFX ## _add, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, +, T3) \ DEFINTNDBINOP_OP (PFX ## _sub, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, -, T3) \
--- a/libinterp/parse-tree/pt-pr-code.cc Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/parse-tree/pt-pr-code.cc Fri Dec 18 22:39:36 2015 -0500 @@ -1266,7 +1266,7 @@ size_t i = 0; while (i < len && comment[i++] == '\n') - ; /* Skip leading new lines. */ + ; // Skip leading new lines. i--; while (i < len)
--- a/libinterp/parse-tree/pt-walk.h Fri Dec 18 22:06:22 2015 -0500 +++ b/libinterp/parse-tree/pt-walk.h Fri Dec 18 22:39:36 2015 -0500 @@ -219,52 +219,52 @@ visit_classdef_attribute (tree_classdef_attribute&) { } /* = 0; */ virtual void - visit_classdef_attribute_list (tree_classdef_attribute_list&) { } /* = 0; */ + visit_classdef_attribute_list (tree_classdef_attribute_list&) { } // = 0; virtual void - visit_classdef_superclass (tree_classdef_superclass&) { } /* = 0; */ + visit_classdef_superclass (tree_classdef_superclass&) { } // = 0; virtual void - visit_classdef_superclass_list (tree_classdef_superclass_list&) { } /* = 0; */ + visit_classdef_superclass_list (tree_classdef_superclass_list&) { } // = 0; virtual void - visit_classdef_property (tree_classdef_property&) { } /* = 0; */ + visit_classdef_property (tree_classdef_property&) { } // = 0; virtual void - visit_classdef_property_list (tree_classdef_property_list&) { } /* = 0; */ + visit_classdef_property_list (tree_classdef_property_list&) { } // = 0; virtual void - visit_classdef_properties_block (tree_classdef_properties_block&) { } /* = 0; */ + visit_classdef_properties_block (tree_classdef_properties_block&) { } // = 0; virtual void - visit_classdef_methods_list (tree_classdef_methods_list&) { } /* = 0; */ + visit_classdef_methods_list (tree_classdef_methods_list&) { } // = 0; virtual void - visit_classdef_methods_block (tree_classdef_methods_block&) { } /* = 0; */ + visit_classdef_methods_block (tree_classdef_methods_block&) { } // = 0; virtual void - visit_classdef_event (tree_classdef_event&) { } /* = 0; */ + visit_classdef_event (tree_classdef_event&) { } // = 0; virtual void - visit_classdef_events_list (tree_classdef_events_list&) { } /* = 0; */ + visit_classdef_events_list (tree_classdef_events_list&) { } // = 0; virtual void - visit_classdef_events_block (tree_classdef_events_block&) { } /* = 0; */ + visit_classdef_events_block (tree_classdef_events_block&) { } // = 0; virtual void - visit_classdef_enum (tree_classdef_enum&) { } /* = 0; */ + visit_classdef_enum (tree_classdef_enum&) { } // = 0; virtual void - visit_classdef_enum_list (tree_classdef_enum_list&) { } /* = 0; */ + visit_classdef_enum_list (tree_classdef_enum_list&) { } // = 0; virtual void - visit_classdef_enum_block (tree_classdef_enum_block&) { } /* = 0; */ + visit_classdef_enum_block (tree_classdef_enum_block&) { } // = 0; virtual void - visit_classdef_body (tree_classdef_body&) { } /* = 0; */ + visit_classdef_body (tree_classdef_body&) { } // = 0; virtual void - visit_classdef (tree_classdef&) { } /* = 0; */ + visit_classdef (tree_classdef&) { } // = 0; protected: