jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PHP] Fix warning and rename of reserved class name to be case insensitive.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11763 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2009-12-02 13:02:38 +00:00
commit 2c74fbf9e4
3 changed files with 110 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -1,6 +1,9 @@
Version 1.3.41 (in progress) Version 1.3.41 (in progress)
============================ ============================
2009-12-02: olly
[PHP] Fix warning and rename of reserved class name to be case insensitive.
2009-12-01: wsfulton 2009-12-01: wsfulton
Revert support for %extend and memberin typemaps added in swig-1.3.39. The Revert support for %extend and memberin typemaps added in swig-1.3.39. The
memberin typemaps are ignored again for member variables within a %extend block. memberin typemaps are ignored again for member variables within a %extend block.

8
Examples/test-suite/php_namewarn_rename.i
View file

@ -2,19 +2,25 @@
#ifdef SWIGPHP #ifdef SWIGPHP
%warnfilter(SWIGWARN_PARSE_KEYWORD) Empty(); %warnfilter(SWIGWARN_PARSE_KEYWORD) Empty();
// FIXME: this doesn't work for me:
%warnfilter(SWIGWARN_PARSE_KEYWORD) stdClass; %warnfilter(SWIGWARN_PARSE_KEYWORD) stdClass;
%warnfilter(SWIGWARN_PARSE_KEYWORD) directory;
%warnfilter(SWIGWARN_PARSE_KEYWORD) Hello::empty(); %warnfilter(SWIGWARN_PARSE_KEYWORD) Hello::empty();
#endif #endif
%inline %{ %inline %{
int Exception() { return 13; }
void Empty() {} void Empty() {}
class stdClass class stdClass
{ {
}; };
class directory
{
};
struct Hello struct Hello
{ {
void empty() {} void empty() {}

200
Lib/php/phpkw.swg
View file

@ -5,13 +5,13 @@
* phpkw.swg * phpkw.swg
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#define PHPKW(x) %keywordwarn("'" `x` "' is a PHP keyword, renamed as 'c_" `x` "'",sourcefmt="%(lower)s",$isclass,rename="c_%s") `x` #define PHPKW(x) %keywordwarn("'" `x` "' is a PHP keyword, renamed as 'c_" `x` "'",sourcefmt="%(lower)s",rename="c_%s") `x`
#define PHPCN(x) %keywordwarn("'" `x` "' is a PHP reserved class name, class renamed as 'c_" `x` "'",%$isclass,rename="c_%s") `x` #define PHPCN(x) %keywordwarn("'" `x` "' is a PHP reserved class name, class renamed as 'c_" `x` "'",%$isclass,sourcefmt="%(lower)s",rename="c_%s") `x`
#define PHPBN1(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP",sourcefmt="%(lower)s") `x` #define PHPBN1(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP",sourcefmt="%(lower)s") `x`
#define PHPBN2(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP") "::" `x` #define PHPBN2(x) %builtinwarn("'" `x` "' conflicts with a built-in name in PHP") "::" `x`
#define PHPFN(x) %keywordwarn("'" `x` "' is a PHP built-in function, renamed as 'c_" `x` "'",sourcefmt="%(lower)s",%$isfunction,%$not %$ismember,rename="c_%s") `x` #define PHPFN(x) %keywordwarn("'" `x` "' is a PHP built-in function, renamed as 'c_" `x` "'",sourcefmt="%(lower)s",%$isfunction,%$not %$ismember,rename="c_%s") `x`
/* /*
From From
@ -355,105 +355,105 @@ PHPBN2(E_STRICT);
PHPBN2(__COMPILER_HALT_OFFSET__); PHPBN2(__COMPILER_HALT_OFFSET__);
/* Class names reserved by PHP */ /* Class names reserved by PHP */
PHPCN(stdClass); /* case insensitive */
PHPCN(__PHP_Incomplete_Class); PHPCN(stdclass);
PHPCN(Directory); PHPCN(__php_incomplete_class);
PHPCN(directory);
/* Added in PHP5 (this list apparently depends which extensions you load by default). */ /* Added in PHP5 (this list apparently depends which extensions you load by default). */
PHPCN(parent); PHPCN(parent);
PHPCN(self); PHPCN(self);
PHPCN(Exception); PHPCN(exception);
PHPCN(php_user_filter); PHPCN(php_user_filter);
PHPCN(ErrorException); PHPCN(errorexception);
PHPCN(XMLWriter); PHPCN(xmlwriter);
PHPCN(LibXMLError); PHPCN(libxmlerror);
PHPCN(SimpleXMLElement); PHPCN(simplexmlelement);
PHPCN(SoapClient); PHPCN(soapclient);
PHPCN(SoapVar); PHPCN(soapvar);
PHPCN(SoapServer); PHPCN(soapserver);
PHPCN(SoapFault); PHPCN(soapfault);
PHPCN(SoapParam); PHPCN(soapparam);
PHPCN(SoapHeader); PHPCN(soapheader);
PHPCN(RecursiveIteratorIterator); PHPCN(recursiveiteratoriterator);
PHPCN(FilterIterator); PHPCN(filteriterator);
PHPCN(RecursiveFilterIterator); PHPCN(recursivefilteriterator);
PHPCN(ParentIterator); PHPCN(parentiterator);
PHPCN(LimitIterator); PHPCN(limititerator);
PHPCN(CachingIterator); PHPCN(cachingiterator);
PHPCN(RecursiveCachingIterator); PHPCN(recursivecachingiterator);
PHPCN(IteratorIterator); PHPCN(iteratoriterator);
PHPCN(NoRewindIterator); PHPCN(norewinditerator);
PHPCN(AppendIterator); PHPCN(appenditerator);
PHPCN(InfiniteIterator); PHPCN(infiniteiterator);
PHPCN(EmptyIterator); PHPCN(emptyiterator);
PHPCN(ArrayObject); PHPCN(arrayobject);
PHPCN(ArrayIterator); PHPCN(arrayiterator);
PHPCN(RecursiveArrayIterator); PHPCN(recursivearrayiterator);
PHPCN(SplFileInfo); PHPCN(splfileinfo);
PHPCN(DirectoryIterator); PHPCN(directoryiterator);
PHPCN(RecursiveDirectoryIterator); PHPCN(recursivedirectoryiterator);
PHPCN(SplFileObject); PHPCN(splfileobject);
PHPCN(SplTempFileObject); PHPCN(spltempfileobject);
PHPCN(SimpleXMLIterator); PHPCN(simplexmliterator);
PHPCN(LogicException); PHPCN(logicexception);
PHPCN(BadFunctionCallException); PHPCN(badfunctioncallexception);
PHPCN(BadMethodCallException); PHPCN(badmethodcallexception);
PHPCN(DomainException); PHPCN(domainexception);
PHPCN(InvalidArgumentException); PHPCN(invalidargumentexception);
PHPCN(LengthException); PHPCN(lengthexception);
PHPCN(OutOfRangeException); PHPCN(outofrangeexception);
PHPCN(RuntimeException); PHPCN(runtimeexception);
PHPCN(OutOfBoundsException); PHPCN(outofboundsexception);
PHPCN(OverflowException); PHPCN(overflowexception);
PHPCN(RangeException); PHPCN(rangeexception);
PHPCN(UnderflowException); PHPCN(underflowexception);
PHPCN(UnexpectedValueException); PHPCN(unexpectedvalueexception);
PHPCN(SplObjectStorage); PHPCN(splobjectstorage);
PHPCN(ReflectionException); PHPCN(reflectionexception);
PHPCN(Reflection); PHPCN(reflection);
PHPCN(ReflectionFunction); PHPCN(reflectionfunction);
PHPCN(ReflectionParameter); PHPCN(reflectionparameter);
PHPCN(ReflectionMethod); PHPCN(reflectionmethod);
PHPCN(ReflectionClass); PHPCN(reflectionclass);
PHPCN(ReflectionObject); PHPCN(reflectionobject);
PHPCN(ReflectionProperty); PHPCN(reflectionproperty);
PHPCN(ReflectionExtension); PHPCN(reflectionextension);
PHPCN(DOMException); PHPCN(domexception);
PHPCN(DOMStringList); PHPCN(domstringlist);
PHPCN(DOMNameList); PHPCN(domnamelist);
PHPCN(DOMImplementationList); PHPCN(domimplementationlist);
PHPCN(DOMImplementationSource); PHPCN(domimplementationsource);
PHPCN(DOMImplementation); PHPCN(domimplementation);
PHPCN(DOMNode); PHPCN(domnode);
PHPCN(DOMNameSpaceNode); PHPCN(domnamespacenode);
PHPCN(DOMDocumentFragment); PHPCN(domdocumentfragment);
PHPCN(DOMDocument); PHPCN(domdocument);
PHPCN(DOMNodeList); PHPCN(domnodelist);
PHPCN(DOMNamedNodeMap); PHPCN(domnamednodemap);
PHPCN(DOMCharacterData); PHPCN(domcharacterdata);
PHPCN(DOMAttr); PHPCN(domattr);
PHPCN(DOMElement); PHPCN(domelement);
PHPCN(DOMText); PHPCN(domtext);
PHPCN(DOMComment); PHPCN(domcomment);
PHPCN(DOMTypeinfo); PHPCN(domtypeinfo);
PHPCN(DOMUserDataHandler); PHPCN(domuserdatahandler);
PHPCN(DOMDomError); PHPCN(domdomerror);
PHPCN(DOMErrorHandler); PHPCN(domerrorhandler);
PHPCN(DOMLocator); PHPCN(domlocator);
PHPCN(DOMConfiguration); PHPCN(domconfiguration);
PHPCN(DOMCdataSection); PHPCN(domcdatasection);
PHPCN(DOMDocumentType); PHPCN(domdocumenttype);
PHPCN(DOMNotation); PHPCN(domnotation);
PHPCN(DOMEntity); PHPCN(domentity);
PHPCN(DOMEntityReference); PHPCN(domentityreference);
PHPCN(DOMProcessingInstruction); PHPCN(domprocessinginstruction);
PHPCN(DOMStringExtend); PHPCN(domstringextend);
PHPCN(DOMXPath); PHPCN(domxpath);
PHPCN(XMLReader); PHPCN(xmlreader);
PHPCN(SQLiteDatabase); PHPCN(sqlitedatabase);
PHPCN(SQLiteResult); PHPCN(sqliteresult);
PHPCN(SQLiteUnbuffered); PHPCN(sqliteunbuffered);
PHPCN(SQLiteException); PHPCN(sqliteexception);
/* Built-in PHP functions (incomplete). */ /* Built-in PHP functions (incomplete). */
PHPFN(cos); PHPFN(cos);