[pypy-svn] r66077 - pypy/branch/pyjitpl5/pypy/translator/cli/src

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:40:19 2009
New Revision: 66077

Added:
   pypy/branch/pyjitpl5/pypy/translator/cli/src/pypylib.cs.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/translator/cli/src/pypylib.cs
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/translator/cli/src/pypylib.cs
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r64225 | antocuni | 2009-04-17 11:39:30 +0200 (Fri, 17 Apr 2009) | 2 lines
    
    fix test_clr.test_external_assemblies
    
    ------------------------------------------------------------------------
    r64141 | antocuni | 2009-04-16 11:44:34 +0200 (Thu, 16 Apr 2009) | 2 lines
    
    (antocuni, niko) move test_rffi_primitive to oosupport and make it working also for cli
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/translator/cli/src/pypylib.cs.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/translator/cli/src/pypylib.cs)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/cli/src/pypylib.cs	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/cli/src/pypylib.cs.merge.tmp	Tue Jun 30 16:40:19 2009
@@ -472,12 +472,18 @@
 
         public static bool Equal<T>(T t1, T t2) 
         { 
-            return t1.Equals(t2);
+            if (t1 == null)
+              return (t2 == null);
+            else
+              return t1.Equals(t2);
         }
 
         public static int GetHashCode<T>(T obj)
         {
-            return obj.GetHashCode();
+            if (obj == null)
+              return 0;
+            else
+              return obj.GetHashCode();
         }
 
         public static void throwInvalidBlockId(uint blockid)
@@ -1069,4 +1075,13 @@
             System.Threading.Thread.Sleep((int)(seconds*1000));
         }
     }
+
+    public class rffi
+    {
+      public static int tolower(int chr)
+      {
+        return (int)Char.ToLower((char)chr);
+      }
+    }
+
 }