Mercurial > octave-nkf
comparison libinterp/corefcn/symtab.cc @ 19898:17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
* gl-select.cc, betainc.cc, bitfcns.cc, bsxfun.cc, gl-render.cc,
graphics.cc, load-save.cc, ls-mat-ascii.cc, ls-mat5.cc, lu.cc,
oct-stream.cc, symtab.cc, variables.cc, __eigs__.cc,
__magick_read__.cc, chol.cc, ov-base-sparse.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-inline.cc, ov-perm.cc, ov.cc, CMatrix.cc,
CSparse.cc, MSparse.cc, MatrixType.cc, MatrixType.h, dMatrix.cc,
dSparse.cc, fCMatrix.cc, fMatrix.cc, eigs-base.cc, lo-sysdep.cc,
kpse.cc: Break long lines before && and ||.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 26 Feb 2015 13:07:04 -0500 |
| parents | 19755f4fc851 |
| children | ed5ee3f610db |
comparison
equal
deleted
inserted
replaced
| 19897:09ed6f7538dd | 19898:17d647821d61 |
|---|---|
| 242 | 242 |
| 243 if (check_relative) | 243 if (check_relative) |
| 244 { | 244 { |
| 245 int nm_len = nm.length (); | 245 int nm_len = nm.length (); |
| 246 | 246 |
| 247 if (octave_env::absolute_pathname (nm) && | 247 if (octave_env::absolute_pathname (nm) |
| 248 ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct" | 248 && ((nm_len > 4 |
| 249 || nm.substr (nm_len-4) == ".mex")) | 249 && (nm.substr (nm_len-4) == ".oct" |
| 250 || (nm_len > 2 && nm.substr (nm_len-2) == ".m"))) | 250 || nm.substr (nm_len-4) == ".mex")) |
| 251 || (nm_len > 2 | |
| 252 && nm.substr (nm_len-2) == ".m"))) | |
| 251 file = nm; | 253 file = nm; |
| 252 else | 254 else |
| 253 { | 255 { |
| 254 // We don't want to make this an absolute name, | 256 // We don't want to make this an absolute name, |
| 255 // because load_fcn_file looks at the name to | 257 // because load_fcn_file looks at the name to |