[Rprotobuf-commits] r539 - in pkg: . inst/unitTests src

[noreply at r-forge.r-project.org]

Author: murray
Date: 2013-11-14 02:46:46 +0100 (Thu, 14 Nov 2013)
New Revision: 539

Modified:
   pkg/ChangeLog
   pkg/inst/unitTests/runit.import.R
   pkg/src/lookup.cpp
Log:
Check in change I made last month addressing a bug Sundar found
whereby RProtoBuf prevents you from being able to use <<- in your
code.



Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-09-17 06:56:56 UTC (rev 538)
+++ pkg/ChangeLog	2013-11-14 01:46:46 UTC (rev 539)
@@ -1,3 +1,11 @@
+2013-10-23  Murray Stokely  <murray at FreeBSD.org>
+
+	* src/lookup.cpp (rprotobuf): Remove stop() error in object table
+	  assignment as this was causing errors with the '<<-' operator in
+	  any code using RProtoBuf.
+	* inst/unitTests/runit.import.R (test.assign.in.global): Add a
+	  test for the above.
+
 2013-09-16  Murray Stokely  <murray at FreeBSD.org>
 
 	* DESCRIPTION (Version): Increment to 0.3.1.1.

Modified: pkg/inst/unitTests/runit.import.R
===================================================================
--- pkg/inst/unitTests/runit.import.R	2013-09-17 06:56:56 UTC (rev 538)
+++ pkg/inst/unitTests/runit.import.R	2013-11-14 01:46:46 UTC (rev 539)
@@ -18,3 +18,8 @@
   # Verify that we get a graceful error rather than a segfault.
   checkException(readProtoFiles("/etc/hosts"))
 }
+
+test.assign.in.global <- function() {
+  xx.undef <<- 3
+  checkEquals(xx.undef, 3)
+}

Modified: pkg/src/lookup.cpp
===================================================================
--- pkg/src/lookup.cpp	2013-09-17 06:56:56 UTC (rev 538)
+++ pkg/src/lookup.cpp	2013-11-14 01:46:46 UTC (rev 539)
@@ -175,7 +175,6 @@
 #ifdef LOOKUP_DEBUG
  Rprintf( "  >> rProtoBufTable_assign( %s ) \n", name ); 
 #endif
-    Rf_error("can't assign to protocol buffer descriptor pool");
  	return(R_NilValue); // make -Wall happy
 }