[Redbutton-devel] SF.net SVN: redbutton: [407] redbutton-author/trunk

[<ski...@us...>]

Revision: 407
          http://redbutton.svn.sourceforge.net/redbutton/?rev=407&view=rev
Author:   skilvington
Date:     2007-09-21 08:52:33 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
ContentReference has different tags in different places

Modified Paths:
--------------
    redbutton-author/trunk/asn1tag.h
    redbutton-author/trunk/grammar

Modified: redbutton-author/trunk/asn1tag.h
===================================================================
--- redbutton-author/trunk/asn1tag.h	2007-09-21 12:55:18 UTC (rev 406)
+++ redbutton-author/trunk/asn1tag.h	2007-09-21 15:52:33 UTC (rev 407)
@@ -123,7 +123,7 @@
 #define ASN1TAG_ProgramConnectionTag	66
 #define ASN1TAG_OriginalValue	67
 #define ASN1TAG_ObjectReferenceValue	68
-#define ASN1TAG_ContentReferenceValue	69
+#define ASN1TAG_ContentReference69	69
 #define ASN1TAG_MovementTable	70
 #define ASN1TAG_TokenGroupItems	71
 #define ASN1TAG_NoTokenActionSlots	72
@@ -374,7 +374,7 @@
 #define ASN1TAGCLASS_ProgramConnectionTag	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_ProgramConnectionTag)
 #define ASN1TAGCLASS_OriginalValue	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_OriginalValue)
 #define ASN1TAGCLASS_ObjectReferenceValue	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_ObjectReferenceValue)
-#define ASN1TAGCLASS_ContentReferenceValue	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_ContentReferenceValue)
+#define ASN1TAGCLASS_ContentReference69	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_ContentReference69)
 #define ASN1TAGCLASS_MovementTable	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_MovementTable)
 #define ASN1TAGCLASS_TokenGroupItems	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_TokenGroupItems)
 #define ASN1TAGCLASS_NoTokenActionSlots	((ASN1CLASS_CONTEXT << 24) | ASN1TAG_NoTokenActionSlots)
@@ -588,7 +588,7 @@
 #define ASN1TAGCLASS_EventType	ASN1TAGCLASS_ENUMERATED
 #define ASN1TAGCLASS_EventData	ASN1TAG_CHOICE
 #define ASN1TAGCLASS_ObjectReference	ASN1TAG_SYNTHETIC
-#define ASN1TAGCLASS_ContentReference	ASN1TAG_SYNTHETIC
+#define ASN1TAGCLASS_ContentReferenceValue	ASN1TAG_SYNTHETIC
 #define ASN1TAGCLASS_TargetElement	ASN1TAGCLASS_INTEGER
 #define ASN1TAGCLASS_AVisible	ASN1TAG_SYNTHETIC
 #define ASN1TAGCLASS_Position	ASN1TAGCLASS_SEQUENCE
@@ -730,6 +730,8 @@
 #define ASN1TAGCLASS_PointList  ASN1TAGCLASS_SEQUENCE
 /* added by me to get an explicit SEQUENCE under NoTokenActionSlot */
 #define ASN1TAGCLASS_ActionClassSeq	ASN1TAGCLASS_SEQUENCE
+/* ContentReference is [69] except in ReferencedContent */
+#define ASN1TAGCLASS_ContentReference	ASN1TAG_SYNTHETIC
 
 #endif	/* __ASN1TAG_H__ */
 

Modified: redbutton-author/trunk/grammar
===================================================================
--- redbutton-author/trunk/grammar	2007-09-21 12:55:18 UTC (rev 406)
+++ redbutton-author/trunk/grammar	2007-09-21 15:52:33 UTC (rev 407)
@@ -199,7 +199,7 @@
 				| ObjectReferenceValue
 				| ContentReferenceValue .
 ObjectReferenceValue	::= ":ObjectRef" ObjectReference .
-ContentReferenceValue	::= ":ContentRef" ContentReference .
+ContentReferenceValue	::= ":ContentRef" ContentReference69 .
 
 
 // B.4.15 BooleanVariable Class
@@ -905,12 +905,14 @@
 ObjectNumber		::= INTEGER .
 
 ContentReference	::= OctetString .
+// srk - ContentReference is [69] except in ReferencedContent
+ContentReference69	::= OctetString .
 
 GenericObjectReference	::= DirectReference | IndirectReference .
 DirectReference		::= ObjectReference .
 IndirectReference	::= ":IndirectRef" ObjectReference .
 
-GenericContentReference	::= ContentReference | IndirectReference .
+GenericContentReference	::= ContentReference69 | IndirectReference .
 
 GenericInteger		::= INTEGER | IndirectReference .
 


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