Re: Renaming namespaces to packages

Hi Tijnema, On Thu, 2007-08-16 at 20:27 +0200, Tijnema wrote: > On 8/10/07, Johannes Schlüter <johannes@php.net> wrote: > > Hi, > > > > I think we reached the consensus to rename namespaces to packages as our > > implementation is more package-like. Therefore I wrote the corresponding > > patch which tries to get rid of all "namespaces" and "ns" (well, not > > all > > "ns" only the namespace-related ones of course) used in the code. > > Additionally I changed all package-tests. Any objections? > > > > Does anybody (with the move-on-CVS-server powers) care about the history > > of the tests? Then please cp ZendEngine2/tests/ns_* to pkg_* there else > > I'll do a simple cvs rm and cvs add. > > > > The patch is at > > > > http://schlueters.de/~johannes/php/zend_namespace_to_package.diff > > and > > the tarball with the changed tests at > > > > http://schlueters.de/~johannes/php/zend_package_tests.tar.bz2 > > > > johannes > > > > Just a little note, right now, your patch doesn't seem to work > Johannes. It's saying that T_NAMESPACE and T_NS can't be found in > Zend/zend_language_scanner.c. > > Extra patch (that worked for me): > > --------zend_packages_extra_patch.patch------ > --- Zend/zend_language_scanner.c 31 Jul 2007 23:23:37 -0000 > +++ Zend/zend_language_scanner.c 16 Aug 2007 20:13:24 -0000 If patching that file configure didn't find a proper flex version since that file is generated from Zend/zend_language_scanner.l using flex. johannes > @@ -5415,7 +5415,7 @@ > case 59: > YY_RULE_SETUP > { > - return T_NAMESPACE; > + return T_PACKAGE; > } > YY_BREAK > case 60: > @@ -5908,13 +5908,13 @@ > case 118: > YY_RULE_SETUP > { > - if (CG(current_namespace)) { > - *zendlval = *CG(current_namespace); > + if (CG(current_package)) { > + *zendlval = *CG(current_package); > zval_copy_ctor(zendlval); > } else { > ZVAL_EMPTY_TEXT(zendlval); > } > - return T_NS_C; > + return T_PKG_C; > } > YY_BREAK > case 119: > ---------------------------------- > > > Tijnema > -- > Vote for PHP Color Coding in Gmail! -> > http://gpcc.tijnema.info >