start reworking indexing to be more sane, row-major

src/builtins/columns.pir

@@ -5,12 +5,11 @@
     .param int nargin
     .param pmc matrix
 
-    $P0 = matrix
-    $S0 = typeof $P0
-    if $S0 == 'NumMatrix2D' goto _its_an_array
+    $I0 = does matrix, "matrix"
+    if $I0 == 1 goto _its_a_matrix
     .return(1)
-  _its_an_array:
-    $P1 = getattribute $P0, "X"
+  _its_a_matrix:
+    $P1 = getattribute matrix, "cols"
     $I0 = $P1
     .return($I0)
 .end

src/builtins/rows.pir

@@ -5,12 +5,12 @@
     .param int nargin
     .param pmc matrix
 
-    $S0 = typeof matrix
-    if $S0 == 'NumMatrix2D' goto _its_an_array
+    $I0 = does matrix, "matrix"
+    if $I0 == 1 goto _its_a_matrix
     .return(1)
 
-  _its_an_array:
-    $P0 = getattribute matrix, "Y"
+  _its_a_matrix:
+    $P0 = getattribute matrix, "rows"
     $I0 = $P0
     .return($I0)
 .end

src/internals/aggregates.pir

@@ -161,50 +161,50 @@
 .sub '!_build_numerical_matrix'
     .param pmc rows
     .local pmc matrix
-    .local int x
-    .local int y
+    .local int row
+    .local int col
     .local int width
     .local int height
     matrix = new ['NumMatrix2D']
-    y = 0
+    row = 0
     height = rows
     $P0 = rows[0]
     width = $P0
   outer_loop_top:
-    x = 0
-    $P0 = rows[y]
+    col = 0
+    $P0 = rows[row]
   inner_loop_top:
-    $N0 = $P0[x]
-    matrix[x;y] = $N0
-    inc x
-    if x < width goto inner_loop_top
-    inc y
-    if y < height goto outer_loop_top
+    $N0 = $P0[col]
+    matrix[row;col] = $N0
+    inc col
+    if col < width goto inner_loop_top
+    inc row
+    if row < height goto outer_loop_top
     .return(matrix)
 .end
 
 .sub '!_build_complex_matrix'
     .param pmc rows
     .local pmc matrix
-    .local int x
-    .local int y
+    .local int col
+    .local int row
     .local int width
     .local int height
     matrix = new ['ComplexMatrix2D']
-    y = 0
+    row = 0
     height = rows
     $P0 = rows[0]
     width = $P0
   outer_loop_top:
-    x = 0
-    $P0 = rows[y]
+    col = 0
+    $P0 = rows[row]
   inner_loop_top:
-    $P1 = $P0[x]
-    matrix[x;y] = $P1
-    inc x
-    if x < width goto inner_loop_top
-    inc y
-    if y < height goto outer_loop_top
+    $P1 = $P0[col]
+    matrix[row;col] = $P1
+    inc col
+    if col < width goto inner_loop_top
+    inc row
+    if row < height goto outer_loop_top
     .return(matrix)
 .end
 

toolbox/is.m

@@ -3,7 +3,7 @@ function is(a, b, comment)
 %% tests that the two values a and b are equal. Calls ok() to handle
 %% the test output logic, so has all the same capabilities as that
 %% function.
-    if nargin == 2
+    if nargin == 3
         ok(a == b, comment);
     else
         ok(a == b);