Python header: Rename 'make_matrix_or_array' -> 'make_2d_sym'.

Generalises 'make_matrix_or_array' so that we can choose to represent
non-Matrix 2D sym to be something other than an Array in the
future. For example, we could use TableForm.

WIP: Run 'grep -r make_matrix_or_array' to check if change is
complete.  Not sure if this is needed anymore as TableForm was shown
to be lacking various features such as indexing and taking
transpose. No other candidates are being considered at the moment.

* inst/private/{python_header.py,python_ipc_native.m}: Rename function
'make_matrix_or_array' -> 'make_2d_sym', variable 'dbg_no_array' ->
'dbg_matrix_only' and adjust accordingly.
* inst/@sym/private/mat_rclist_{access,asgn}.m: Adjust accordingly.
* inst/@sym/vertcat.m: Adjust accordingly.

Author: Alex Vong

inst/@sym/private/mat_rclist_access.m

@@ -36,7 +36,7 @@
   cmd = {'(A, rr, cc) = _ins'
          'AA = A.tolist() if isinstance(A, (MatrixBase, NDimArray)) else [[A]]'
          'MM = [[AA[i][j]] for i, j in zip(rr, cc)]'
-         'M = make_matrix_or_array(MM)'
+         'M = make_2d_sym(MM)'
          'return M,'};
 
   rr = num2cell(int32(r-1));

inst/@sym/private/mat_rclist_asgn.m

@@ -83,7 +83,7 @@
          'n = max(max(rr) + 1, nrows_A)'
          'm = max(max(cc) + 1, ncols_A)'
          'MM = [[entry(i, j) for j in range(m)] for i in range(n)]'
-         'M = make_matrix_or_array(MM)'
+         'M = make_2d_sym(MM)'
          'return M,'};
 
   rr = num2cell(int32(r-1));

inst/@sym/vertcat.m

@@ -60,7 +60,7 @@
          '    raise ShapeError(msg)'
          'CCC = [as_list_of_list(x) for x in args]'
          'CC = flatten(CCC, levels=1)'
-         'return make_matrix_or_array(CC)'};
+         'return make_2d_sym(CC)'};
 
   args = cellfun (@sym, varargin, 'UniformOutput', false);
   h = pycall_sympy__ (cmd, args{:});

inst/private/python_header.py

@@ -241,27 +241,27 @@ def octoutput(x, et):
 
 
 try:
-    def make_matrix_or_array(it_of_it, dbg_no_array=False):
+    def make_2d_sym(it_of_it, dbg_matrix_only=False):
         # should be kept in sync with the same function
         # defined in inst/private/python_ipc_native.m
-        # FIXME: dbg_no_array is currently used for debugging,
-        # remove it once sympy drops non-Expr supp in Matrix
+        # FIXME: dbg_matrix_only is used for debugging, remove
+        # it once sympy drops non-Expr support in Matrix
         """
-        Given an iterable of iterables of syms IT_OF_IT
-        If all elements of IT_OF_IT are Expr,
-        construct the corresponding Matrix.
-        Otherwise, construct the corresponding 2D array.
+        Given an iterable of iterables of syms IT_OF_IT.
+        If all elements of IT_OF_IT are Expr, construct the
+        corresponding Matrix. Otherwise, construct the
+        corresponding non-Matrix 2D sym.
         """
         ls_of_ls = [[elt for elt in it] for it in it_of_it]
         elts = flatten(ls_of_ls, levels=1)
         if Version(spver) <= Version("1.11.1"):
             # never use Array on older SymPy
-            dbg_no_array = True
-        if (dbg_no_array
+            dbg_matrix_only = True
+        if (dbg_matrix_only
             or all(isinstance(elt, Expr) for elt in elts)):
             return Matrix(ls_of_ls)
         else:
-            dbout(f"make_matrix_or_array: making 2D Array...")
+            dbout(f"make_2d_sym: constructing 2D sym...")
             return Array(ls_of_ls)
 except:
     echo_exception_stdout("in python_header defining fcns block 5")

inst/private/python_ipc_native.m

@@ -111,27 +111,27 @@
                     '    # should be kept in sync with the same function'
                     '    # defined in inst/private/python_header.py'
                     '    sys.stderr.write("pydebug: " + str(l) + "\n")'
-                    'def make_matrix_or_array(it_of_it, dbg_no_array=False):'
+                    'def make_2d_sym(it_of_it, dbg_matrix_only=False):'
                     '    # should be kept in sync with the same function'
                     '    # defined in inst/private/python_header.py'
-                    '    # FIXME: dbg_no_array is currently used for debugging,'
-                    '    # remove it once sympy drops non-Expr supp in Matrix'
+                    '    # FIXME: dbg_matrix_only is used for debugging, remove'
+                    '    # it once sympy drops non-Expr support in Matrix'
                     '    """'
-                    '    Given an iterable of iterables of syms IT_OF_IT'
-                    '    If all elements of IT_OF_IT are Expr,'
-                    '    construct the corresponding Matrix.'
-                    '    Otherwise, construct the corresponding 2D array.'
+                    '    Given an iterable of iterables of syms IT_OF_IT.'
+                    '    If all elements of IT_OF_IT are Expr, construct the'
+                    '    corresponding Matrix. Otherwise, construct the'
+                    '    corresponding non-Matrix 2D sym.'
                     '    """'
                     '    ls_of_ls = [[elt for elt in it] for it in it_of_it]'
                     '    elts = flatten(ls_of_ls, levels=1)'
                     '    if Version(spver) <= Version("1.11.1"):'
                     '        # never use Array on older SymPy'
-                    '        dbg_no_array = True'
-                    '    if (dbg_no_array'
+                    '        dbg_matrix_only = True'
+                    '    if (dbg_matrix_only'
                     '        or all(isinstance(elt, Expr) for elt in elts)):'
                     '        return Matrix(ls_of_ls)'
                     '    else:'
-                    '        dbout(f"make_matrix_or_array: making 2D Array...")'
+                    '        dbout(f"make_2d_sym: constructing 2D sym...")'
                     '        return Array(ls_of_ls)'
                   }, newl))
     have_headers = true;