Futher refactoring, I+LE

Author: codereport

jsrc/verbs/dyadic/take_drop.cpp

@@ -43,12 +43,11 @@ jttk0(J jt, B b, A a, A w) {
     return z;
 }
 
-static A
-jttks(J jt, A a, A w) {
+static array
+jttks(J jt, array a, array w) { // take_sparse
     PROLOG(0092);
-    A a1, q, x, y, z;
-    B c;
-    I an, m, r, *s, *u, *v;
+    array x, y, z;
+    I an, r, *s, *u, *v;
     P *wp, *zp;
     an = AN(a);
     u  = AV(a);
@@ -58,23 +57,26 @@ jttks(J jt, A a, A w) {
     v = AS(z);
     DO(an, v[i] = ABS(u[i]););
     zp = PAV(z);
-    wp = PAV(w);
+    wp = PAV(w); // pointer to array values
+
     if (an <= r) {
         RZ(a = vec(INT, r, s));
         MCISH(AV(a), u, an);
     }  // vec is not virtual
-    a1 = SPA(wp, a);
-    RZ(q = jtpaxis(jt, r, a1));
-    m = AN(a1);
+
+    auto [m, q] = [&] {
+        array const a1 = SPA(wp, a);
+        return std::pair{AN(a1), jtpaxis(jt, r, a1)};
+    } ();
+
     RZ(a = jtfrom(jt, q, a));
     u = AV(a);
     RZ(y = jtfrom(jt, q, shape(jt, w)));
     s = AV(y);
 
-    auto const b = std::mismatch(u + m, u + r, s + m).first != u + r;
+    // TODO: rename b when we figure out what it is doing
+    auto const b = std::mismatch(u + m, u + r, s + m).first != u + r; 
 
-    c = 0;
-    DO(m, if ((c = (u[i] != s[i]))) break;);
     if (b) {
         jt->fill = SPA(wp, e);
         x        = irs2(vec(INT, r - m, m + u), SPA(wp, x), 0L, 1L, -1L, reinterpret_cast<AF>(jttake));
@@ -83,7 +85,9 @@ jttks(J jt, A a, A w) {
     }  // fill cannot be virtual
     else
         x = SPA(wp, x);
-    if (c) {
+    
+    // TODO: rename b when we figure out what it is doing
+    if (auto const c = std::mismatch(u, u + m, s).first != u + m; c) {
         A j;
         C *xv, *yv;
         I d, i, *iv, *jv, k, n, t;
@@ -99,12 +103,22 @@ jttks(J jt, A a, A w) {
         yv = CAV(y);
         xv = CAV(x);
         for (i = 0; i < n; ++i) {
-            c = 0;
-            DO(m, t = u[i]; if ((c = (0 > t ? iv[i] < t + s[i] : iv[i] >= t))) break;);
-            if (!c) {
+            
+            // this is std::mismatch3 (or std::zip_find3)
+            bool cc = 0;
+            for (int64_t i = 0; i < m; ++i) {
+                t = u[i]; 
+                if (0 > t ? iv[i] < t + s[i] : iv[i] >= t) {
+                    cc = true;
+                    break;
+                }
+            }
+
+            if (!cc) {
                 ++d;
                 memcpy(yv, xv, k);
                 yv += k;
+                // TODO: use algorithm created above
                 DO(m, t = u[i]; *jv++ = 0 > t ? iv[i] - (t + s[i]) : iv[i];);
             }
             iv += m;