com gtk/php-gtk: If override does not specify flags, base the flags on whether the method is static or not.: generator/generator.php

[email protected] (David Soria Parra) Sun, 15 Jan 2006 01:36:08 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    c1a29c393729a7e862074826393ad6911e7fdb29
Author:    Andrei Zmievski <[email protected]>         Sun, 15 Jan 2006 01:36:08 +0000
Parents:   c29a24cfa1a0ed8447a8e166dfb42e87e7767286
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=c1a29c393729a7e862074826393ad6911e7fdb29

Log:
If override does not specify flags, base the flags on whether the method
is static or not.

Changed paths:
  M  generator/generator.php


Diff:
c1a29c393729a7e862074826393ad6911e7fdb29
diff --git a/generator/generator.php b/generator/generator.php
index 7c4ec7d..91e94bb 100644
--- a/generator/generator.php
+++ b/generator/generator.php
@@ -294,7 +294,7 @@ class Generator {
                     $method_override = preg_replace('!^.*(PHP_METHOD).*$!m', "static $1($object->in_module$object->name, $method_name)", $method_override);
                     $this->write_override($method_override, $method->c_name);
                     $method_entries[$method_name] = array($object->in_module . $object->name,
-                                                          $method_name, $reflection_func, $flags ?  $flags : 'ZEND_ACC_PUBLIC');
+                                                          $method_name, $reflection_func, $flags ?  $flags : ($method->static ? 'ZEND_ACC_PUBLIC|ZEND_ACC_STATIC' : 'ZEND_ACC_PUBLIC'));
                 } else {
                     if ($method->static) {
                         $code = $this->write_callable($method, Templates::function_body, true, false, $dict);