expand more conditions, zap gotos

PDLPorters · May 1, 2024 · d979490 · d979490
1 parent 6051131
commit d979490
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/Libtmp/ImageND/imagend.pd b/Libtmp/ImageND/imagend.pd
@@ -813,28 +813,20 @@ loop (n=:-1,m=:-1) %{
   if (brk_0010 && brk_1011) {
     PDL_LINESEG(m,n,m1,n,m1,n,m1,n1,$c(),p); /* from m,n right, stretched right/down */
     found = -1;
-    goto end_x_intersect_$PPSYM();
   }
-  if (brk_0010 && brk_0001) {
+  if (brk_0010 && brk_0001 && !brk_1011) {
     PDL_LINESEG(m,n,m1,n,m,n,m,n1,$c(),p); /* loop m,n, stretched right/down */
     found = 1;
-    goto end_y_intersect_$PPSYM();
   }
-  if (brk_0010 && brk_0111)
+  if (brk_0010 && brk_0111 && !brk_1011 && !brk_0001)
     PDL_LINESEG(m,n,m1,n,m,n1,m1,n1,$c(),p); /* from m,n down, both stretched right */
-  if (brk_0010) continue;
-end_x_intersect_$PPSYM():
-  if (brk_0001 && brk_0111) {
+  if (brk_0001 && brk_0111 && !(brk_0010 && !brk_1011)) {
     PDL_LINESEG(m,n,m,n1,m,n1,m1,n1,$c(),p); /* from m,n downward, stretched down/right */
     if (found == -1) continue;
     found = 1;
-    goto end_y_intersect_$PPSYM();
   }
-  if (found == 0 && brk_0001 && brk_1011) {
+  if (found == 0 && brk_0001 && !brk_0111 && brk_1011)
     PDL_LINESEG(m,n,m,n1,m1,n,m1,n1,$c(),p); /* from m,n rightward, both stretched downward */
-    continue;
-  }
-end_y_intersect_$PPSYM():
   if ((found == 0 || found == 1) && brk_0111 && brk_1011)
     PDL_LINESEG(m1,n,m1,n1,m,n1,m1,n1,$c(),p); /* from m1,n down/left, stretched down/left */
 %}