[genius] Sun Apr 22 17:53:07 2012 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit 66238d358a7971c946ca07bc33fdc604c684ea6d
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Sun Apr 22 17:53:10 2012 -0500

    Sun Apr 22 17:53:07 2012  Jiri (George) Lebl <jirka 5z com>
    
    	* src/structs.h, src/eval.c: MatrixRow tree node is also
    	  used in expanding matrices, not just entering, so
    	  gint16 was just not enough for width.  So can now
    	  handle wider matrices in expansion.

 ChangeLog     |    7 +++++++
 src/eval.c    |    6 +++---
 src/structs.h |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2ae5903..1d639a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr 22 17:53:07 2012  Jiri (George) Lebl <jirka 5z com>
+
+	* src/structs.h, src/eval.c: MatrixRow tree node is also
+	  used in expanding matrices, not just entering, so
+	  gint16 was just not enough for width.  So can now
+	  handle wider matrices in expansion.
+
 Wed Apr 11 16:56:15 2012  Jiri (George) Lebl <jirka 5z com>
 
 	* src/symbolic.c: fix derivatives of Im and Re to be the z
diff --git a/src/eval.c b/src/eval.c
index 2f2dfef..10baa85 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1231,9 +1231,9 @@ gel_expandmatrix (GelETree *n)
 	cols = gel_matrixw_width (nm);
 
 	for (i = 0, k = 0; i < h; i++) {
-		int w;
-		w = expand_row (m, nm, k, i, &need_colwise);
-		k += w;
+		int kk;
+		kk = expand_row (m, nm, k, i, &need_colwise);
+		k += kk;
 	}
 
 	if (k == 0) {
diff --git a/src/structs.h b/src/structs.h
index b01321a..0b80573 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -294,7 +294,7 @@ struct _GelETreeBool {
 struct _GelETreeMatrixRow {
 	GelETreeType type;
 	GelETree *next;
-	gint16 nargs;
+	guint32 nargs;
 	GelETree *args;
 };