cvs: php-gtk /generator definitions.php scheme.php

From: Date: Tue, 13 Mar 2001 05:38:42 +0000
Subject: cvs: php-gtk /generator definitions.php scheme.php
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-749@lists.php.net to get a copy of this message
andrei Mon Mar 12 21:38:42 2001 EDT Modified files: /php-gtk/generator definitions.php scheme.php Log: * properly parse object's parent's module as well. * added ability to merge parse trees. Index: php-gtk/generator/definitions.php diff -u php-gtk/generator/definitions.php:1.4 php-gtk/generator/definitions.php:1.5 --- php-gtk/generator/definitions.php:1.4 Sat Mar 3 10:42:16 2001 +++ php-gtk/generator/definitions.php Mon Mar 12 21:38:42 2001 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: definitions.php,v 1.4 2001/03/03 18:42:16 fmk Exp $ */ +/* $Id: definitions.php,v 1.5 2001/03/13 05:38:42 andrei Exp $ */ class Enum_Def { var $def_type = 'enum'; @@ -83,8 +83,12 @@ if ($arg[0] == 'in-module') $this->in_module = $arg[1]; - else if ($arg[0] == 'parent') - $this->parent = $arg[1]; + else if ($arg[0] == 'parent') { + if (count($arg) > 2) + $this->parent = array($arg[1], $arg[2][0]); + else + $this->parent = array($arg[1], null); + } else if ($arg[0] == 'c-name') $this->c_name = $arg[1]; else if ($arg[0] == 'field') { Index: php-gtk/generator/scheme.php diff -u php-gtk/generator/scheme.php:1.5 php-gtk/generator/scheme.php:1.6 --- php-gtk/generator/scheme.php:1.5 Sat Mar 3 10:42:16 2001 +++ php-gtk/generator/scheme.php Mon Mar 12 21:38:42 2001 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: scheme.php,v 1.5 2001/03/03 18:42:16 fmk Exp $ */ +/* $Id: scheme.php,v 1.6 2001/03/13 05:38:42 andrei Exp $ */ require "definitions.php"; @@ -104,6 +104,11 @@ $this->handle($node); } + function merge($parser) + { + $this->parse_tree = array_merge($this->parse_tree, $parser->parse_tree); + } + function handle($node) { global $char_table, @@ -191,7 +196,7 @@ function find_parent($obj) { foreach ($this->objects as $object) { - if ($object->name == $obj->parent) + if ($object->name == $obj->parent[0]) return $object; } }

« previous php.gtk (#749) next »