[Dotgnu-pnet-commits] CVS: pnet/ilasm ilasm_grammar.y,1.28,1.29

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/ilasm
In directory subversions:/tmp/cvs-serv14173/ilasm

Modified Files:
        ilasm_grammar.y 
Log Message:


Fix the processing of public keys in ilasm and ildasm.


Index: ilasm_grammar.y
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilasm/ilasm_grammar.y,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** ilasm_grammar.y     13 Jan 2003 21:09:32 -0000      1.28
--- ilasm_grammar.y     30 Jan 2003 10:16:45 -0000      1.29
***************
*** 497,500 ****
--- 497,534 ----
  }
  
+ /*
+  * Set the originator for the current assembly definition or reference.
+  */
+ static void SetOriginator(char *orig, int len, int fullOriginator)
+ {
+       if(ILAsmCurrAssemblyRef)
+       {
+               if(!ILAssemblySetOriginator(ILAsmCurrAssemblyRef,
+                                                                       (const 
void *)orig,
+                                                                       
(unsigned long)(long)len))
+               {
+                       ILAsmOutOfMemory();
+               }
+               if(fullOriginator)
+               {
+                       ILAssemblySetRefAttrs(ILAsmCurrAssemblyRef,
+                                                                 
IL_META_ASSEMREF_FULL_ORIGINATOR,
+                                                                 
IL_META_ASSEMREF_FULL_ORIGINATOR);
+               }
+       }
+       else
+       {
+               if(!ILAssemblySetOriginator(ILAsmAssembly,
+                                                                       (const 
void *)orig,
+                                                                       
(unsigned long)(long)len))
+               {
+                       ILAsmOutOfMemory();
+               }
+               ILAssemblySetAttrs(ILAsmAssembly,
+                                                  IL_META_ASSEM_PUBLIC_KEY,
+                                                  IL_META_ASSEM_PUBLIC_KEY);
+       }
+ }
+ 
  %}
  
***************
*** 3102,3108 ****
  
  AsmOrRefDeclaration
!       : D_ORIGINATOR '=' Bytes
!       | D_PUBLICKEY '=' Bytes
!       | D_PUBLICKEYTOKEN '=' Bytes
        | D_VER Integer32 ':' Integer32 ':' Integer32 ':' Integer32     {
                                /* Set the assembly version */
--- 3136,3148 ----
  
  AsmOrRefDeclaration
!       : D_ORIGINATOR '=' Bytes        {
!                                       SetOriginator($3.string, $3.len, 1);
!                               }
!       | D_PUBLICKEY '=' Bytes         {
!                                       SetOriginator($3.string, $3.len, 1);
!                               }
!       | D_PUBLICKEYTOKEN '=' Bytes    {
!                                       SetOriginator($3.string, $3.len, 0);
!                               }
        | D_VER Integer32 ':' Integer32 ':' Integer32 ':' Integer32     {
                                /* Set the assembly version */