[Redbutton-devel] SF.net SVN: redbutton: [450] redbutton-author/trunk/ccc.y

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

Revision: 450
          http://redbutton.svn.sourceforge.net/redbutton/?rev=450&view=rev
Author:   skilvington
Date:     2007-10-18 09:20:22 -0700 (Thu, 18 Oct 2007)

Log Message:
-----------
use is_Xxx() functions when decoding CHOICE types

Modified Paths:
--------------
    redbutton-author/trunk/ccc.y

Modified: redbutton-author/trunk/ccc.y
===================================================================
--- redbutton-author/trunk/ccc.y	2007-10-18 16:09:40 UTC (rev 449)
+++ redbutton-author/trunk/ccc.y	2007-10-18 16:20:22 UTC (rev 450)
@@ -1008,7 +1008,7 @@
 				buf_append(&state.decode_is_fns, "\t\treturn ");
 			else
 				buf_append(&state.decode_is_fns, "\t\t    || ");
-			buf_append(&state.decode_is_fns, "MATCH_TAGCLASS(class, number, ASN1TAGCLASS_%s)", item->name);
+			buf_append(&state.decode_is_fns, "is_%s(class, number)", item->name);
 			/* is it the last */
 			if(item->next == NULL)
 				buf_append(&state.decode_is_fns, ";");
@@ -1019,7 +1019,7 @@
 			else
 				buf_append(&state.decode_fns, "\telse ");
 /* TODO: does GenericObjectReference_direct_reference need a fseek(pretag) */
-			buf_append(&state.decode_fns, "if(MATCH_TAGCLASS(tag.class, tag.number, ASN1TAGCLASS_%s))\n\t{\n", item->name);
+			buf_append(&state.decode_fns, "if(is_%s(tag.class, tag.number))\n\t{\n", item->name);
 			buf_append(&state.decode_fns, "\t\tif((sublen = asn1decode_%s(der, out, tag.length)) < 0)\n", item->name);
 			buf_append(&state.decode_fns, "\t\t\treturn der_error(\"%s\");\n", name);
 			buf_append(&state.decode_fns, "\t\tleft -= sublen;\n");


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