[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Diagnostics StackFrame.cs,1.2,1.3 StackTrace.cs,1.4,1.5

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Diagnostics
In directory subversions:/tmp/cvs-serv12653/runtime/System/Diagnostics

Modified Files:
        StackFrame.cs StackTrace.cs 
Log Message:


Mark up members of the "Reflection" ECMA subset with CONFIG_REFLECTION.


Index: StackFrame.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Diagnostics/StackFrame.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StackFrame.cs       10 Apr 2003 23:07:09 -0000      1.2
--- StackFrame.cs       15 Apr 2003 11:22:32 -0000      1.3
***************
*** 38,42 ****
--- 38,44 ----
        private int             offset;
        private int             nativeOffset;
+ #if CONFIG_REFLECTION
        private MethodBase      method;
+ #endif
  
        // Value that is returned for unknown offsets.
***************
*** 78,84 ****
        internal StackFrame(PackedStackFrame frame, bool needFileInfo)
                        {
-                               method = 
MethodBase.GetMethodFromHandle(frame.method);
                                offset = frame.offset;
                                nativeOffset = frame.nativeOffset;
                                if(needFileInfo && method != null &&
                                   offset != OFFSET_UNKNOWN)
--- 80,87 ----
        internal StackFrame(PackedStackFrame frame, bool needFileInfo)
                        {
                                offset = frame.offset;
                                nativeOffset = frame.nativeOffset;
+                       #if CONFIG_REFLECTION
+                               method = 
MethodBase.GetMethodFromHandle(frame.method);
                                if(needFileInfo && method != null &&
                                   offset != OFFSET_UNKNOWN)
***************
*** 87,90 ****
--- 90,94 ----
                                                (frame.method, offset, out 
line, out column);
                                }
+                       #endif
                        }
  
***************
*** 99,104 ****
--- 103,110 ----
  
                                        // Get the method and offset 
information.
+                               #if CONFIG_REFLECTION
                                        method = MethodBase.GetMethodFromHandle
                                                                
(InternalGetMethod(skipFrames));
+                               #endif
                                        offset = 
InternalGetILOffset(skipFrames);
                                        nativeOffset = 
InternalGetNativeOffset(skipFrames);
***************
*** 109,112 ****
--- 115,119 ----
                                        nativeOffset = OFFSET_UNKNOWN;
                                }
+                       #if CONFIG_REFLECTION
                                if(needFileInfo && method != null &&
                                   offset != OFFSET_UNKNOWN)
***************
*** 115,118 ****
--- 122,126 ----
                                                (method.MethodHandle, offset, 
out line, out column);
                                }
+                       #endif
                        }
  
***************
*** 176,179 ****
--- 184,189 ----
                        }
  
+ #if CONFIG_REFLECTION
+ 
        // Get the method that was executing where the stack frame was created.
        public virtual MethodBase GetMethod()
***************
*** 182,189 ****
--- 192,202 ----
                        }
  
+ #endif // CONFIG_REFLECTION
+ 
        // Convert this stack frame into a string.
        public override String ToString()
                        {
                                String result;
+                       #if CONFIG_REFLECTION
                                if(method != null)
                                {
***************
*** 194,198 ****
                                        }
                                }
!                               else if(offset != OFFSET_UNKNOWN)
                                {
                                        result = "at offset " + offset;
--- 207,213 ----
                                        }
                                }
!                               else
!                       #endif
!                               if(offset != OFFSET_UNKNOWN)
                                {
                                        result = "at offset " + offset;

Index: StackTrace.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Diagnostics/StackTrace.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** StackTrace.cs       10 Apr 2003 23:07:09 -0000      1.4
--- StackTrace.cs       15 Apr 2003 11:22:32 -0000      1.5
***************
*** 157,160 ****
--- 157,161 ----
        public override String ToString()
                        {
+                       #if CONFIG_REFLECTION
                                String result = String.Empty;
                                int posn;
***************
*** 226,229 ****
--- 227,233 ----
  
                                return result;
+                       #else
+                               return String.Empty;
+                       #endif
                        }