Mercurial > octave

changeset 21169:40051830f89b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Replace more instances of goto in liboctave with other constructs. *dMatrix.cc: (operator >>): Replace "goto done;" with "return is;". *dNDArray.cc: (operator >>): Replace "goto done;" with "return is;". *fCMatrix.cc: (operator >>): Replace "goto done;" with "return is;". *fCNDArray.cc: (operator >>): Replace "goto done;" with "return is;". *fMatrix.cc: (operator >>): Replace "goto done;" with "return is;". *fNDArray.cc: (operator >>): Replace "goto done;" with "return is;". *intNDArray.cc: (operator >>): Replace "goto done;" with "return is;".
author Rik <rik@octave.org>
date Mon, 01 Feb 2016 13:33:13 -0800
parents 26f85aa072de
children 1edaf1ee65eb
files liboctave/array/dMatrix.cc liboctave/array/dNDArray.cc liboctave/array/fCMatrix.cc liboctave/array/fCNDArray.cc liboctave/array/fMatrix.cc liboctave/array/fNDArray.cc liboctave/array/intNDArray.cc
diffstat 7 files changed, 7 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/dMatrix.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/dMatrix.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -2920,12 +2920,10 @@
             if (is)
               a.elem (i, j) = tmp;
             else
-              goto done;
+              return is;
           }
     }
 
-done:
-
   return is;
 }
 
--- a/liboctave/array/dNDArray.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/dNDArray.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -892,12 +892,10 @@
           if (is)
             a.elem (i) = tmp;
           else
-            goto done;
+            return is;
         }
     }
 
-done:
-
   return is;
 }
 
--- a/liboctave/array/fCMatrix.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/fCMatrix.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -3465,12 +3465,10 @@
             if (is)
               a.elem (i, j) = tmp;
             else
-              goto done;
+              return is;
           }
     }
 
-done:
-
   return is;
 }
 
--- a/liboctave/array/fCNDArray.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/fCNDArray.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -878,12 +878,10 @@
           if (is)
             a.elem (i) = tmp;
           else
-            goto done;
+            return is;
         }
     }
 
-done:
-
   return is;
 }
 
--- a/liboctave/array/fMatrix.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/fMatrix.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -2937,12 +2937,10 @@
             if (is)
               a.elem (i, j) = tmp;
             else
-              goto done;
+              return is;
           }
     }
 
-done:
-
   return is;
 }
 
--- a/liboctave/array/fNDArray.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/fNDArray.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -863,12 +863,10 @@
           if (is)
             a.elem (i) = tmp;
           else
-            goto done;
+            return is;
         }
     }
 
-done:
-
   return is;
 }
 
--- a/liboctave/array/intNDArray.cc	Mon Feb 01 13:29:21 2016 -0800
+++ b/liboctave/array/intNDArray.cc	Mon Feb 01 13:33:13 2016 -0800
@@ -168,12 +168,10 @@
           if (is)
             a.elem (i) = tmp;
           else
-            goto done;
+            return is;
         }
     }
 
-done:
-
   return is;
 }