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

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

Author: murray
Date: 2013-12-19 06:13:16 +0100 (Thu, 19 Dec 2013)
New Revision: 579

Modified:
   pkg/ChangeLog
   pkg/R/completion.R
Log:
Add missing completion class for EnumValueDescriptor, and also add
missing 'has' method for EnumDescriptor.



Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-12-19 05:12:23 UTC (rev 578)
+++ pkg/ChangeLog	2013-12-19 05:13:16 UTC (rev 579)
@@ -1,3 +1,9 @@
+2013-12-18  Murray Stokely  <murray at FreeBSD.org>
+
+	* R/completion.R (.DollarNames.EnumValueDescriptor): Add
+	  $-completion for EnumValueDescriptor class as with other S4
+	  RProtoBuf classes here.
+
 2013-12-18  Dirk Eddelbuettel  <edd at debian.org>
 
 	* vignettes/RProtoBuf-intro.Rnw: Use with vignette builder

Modified: pkg/R/completion.R
===================================================================
--- pkg/R/completion.R	2013-12-19 05:12:23 UTC (rev 578)
+++ pkg/R/completion.R	2013-12-19 05:13:16 UTC (rev 579)
@@ -44,11 +44,20 @@
 	names <- c( 
 		.Call( "EnumDescriptor__getConstantNames", x at pointer, PACKAGE = "RProtoBuf" ), 
 		"name(", "fileDescriptor()", "as.character()", "toString()", 
-		"containing_type()", "length()", "value_count()", "value(" )
+		"containing_type()", "length()", "value_count()", "value(",
+		"has(")
 	grep( pattern, names, value = TRUE )
 }
 # }}}
 
+# {{{ EnumValueDescriptor
+.DollarNames.EnumValueDescriptor <- function(x, pattern = "" ){
+	names <- c("number()", "name()", "enum_type()",
+		   "as.character()", "toString()", "asMessage()")
+	grep( pattern, names, value = TRUE )
+}
+# }}}
+
 # {{{ FieldDescriptor
 .DollarNames.FieldDescriptor <- function(x, pattern = "" ){
 	names <- c("as.character()", "toString()", "name(",