[Rprotobuf-commits] r315 - in pkg: . R

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

Author: romain
Date: 2010-05-08 12:03:36 +0200 (Sat, 08 May 2010)
New Revision: 315

Modified:
   pkg/DESCRIPTION
   pkg/R/00classes.R
   pkg/R/aslist.R
   pkg/R/size.R
Log:
keep moving code

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-05-08 10:03:20 UTC (rev 314)
+++ pkg/DESCRIPTION	2010-05-08 10:03:36 UTC (rev 315)
@@ -7,7 +7,7 @@
 Description: Protocol Buffers are a way of encoding structured data in an
  efficient yet extensible format. Google uses Protocol Buffers for almost all
  of its internal RPC protocols and file formats.  
-Depends: R (>= 2.11.0), RCurl, Rcpp (>= 0.7.12.9), methods
+Depends: R (>= 2.11.0), RCurl, Rcpp (>= 0.7.12.11), methods
 LinkingTo: Rcpp
 Suggests: RUnit, highlight
 SystemRequirements: Protocol Buffer compiler (to create C++ header and source files

Modified: pkg/R/00classes.R
===================================================================
--- pkg/R/00classes.R	2010-05-08 10:03:20 UTC (rev 314)
+++ pkg/R/00classes.R	2010-05-08 10:03:36 UTC (rev 315)
@@ -153,7 +153,7 @@
 		"has" = function( ... )      .Call( "Message__has_field"     , x at pointer, ..., PACKAGE = "RProtoBuf"), 
 		"clone" = function( ... )    .Call( "Message__clone"         , x at pointer, ..., PACKAGE = "RProtoBuf"), 
 		"isInitialized" = function() .Call( "Message__is_initialized", x at pointer,      PACKAGE = "RProtoBuf"),    
-		"descriptor" = function()    .Call("Message__descriptor"     , x at pointer,      PACKAGE = "RProtoBuf" ), 
+		"descriptor" = function()    .Call( "Message__descriptor"     , x at pointer,      PACKAGE = "RProtoBuf" ), 
 		
 		"size"  = function(field, ...) size(x, field, ... ),
 		"bytesize" = function() bytesize(x), 
@@ -497,19 +497,19 @@
 
 # {{{ as
 setAs("Descriptor", "Message", function(from){
-	.Call( "asMessage_Descriptor", from at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "Descriptor__as_Message", from at pointer, PACKAGE = "RProtoBuf" )
 })
 setAs("FieldDescriptor", "Message", function(from){
-	.Call( "asMessage_FieldDescriptor", from at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "FieldDescriptor__as_Message", from at pointer, PACKAGE = "RProtoBuf" )
 })
 setAs("EnumDescriptor", "Message", function(from){
-	.Call( "asMessage_EnumDescriptor", from at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "EnumDescriptor__as_Message", from at pointer, PACKAGE = "RProtoBuf" )
 })
 setAs("ServiceDescriptor", "Message", function(from){
-	.Call( "asMessage_ServiceDescriptor", from at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "ServiceDescriptor__as_Message", from at pointer, PACKAGE = "RProtoBuf" )
 })
 setAs("MethodDescriptor", "Message", function(from){
-	.Call( "asMessage_MethodDescriptor", from at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "MethodDescriptor__as_Message", from at pointer, PACKAGE = "RProtoBuf" )
 })
 setAs("FileDescriptor", "Message", function(from){
 	.Call( "asMessage_FileDescriptor", from at pointer, PACKAGE = "RProtoBuf" )

Modified: pkg/R/aslist.R
===================================================================
--- pkg/R/aslist.R	2010-05-08 10:03:20 UTC (rev 314)
+++ pkg/R/aslist.R	2010-05-08 10:03:36 UTC (rev 315)
@@ -11,6 +11,6 @@
 	.Call( "as_list_file_descriptor", x at pointer, PACKAGE = "RProtoBuf" )
 }
 as.list.ServiceDescriptor <- function( x, ...){
-	.Call( "as_list_service_descriptor", x at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "ServiceDescriptor__as_list", x at pointer, PACKAGE = "RProtoBuf" )
 }
 

Modified: pkg/R/size.R
===================================================================
--- pkg/R/size.R	2010-05-08 10:03:20 UTC (rev 314)
+++ pkg/R/size.R	2010-05-08 10:03:36 UTC (rev 315)
@@ -3,7 +3,7 @@
 	standardGeneric( "bytesize" )
 } )
 setMethod( "bytesize", "Message", function(object, ...){
-	.Call( "get_message_bytesize", object at pointer, PACKAGE = "RProtoBuf" )
+	.Call( "Message__bytesize", object at pointer, PACKAGE = "RProtoBuf" )
 } )
 
 setGeneric( "size", function( object, field, ... ){
@@ -12,7 +12,7 @@
 setMethod( "size", "Message", function(object, field, ...){
 	
 	if( is.character( field ) || is.numeric( field ) ){
-		.Call( "get_field_size", object at pointer, field, PACKAGE = "RProtoBuf" )
+		.Call( "Message__field_size", object at pointer, field, PACKAGE = "RProtoBuf" )
 	} else{
 		stop( "field should be a character or a number" )
 	}