Added 1995 to copyright message.

floatobject.c: fix hash().
methodobject.c: support METH_FREENAME flag bit.

diff --git a/Objects/accessobject.c b/Objects/accessobject.c
index d516e674d56e3aa4658a15ece2bd9089d2ba2cdb..f3c7dfc9b9ef39f081b8b9f7890b110f5364df38 100644 (file)
--- a/Objects/accessobject.c
+++ b/Objects/accessobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 376f031f98f82247e8abdd3607491223c9abcf20..b1b355b905fb44fa275cf8e69f80340cfa3b4102 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index bb4e051b1c7726de138f84be5c6f9a036284fee7..d74e74ffd1b9e25c3b3a28814f02fe197377be7e 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 44bc51bdf7e87c638f5f309dbde7dbcc5c6418c8..07bab90eabcebf3dadc778e6e7c7d9fbb5ad9fb5 100644 (file)
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 3f8e6aa105a382f5f5e5f049e27d087e37c54555..b1bb96821fd36d6e3fdbf6ae5e97dc89831e6962 100644 (file)
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 
@@ -212,7 +212,7 @@ float_hash(v)
        }
        else {
                fractpart = frexp(fractpart, &expo);
-               fractpart = fractpart*4294967296.0; /* 2**32 */
+               fractpart = fractpart*2147483648.0; /* 2**31 */
                x = (long) (intpart + fractpart) ^ expo; /* Rather arbitrary */
        }
        if (x == -1)

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 4d943694688b41df017902103f5acb766219f5bc..29cb1718c465083c5e4f992de9be9e549869033f 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index d7549e0eb43db0f2b43054cb33016a9dfe845734..9255b571874795170bcaa45fd5fd45305f0c0fb3 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/intobject.c b/Objects/intobject.c
index 6b41ae10b8da515cd5240bbe2a731c1e6dfe178d..f020453049f71efddddcd1c7d868623291bb6527 100644 (file)
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/listobject.c b/Objects/listobject.c
index 521d1a8741cb8d0885c28fe4287f2637d4a5ab17..f6ae50fa5e6b21cebcabb1cb70da2bcb25fb848a 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 6561edc80859490251108ac1ed916d46adb4d97c..1829c3dee72d77e1d61c9a388d10cdde68a5e213 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/mappingobject.c b/Objects/mappingobject.c
index bb4e051b1c7726de138f84be5c6f9a036284fee7..d74e74ffd1b9e25c3b3a28814f02fe197377be7e 100644 (file)
--- a/Objects/mappingobject.c
+++ b/Objects/mappingobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index a9bc508f806c5d69f9230ba9a666e71713d82660..671bdda356474defd1b6c28557f8ad847d3710ad 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 
@@ -33,15 +33,15 @@ typedef struct {
        char    *m_name;
        method  m_meth;
        object  *m_self;
-       int     m_varargs;
+       int     m_flags;
 } methodobject;
 
 object *
-newmethodobject(name, meth, self, varargs)
-       char *name; /* static string */
+newmethodobject(name, meth, self, flags)
+       char *name;
        method meth;
        object *self;
-       int varargs;
+       int flags;
 {
        methodobject *op = NEWOBJ(methodobject, &Methodtype);
        if (op != NULL) {
@@ -50,7 +50,7 @@ newmethodobject(name, meth, self, varargs)
                if (self != NULL)
                        INCREF(self);
                op->m_self = self;
-               op->m_varargs = varargs;
+               op->m_flags = flags;
        }
        return (object *)op;
 }
@@ -85,7 +85,7 @@ getvarargs(op)
                err_badcall();
                return -1;
        }
-       return ((methodobject *)op) -> m_varargs;
+       return ((methodobject *)op) -> m_flags & METH_VARARGS;
 }
 
 /* Methods (the standard built-in methods, that is) */
@@ -96,6 +96,8 @@ meth_dealloc(m)
 {
        if (m->m_self != NULL)
                DECREF(m->m_self);
+       if (m->m_flags & METH_FREENAME)
+               free(m->m_name);
        free((char *)m);
 }
 
@@ -199,8 +201,9 @@ findmethod(ml, op, name)
                return listmethods(ml);
        for (; ml->ml_name != NULL; ml++) {
                if (strcmp(name, ml->ml_name) == 0)
-                       return newmethodobject(ml->ml_name, ml->ml_meth,
-                                       op, ml->ml_varargs);
+                       return newmethodobject(ml->ml_name, ml->ml_meth, op,
+                                              ml->ml_varargs ?
+                                              METH_VARARGS : 0);
        }
        err_setstr(AttributeError, name);
        return NULL;

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index b98d843d6352359f48d4038a10f80e42732c2c9d..8ab2f455c301bd14a2f22c13bba8080861359a2d 100644 (file)
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/object.c b/Objects/object.c
index f5c22d1774aaafb5c5001c432c934f5a917fbacc..d1bc681805f3161e1ceb7cca07b119bd182af96c 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
index 5f9da1d84b4687d34185598992c5d636ddef7cce..7243e1fe824b122a598f03808638c3ba0b443e30 100644 (file)
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index ae96cea2c3621cd123b83b8d99b8c37173cad17c..d9366aedadc160fac3252012118babe42eb143c6 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 59660f99042145c31910b47b8edbb22be69de1a9..1e5ea1392f73ac3cc6e0c52b91b1890e784a90a6 100644 (file)
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 40bdc88cea9020a5c46713c610900fd16e047378..b391858f27d27e819e5424f136d9aa8f62a963ea 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved
 

diff --git a/Objects/xxobject.c b/Objects/xxobject.c
index 7a29925db7d55e86a8c36146985205c2c8cde587..bb8a5f677f900f5178fb3492fed7bf5cb98b1d13 100644 (file)
--- a/Objects/xxobject.c
+++ b/Objects/xxobject.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
 
                         All Rights Reserved