[rkward-cvs] SF.net SVN: rkward:[3881] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3881
          http://rkward.svn.sourceforge.net/rkward/?rev=3881&view=rev
Author:   tfry
Date:     2011-10-04 15:28:40 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
Do not treat arrays as hierarchical named objects

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rkstructuregetter.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-10-04 14:54:13 UTC (rev 3880)
+++ trunk/rkward/ChangeLog	2011-10-04 15:28:40 UTC (rev 3881)
@@ -1,4 +1,5 @@
 --- Version 0.5.7 - Oct-XX-2011
+- Do not treat arrays (which are not a matrix) as hierarchical named objects in the object browser
 - Do not analyse more than 100000 name child-objects per object (avoids hangs on such extreme data)
 - Fix problems with using mclapply() inside RKWard
 - Offer to add a new library location, automatically, if location selected for installation is not writable

Modified: trunk/rkward/rkward/rbackend/rkstructuregetter.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkstructuregetter.cpp	2011-10-04 14:54:13 UTC (rev 3880)
+++ trunk/rkward/rkward/rbackend/rkstructuregetter.cpp	2011-10-04 15:28:40 UTC (rev 3881)
@@ -215,7 +215,6 @@
 	}
 
 	if (RKRSupport::callSimpleBool (is_matrix_fun, value, R_BaseEnv)) type |= RObject::Matrix;
-	if (RKRSupport::callSimpleBool (is_array_fun, value, R_BaseEnv)) type |= RObject::Array;
 	if (RKRSupport::callSimpleBool (is_list_fun, value, R_BaseEnv)) type |= RObject::List;
 
 	if (type != 0) {
@@ -235,6 +234,8 @@
 			else if (RKRSupport::callSimpleBool (is_numeric_fun, value, R_BaseEnv)) type |= RObject::Numeric;
 			else if (RKRSupport::callSimpleBool (is_character_fun, value, R_BaseEnv)) type |= RObject::Character;
 			else if (RKRSupport::callSimpleBool (is_logical_fun, value, R_BaseEnv)) type |= RObject::Logical;
+
+			if (RKRSupport::callSimpleBool (is_array_fun, value, R_BaseEnv)) type |= RObject::Array;
 		}
 	}
 	type |= add_type_flags;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.