[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Reflection/Emit AssemblyBuilder.cs, 1.12, 1.13 ILGenerator.cs, 1.16, 1.17

[Richard Baumann <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Reflection/Emit
In directory subversions:/tmp/cvs-serv12810/runtime/System/Reflection/Emit

Modified Files:
        AssemblyBuilder.cs ILGenerator.cs 
Log Message:
Fixes for path handling in sys.io Path.cs and in ref.emit 
AssemblyBuilder.cs, and fixes to ref.emit ILGenerator.cs for handling 
labels.


Index: AssemblyBuilder.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Reflection/Emit/AssemblyBuilder.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** AssemblyBuilder.cs  25 Jul 2003 08:33:37 -0000      1.12
--- AssemblyBuilder.cs  5 Aug 2003 05:13:03 -0000       1.13
***************
*** 54,58 ****
                        {
                                this.access = access;
!                               this.directory = directory;
                                this.isSynchronized = isSynchronized;
                                this.saved = false;
--- 54,58 ----
                        {
                                this.access = access;
!                               this.directory = (directory == null) ? "." : 
directory;
                                this.isSynchronized = isSynchronized;
                                this.saved = false;
***************
*** 335,341 ****
                                        throw new InvalidOperationException(/* 
TODO */);
                                }
                                /* TODO: the rest of the exception throwing 
checks */
-                               String path = directory+assemblyFileName;
-                               /* TODO: checks on the dir and filename */
                                IntPtr entry = IntPtr.Zero;
                                if (entryPoint != null)
--- 335,345 ----
                                        throw new InvalidOperationException(/* 
TODO */);
                                }
+                               directory = Path.GetFullPath(directory);
+                               if (!Directory.Exists(directory))
+                               {
+                                       throw new ArgumentException(/* TODO */);
+                               }
+                               String path = Path.Combine(directory, 
assemblyFileName);
                                /* TODO: the rest of the exception throwing 
checks */
                                IntPtr entry = IntPtr.Zero;
                                if (entryPoint != null)

Index: ILGenerator.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Reflection/Emit/ILGenerator.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** ILGenerator.cs      29 Jul 2003 02:39:57 -0000      1.16
--- ILGenerator.cs      5 Aug 2003 05:13:03 -0000       1.17
***************
*** 369,373 ****
                                        LabelInfo[] newLabels = new LabelInfo 
[numLabels * 2];
                                        Array.Copy(labels, 0, newLabels, 0, 
numLabels);
!                                       newLabels = labels;
                                }
                                return new Label(numLabels++);
--- 369,373 ----
                                        LabelInfo[] newLabels = new LabelInfo 
[numLabels * 2];
                                        Array.Copy(labels, 0, newLabels, 0, 
numLabels);
!                                       labels = newLabels;
                                }
                                return new Label(numLabels++);
***************
*** 723,727 ****
                                        if(longForm >= 0x38 && longForm <= 0x44)
                                        {
!                                               shortForm = longForm - 0x2B + 
0x38;
                                        }
                                        else
--- 723,727 ----
                                        if(longForm >= 0x38 && longForm <= 0x44)
                                        {
!                                               shortForm = longForm + 0x2B - 
0x38;
                                        }
                                        else