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

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

Revision: 405
          http://redbutton.svn.sourceforge.net/redbutton/?rev=405&view=rev
Author:   skilvington
Date:     2007-09-20 09:10:41 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
add a token to the grammar to make ActionClass sequences get tagged correctly

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

Modified: redbutton-author/trunk/asn1tag.h
===================================================================
--- redbutton-author/trunk/asn1tag.h	2007-09-20 13:05:06 UTC (rev 404)
+++ redbutton-author/trunk/asn1tag.h	2007-09-20 16:10:41 UTC (rev 405)
@@ -725,9 +725,11 @@
 #define ASN1TAGCLASS_ActionSlots ASN1TAGCLASS_SEQUENCE
 #define ASN1TAGCLASS_InVariables ASN1TAGCLASS_SEQUENCE
 #define ASN1TAGCLASS_OutVariables ASN1TAGCLASS_SEQUENCE
-#define ASN1TAGCLASS_ActionClass ASN1TAGCLASS_SEQUENCE
+#define ASN1TAGCLASS_ActionClass ASN1TAG_SYNTHETIC
 #define ASN1TAGCLASS_Parameters  ASN1TAGCLASS_SEQUENCE
 #define ASN1TAGCLASS_PointList  ASN1TAGCLASS_SEQUENCE
+/* added by me to get an explicit SEQUENCE under NoTokenActionSlot */
+#define ASN1TAGCLASS_ActionClassSeq	ASN1TAGCLASS_SEQUENCE
 
 #endif	/* __ASN1TAG_H__ */
 

Modified: redbutton-author/trunk/asn1type.c
===================================================================
--- redbutton-author/trunk/asn1type.c	2007-09-20 13:05:06 UTC (rev 404)
+++ redbutton-author/trunk/asn1type.c	2007-09-20 16:10:41 UTC (rev 405)
@@ -212,6 +212,7 @@
 	MATCH(GetFocusPosition, SEQUENCE)
 	MATCH(SetFocusPosition, SEQUENCE)
 	MATCH(OctetString, CHOICE);
+	MATCH(ActionSlotSeq, CHOICE);
 
 	fprintf(stderr, "Unknown ASN1 type: %s\n", name);
 	exit(EXIT_FAILURE);

Modified: redbutton-author/trunk/grammar
===================================================================
--- redbutton-author/trunk/grammar	2007-09-20 13:05:06 UTC (rev 404)
+++ redbutton-author/trunk/grammar	2007-09-20 16:10:41 UTC (rev 405)
@@ -250,9 +250,11 @@
 AVisible		::= ObjectReference .
 ActionSlots		::= ":ActionSlots" "(" ActionSlot+ ")" .
 ActionSlot		::= ActionClass | Null .
-NoTokenActionSlots	::= ":NoTokenActionSlots" "(" ActionSlot+ ")" .
+NoTokenActionSlots	::= ":NoTokenActionSlots" "(" ActionSlotSeq+ ")" .
+// srk - to get an explicit SEQUENCE tag under NoTokenActionSlots
+ActionSlotSeq		::= ActionClassSeq | Null .
+ActionClassSeq		::= ActionClass .
 
-
 // B.4.23 ListGroup Class
 
 ListGroupClass		::= "{:ListGroup" TokenGroupBody


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