[pypy-svn] r33719 - in pypy/dist/pypy/translator/cli: . src

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Oct 25 15:51:35 2006
New Revision: 33719

Modified:
   pypy/dist/pypy/translator/cli/query.py
   pypy/dist/pypy/translator/cli/src/query.cs
Log:
Don't ignore Void type.



Modified: pypy/dist/pypy/translator/cli/query.py
==============================================================================
--- pypy/dist/pypy/translator/cli/query.py	(original)
+++ pypy/dist/pypy/translator/cli/query.py	Wed Oct 25 15:51:35 2006
@@ -123,20 +123,20 @@
 
         # add both static and instance methods
         static_meths = self.group_methods(self.StaticMethods, _overloaded_static_meth,
-                                          _static_meth, ootype.StaticMethod)
+                                          _static_meth, ootype.StaticMethod, always_group=True)
         meths = self.group_methods(self.Methods, ootype.overload, ootype.meth, ootype.Meth)
         Class._add_methods(static_meths)
         TYPE._add_methods(meths)
         return Class
 
-    def group_methods(self, methods, overload, meth, Meth):
+    def group_methods(self, methods, overload, meth, Meth, always_group=False):
         groups = {}
         for name, args, result in methods:
             groups.setdefault(name, []).append((args, result))
 
         res = {}
         for name, methlist in groups.iteritems():
-            if len(methlist) == 1:
+            if len(methlist) == 1 and not always_group:
                 args, result = methlist[0]
                 TYPE = self.get_method_type(Meth, args, result)
                 res[name] = meth(TYPE)

Modified: pypy/dist/pypy/translator/cli/src/query.cs
==============================================================================
--- pypy/dist/pypy/translator/cli/src/query.cs	(original)
+++ pypy/dist/pypy/translator/cli/src/query.cs	Wed Oct 25 15:51:35 2006
@@ -117,13 +117,15 @@
 
     private static bool IgnoreType(Type t)
     {
-        return !t.IsPrimitive && (t == typeof(System.ValueType) ||
-                                  t == typeof(System.Array) ||
-                                  t.IsValueType ||
-                                  t.IsByRef ||
-                                  t.IsPointer ||
-                                  t.IsGenericType ||
-                                  t.IsGenericTypeDefinition);
+        return !t.IsPrimitive 
+            && t != typeof(void)
+            &&(t == typeof(System.ValueType) ||
+               t == typeof(System.Array) ||
+               t.IsValueType ||
+               t.IsByRef ||
+               t.IsPointer ||
+               t.IsGenericType ||
+               t.IsGenericTypeDefinition);
     }
 
     private static void PrintDepend()