[Dotgnu-pnet-commits] CVS: pnetlib/JScript/Jsc BinaryOp.cs,1.1,1.2 Equality.cs,1.2,1.3 StrictEquality.cs,1.2,1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/JScript/Jsc
In directory subversions:/tmp/cvs-serv12653/JScript/Jsc

Modified Files:
        BinaryOp.cs Equality.cs StrictEquality.cs 
Log Message:


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


Index: BinaryOp.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/Jsc/BinaryOp.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BinaryOp.cs 13 Jan 2003 10:53:19 -0000      1.1
--- BinaryOp.cs 15 Apr 2003 11:22:32 -0000      1.2
***************
*** 38,41 ****
--- 38,42 ----
                        }
  
+ #if !ECMA_COMPAT
        // Find the operator method to use on two types.
        protected MethodInfo GetOperator(IReflect ir1, IReflect ir2)
***************
*** 44,47 ****
--- 45,49 ----
                                return null;
                        }
+ #endif
  
  }; // class BinaryOp

Index: Equality.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/Jsc/Equality.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Equality.cs 17 Jan 2003 06:34:47 -0000      1.2
--- Equality.cs 15 Apr 2003 11:22:32 -0000      1.3
***************
*** 68,79 ****
  
                                // Is one of the values null?
!                               if(v1 == null || DBNull.IsDBNull(v1) || v1 is 
Missing ||
!                                  v1 is System.Reflection.Missing)
                                {
                                        return (v2 == null || 
DBNull.IsDBNull(v2) ||
!                                                       v2 is Missing || v2 is 
System.Reflection.Missing);
                                }
!                               else if(v2 == null || DBNull.IsDBNull(v2) || v2 
is Missing ||
!                                               v2 is System.Reflection.Missing)
                                {
                                        return false;
--- 68,92 ----
  
                                // Is one of the values null?
!                               if(v1 == null || DBNull.IsDBNull(v1) || v1 is 
Missing
!                       #if ECMA_COMPAT
!                                 )
!                       #else
!                                  || v1 is System.Reflection.Missing)
!                       #endif
                                {
                                        return (v2 == null || 
DBNull.IsDBNull(v2) ||
!                                                       v2 is Missing
!                               #if ECMA_COMPAT
!                                                  );
!                               #else
!                                                       || v2 is 
System.Reflection.Missing);
!                               #endif
                                }
!                               else if(v2 == null || DBNull.IsDBNull(v2) || v2 
is Missing
!                       #if ECMA_COMPAT
!                                          )
!                       #else
!                                               || v2 is 
System.Reflection.Missing)
!                       #endif
                                {
                                        return false;

Index: StrictEquality.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/Jsc/StrictEquality.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StrictEquality.cs   17 Jan 2003 06:34:47 -0000      1.2
--- StrictEquality.cs   15 Apr 2003 11:22:32 -0000      1.3
***************
*** 58,69 ****
  
                                // Handle the case where one is null or 
undefined.
!                               if(v1 == null || v1 is Missing ||
!                                  v1 is System.Reflection.Missing)
                                {
!                                       return (v2 == null || v2 is Missing ||
!                                                       v2 is 
System.Reflection.Missing);
                                }
!                               else if(v2 == null || v2 is Missing ||
!                                               v2 is System.Reflection.Missing)
                                {
                                        return false;
--- 58,81 ----
  
                                // Handle the case where one is null or 
undefined.
!                               if(v1 == null || v1 is Missing
!                       #if ECMA_COMPAT
!                                 )
!                       #else
!                                  || v1 is System.Reflection.Missing)
!                       #endif
                                {
!                                       return (v2 == null || v2 is Missing
!                               #if ECMA_COMPAT
!                                                  );
!                               #else
!                                                       || v2 is 
System.Reflection.Missing);
!                               #endif
                                }
!                               else if(v2 == null || v2 is Missing
!                       #if ECMA_COMPAT
!                                          )
!                       #else
!                                               || v2 is 
System.Reflection.Missing)
!                       #endif
                                {
                                        return false;