# HG changeset patch # User John W. Eaton # Date 1260215600 18000 # Node ID 6cb30a539481208a295e4353aefad2e771a0272a # Parent fb6b6fcafa62d836027177ab3aeddf3856db76ec untabify files in examples directory diff -r fb6b6fcafa62 -r 6cb30a539481 ChangeLog --- a/ChangeLog Mon Dec 07 14:49:48 2009 -0500 +++ b/ChangeLog Mon Dec 07 14:53:20 2009 -0500 @@ -1,3 +1,13 @@ +2009-12-07 John W. Eaton + + * examples/firstmexdemo.c, examples/fortdemo.cc, + examples/funcdemo.cc, examples/hello.cc, examples/make_int.cc, + examples/mycell.c, examples/myfeval.c, examples/myfunc.c, + examples/mypow2.c, examples/mysparse.c, examples/mystring.c, + examples/mystruct.c, examples/paramdemo.cc, + examples/stringdemo.cc, examples/structdemo.cc, + examples/unwinddemo.cc, examples/embedded.cc: Untabify. + 2009-12-04 John W. Eaton * configure.ac (OCTAVE_API_VERSION_NUMBER): New variable. diff -r fb6b6fcafa62 -r 6cb30a539481 examples/embedded.cc --- a/examples/embedded.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/embedded.cc Mon Dec 07 14:53:20 2009 -0500 @@ -20,9 +20,9 @@ { a_matrix (i) = 5 * (i + 1); if (i != 0) - std::cout << ", " << 5 * (i + 2); + std::cout << ", " << 5 * (i + 2); else - std::cout << 5 * (i + 2); + std::cout << 5 * (i + 2); } std::cout << "] is "; @@ -33,9 +33,9 @@ { a_matrix = out(0).matrix_value (); if (a_matrix.numel () == 1) - std::cout << a_matrix(0) << "\n"; + std::cout << a_matrix(0) << "\n"; else - std::cout << "invalid\n"; + std::cout << "invalid\n"; } else std::cout << "invalid\n"; diff -r fb6b6fcafa62 -r 6cb30a539481 examples/firstmexdemo.c --- a/examples/firstmexdemo.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/firstmexdemo.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,7 +2,7 @@ void mexFunction (int nlhs, mxArray *plhs[], int nrhs, - const mxArray *prhs[]) + const mxArray *prhs[]) { mxArray *v = mxCreateDoubleMatrix (1, 1, mxREAL); double *data = mxGetPr (v); diff -r fb6b6fcafa62 -r 6cb30a539481 examples/fortdemo.cc --- a/examples/fortdemo.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/fortdemo.cc Mon Dec 07 14:53:20 2009 -0500 @@ -27,8 +27,8 @@ F77_XFCN (fortsub, FORTSUB, (na, av, ctmp F77_CHAR_ARG_LEN (128))); - retval(1) = std::string (ctmp); - retval(0) = a; + retval(1) = std::string (ctmp); + retval(0) = a; } } return retval; diff -r fb6b6fcafa62 -r 6cb30a539481 examples/funcdemo.cc --- a/examples/funcdemo.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/funcdemo.cc Mon Dec 07 14:53:20 2009 -0500 @@ -28,7 +28,7 @@ } else error ("funcdemo: expected string,", - " inline or function handle"); + " inline or function handle"); } return retval; } diff -r fb6b6fcafa62 -r 6cb30a539481 examples/hello.cc --- a/examples/hello.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/hello.cc Mon Dec 07 14:53:20 2009 -0500 @@ -33,12 +33,12 @@ // Currently, this includes the files // // balance.cc fft.cc ifft.cc minmax.cc sort.cc -// chol.cc fft2.cc ifft2.cc pinv.cc svd.cc +// chol.cc fft2.cc ifft2.cc pinv.cc svd.cc // colloc.cc filter.cc inv.cc qr.cc syl.cc // dassl.cc find.cc log.cc quad.cc -// det.cc fsolve.cc lsode.cc qzval.cc -// eig.cc givens.cc lu.cc rand.cc -// expm.cc hess.cc minmax.cc schur.cc +// det.cc fsolve.cc lsode.cc qzval.cc +// eig.cc givens.cc lu.cc rand.cc +// expm.cc hess.cc minmax.cc schur.cc // // The difference between DEFUN_DLD and DEFUN_DLD_BUILTIN is that // DEFUN_DLD_BUILTIN can define a built-in function that is not diff -r fb6b6fcafa62 -r 6cb30a539481 examples/make_int.cc --- a/examples/make_int.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/make_int.cc Mon Dec 07 14:53:20 2009 -0500 @@ -244,7 +244,7 @@ mlock ("make_int"); octave_stdout << "installing integer type at type-id = " - << octave_integer::static_type_id () << "\n"; + << octave_integer::static_type_id () << "\n"; INSTALL_UNOP (op_not, octave_integer, gnot); INSTALL_UNOP (op_uminus, octave_integer, uminus); @@ -281,7 +281,7 @@ double d = args(0).double_value (); if (! error_state) - retval = octave_value (new octave_integer (NINT (d))); + retval = octave_value (new octave_integer (NINT (d))); } else usage ("make_int"); diff -r fb6b6fcafa62 -r 6cb30a539481 examples/mycell.c --- a/examples/mycell.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/mycell.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,7 +2,7 @@ void mexFunction (int nlhs, mxArray* plhs[], int nrhs, - const mxArray* prhs[]) + const mxArray* prhs[]) { mwSize n; mwIndex i; diff -r fb6b6fcafa62 -r 6cb30a539481 examples/myfeval.c --- a/examples/myfeval.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/myfeval.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,14 +2,14 @@ void mexFunction (int nlhs, mxArray* plhs[], int nrhs, - const mxArray* prhs[]) + const mxArray* prhs[]) { char *str; mexPrintf ("Hello, World!\n"); mexPrintf ("I have %d inputs and %d outputs\n", nrhs, - nlhs); + nlhs); if (nrhs < 1 || ! mxIsString (prhs[0])) mexErrMsgTxt ("function name expected"); diff -r fb6b6fcafa62 -r 6cb30a539481 examples/myfunc.c --- a/examples/myfunc.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/myfunc.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,7 +2,7 @@ void mexFunction (int nlhs, mxArray *plhs[], int nrhs, - const mxArray *prhs[]) + const mxArray *prhs[]) { const char *nm; nm = mexFunctionName (); diff -r fb6b6fcafa62 -r 6cb30a539481 examples/mypow2.c --- a/examples/mypow2.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/mypow2.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,7 +2,7 @@ void mexFunction (int nlhs, mxArray* plhs[], int nrhs, - const mxArray* prhs[]) + const mxArray* prhs[]) { mwIndex i; mwSize n; @@ -26,14 +26,14 @@ vio = mxGetPi (plhs[0]); for (i = 0; i < n; i++) - { - vro [i] = vri [i] * vri [i] - vii [i] * vii [i]; - vio [i] = 2 * vri [i] * vii [i]; - } + { + vro [i] = vri [i] * vri [i] - vii [i] * vii [i]; + vio [i] = 2 * vri [i] * vii [i]; + } } else { for (i = 0; i < n; i++) - vro [i] = vri [i] * vri [i]; + vro [i] = vri [i] * vri [i]; } } diff -r fb6b6fcafa62 -r 6cb30a539481 examples/mysparse.c --- a/examples/mysparse.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/mysparse.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,7 +2,7 @@ void mexFunction (int nlhs, mxArray *plhs[], int nrhs, - const mxArray *prhs[]) + const mxArray *prhs[]) { mwSize n, m, nz; mxArray *v; @@ -22,7 +22,7 @@ if (mxIsComplex (prhs[0])) { mexPrintf ("Matrix is %d-by-%d complex", - " sparse matrix", m, n); + " sparse matrix", m, n); mexPrintf (" with %d elements\n", nz); pr = mxGetPr (prhs[0]); @@ -33,7 +33,7 @@ i = n; while (jc[i] == jc[i-1] && i != 0) i--; mexPrintf ("last non-zero element (%d, %d) =", - ir[nz-1]+ 1, i); + ir[nz-1]+ 1, i); mexPrintf (" (%g, %g)\n", pr[nz-1], pi[nz-1]); v = mxCreateSparse (m, n, nz, mxCOMPLEX); @@ -58,7 +58,7 @@ { bool *pbr, *pbr2; mexPrintf ("Matrix is %d-by-%d logical", - " sparse matrix", m, n); + " sparse matrix", m, n); mexPrintf (" with %d elements\n", nz); pbr = mxGetLogicals (prhs[0]); @@ -89,7 +89,7 @@ else { mexPrintf ("Matrix is %d-by-%d real", - " sparse matrix", m, n); + " sparse matrix", m, n); mexPrintf (" with %d elements\n", nz); pr = mxGetPr (prhs[0]); diff -r fb6b6fcafa62 -r 6cb30a539481 examples/mystring.c --- a/examples/mystring.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/mystring.c Mon Dec 07 14:53:20 2009 -0500 @@ -3,7 +3,7 @@ void mexFunction (int nlhs, mxArray *plhs[], int nrhs, - const mxArray *prhs[]) + const mxArray *prhs[]) { mwIndex i, j; mwSize m, n; @@ -17,7 +17,7 @@ n = mxGetN (prhs[0]); pi = mxGetChars (prhs[0]); plhs[0] = mxCreateNumericMatrix (m, n, mxCHAR_CLASS, - mxREAL); + mxREAL); po = mxGetChars (plhs[0]); for (j = 0; j < n; j++) diff -r fb6b6fcafa62 -r 6cb30a539481 examples/mystruct.c --- a/examples/mystruct.c Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/mystruct.c Mon Dec 07 14:53:20 2009 -0500 @@ -2,7 +2,7 @@ void mexFunction (int nlhs, mxArray* plhs[], int nrhs, - const mxArray* prhs[]) + const mxArray* prhs[]) { int i; mwIndex j; diff -r fb6b6fcafa62 -r 6cb30a539481 examples/paramdemo.cc --- a/examples/paramdemo.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/paramdemo.cc Mon Dec 07 14:53:20 2009 -0500 @@ -1,7 +1,7 @@ #include DEFUN_DLD (paramdemo, args, nargout, - "Parameter Check Demo.") + "Parameter Check Demo.") { int nargin = args.length (); octave_value retval; @@ -22,13 +22,13 @@ octave_stdout << " includes Inf or NaN values\n"; if (m.any_element_not_one_or_zero()) octave_stdout << - " includes other values than 1 and 0\n"; + " includes other values than 1 and 0\n"; if (m.all_elements_are_int_or_inf_or_nan()) octave_stdout << - " includes only int, Inf or NaN values\n"; + " includes only int, Inf or NaN values\n"; if (m.all_integers (min_val, max_val)) octave_stdout << - " includes only integers in [-10,10]\n"; + " includes only integers in [-10,10]\n"; } return retval; } diff -r fb6b6fcafa62 -r 6cb30a539481 examples/stringdemo.cc --- a/examples/stringdemo.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/stringdemo.cc Mon Dec 07 14:53:20 2009 -0500 @@ -23,7 +23,7 @@ { std::string tmp = ch.row_as_string (i); ch.insert (ch.row_as_string(nr-i-1).c_str(), - i, 0); + i, 0); ch.insert (tmp.c_str(), nr-i-1, 0); } retval(0) = octave_value (ch, true); diff -r fb6b6fcafa62 -r 6cb30a539481 examples/structdemo.cc --- a/examples/structdemo.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/structdemo.cc Mon Dec 07 14:53:20 2009 -0500 @@ -18,7 +18,7 @@ // The following two lines might be written as // octave_value tmp; // for (Octave_map::iterator p0 = - // arg0.begin(); + // arg0.begin(); // p0 != arg0.end(); p0++ ) // if (arg0.key (p0) == arg1) // { diff -r fb6b6fcafa62 -r 6cb30a539481 examples/unwinddemo.cc --- a/examples/unwinddemo.cc Mon Dec 07 14:49:48 2009 -0500 +++ b/examples/unwinddemo.cc Mon Dec 07 14:53:20 2009 -0500 @@ -22,7 +22,7 @@ { unwind_protect::begin_frame ("Funwinddemo"); unwind_protect_ptr - (current_liboctave_warning_handler); + (current_liboctave_warning_handler); set_liboctave_warning_handler(err_hand); retval = octave_value (quotient (a, b)); unwind_protect::run_frame ("Funwinddemo");