Changeset 514

Timestamp:

04/29/08 11:21:33 (8 months ago)

Author:

weyrick

Message:

don't allow redeclaration of methods in the same class. fixes #3573

Location:

trunk/pcc

Files:

• compiler/declare.scm (modified) (1 diff)
• runtime/php-object.scm (modified) (1 diff)

trunk/pcc/compiler/declare.scm

@@ -356 +356 @@
 ;                         (fprint (current-error-port) "Method: " (method-decl-name p))
                           (%check-typehints p (method-decl-decl-arglist p))
-                          (php-hash-insert! methods (method-decl-name p) p))
+                          (if (php-hash-contains? methods (method-decl-name p))
+                              ; XXX note, this is also checked in the object runtime
+                              (php-error/loc node (format "Cannot redeclare ~a::~a()" name (method-decl-name p)))
+                              (php-hash-insert! methods (method-decl-name p) p)))
                          ((nop? p) #t)
                          (else (error 'declare-class "what's this noise doing in my class-decl?" p))))))

trunk/pcc/runtime/php-object.scm

@@ -1041 +1041 @@
              (overridden-method (php-hash-lookup (%php-class-methods the-class) canon-method-name)))
          (unless (php-null? overridden-method)
+
+            ;; can't redeclare a method in the same class
+            (when (eq? the-class (%php-method-origin-class overridden-method))
+               (php-error (format "Cannot redeclare ~a::~a()" class-name method-name)))
+            
             ;; can't override a final method
             (when (%php-method-final? overridden-method)