From: <ol...@us...> - 2007-02-07 10:19:48
|
Revision: 9647 http://swig.svn.sourceforge.net/swig/?rev=9647&view=rev Author: olly Date: 2007-02-07 02:19:35 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Fix generated makefile rule for building the module Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-02-02 02:23:23 UTC (rev 9646) +++ trunk/Source/Modules/php4.cxx 2007-02-07 10:19:35 UTC (rev 9647) @@ -10,7 +10,7 @@ /* FIXME: PHP5 OO wrapping TODO list: * - * Short term (ideally before 1.3.30 is released): + * Short term: * * Sort out auto-renaming of method and class names which are reserved * words (e.g. empty, clone, exception, etc.) vs -php4/-php5 in some @@ -350,9 +350,9 @@ Printf(f_make, "EXTRA_LIB=\n\n"); Printf(f_make, "$(MODULE): $(OBJS)\n"); if (CPlusPlus || (withcxx != NULL)) { - Printf(f_make, "\t$(CXX) $(LDFLAGS) $(OBJS) -o $(PROG) $(EXTRA_LIB)\n\n"); + Printf(f_make, "\t$(CXX) $(LDFLAGS) $(OBJS) -o $@ $(EXTRA_LIB)\n\n"); } else { - Printf(f_make, "\t$(CC) $(LDFLAGS) $(OBJS) -o $(PROG) $(EXTRA_LIB)\n\n"); + Printf(f_make, "\t$(CC) $(LDFLAGS) $(OBJS) -o $@ $(EXTRA_LIB)\n\n"); } Printf(f_make, "%%.o: %%.cpp\n"); Printf(f_make, "\t$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2007-04-15 23:22:36
|
Revision: 9672 http://swig.svn.sourceforge.net/swig/?rev=9672&view=rev Author: olly Date: 2007-04-15 16:22:29 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Stop passing unused argument to Printf(). Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-04-10 14:14:52 UTC (rev 9671) +++ trunk/Source/Modules/php4.cxx 2007-04-15 23:22:29 UTC (rev 9672) @@ -1836,7 +1836,7 @@ if (i.item) { Printf(output, "case \"%s\": ", mangled); } else { - Printf(output, "default: ", mangled); + Printf(output, "default: "); } const char *classname = GetChar(class_node, "sym:name"); if (!classname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2007-08-27 15:02:55
|
Revision: 9912 http://swig.svn.sourceforge.net/swig/?rev=9912&view=rev Author: olly Date: 2007-08-25 06:05:44 -0700 (Sat, 25 Aug 2007) Log Message: ----------- Eliminate unused parameters on calls to Printf() Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-08-23 15:21:11 UTC (rev 9911) +++ trunk/Source/Modules/php4.cxx 2007-08-25 13:05:44 UTC (rev 9912) @@ -1880,7 +1880,7 @@ Replaceall(tm, "$target", name); Printf(s_vinit, "%s\n", tm); } else { - Printf(stderr, "%s: Line %d, Unable to link with type %s\n", input_file, line_number, SwigType_str(t, 0), name); + Printf(stderr, "%s: Line %d, Unable to link with type %s\n", input_file, line_number, SwigType_str(t, 0)); } /* Now generate PHP -> C sync blocks */ @@ -1890,8 +1890,8 @@ Replaceall(tm, "$symname", iname); Printf(f_c->code, "%s\n", tm); } else { - Printf(stderr,"%s: Line %d, Unable to link with type %s\n", - input_file, line_number, SwigType_str(t, 0), name); + Printf(stderr,"%s: Line %d, Unable to link with type %s\n", + input_file, line_number, SwigType_str(t, 0)); } */ /* Now generate C -> PHP sync blocks */ @@ -1903,8 +1903,8 @@ Replaceall(tm, "$symname", iname); Printf(f_php->code, "%s\n", tm); } else { - Printf(stderr,"%s: Line %d, Unable to link with type %s\n", - input_file, line_number, SwigType_str(t, 0), name); + Printf(stderr,"%s: Line %d, Unable to link with type %s\n", + input_file, line_number, SwigType_str(t, 0)); } } */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2007-08-27 15:41:54
|
Revision: 9916 http://swig.svn.sourceforge.net/swig/?rev=9916&view=rev Author: olly Date: 2007-08-25 09:03:24 -0700 (Sat, 25 Aug 2007) Log Message: ----------- Can't use (double) cast in PHP default value, so rework. Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-08-25 14:05:22 UTC (rev 9915) +++ trunk/Source/Modules/php4.cxx 2007-08-25 16:03:24 UTC (rev 9916) @@ -1566,13 +1566,17 @@ char *p; errno = 0; /* FIXME: strtod is locale dependent... */ - (void) strtod(Char(value), &p); + double val = strtod(Char(value), &p); if (errno || *p) { Clear(value); Append(value, "?"); - } else { - if (strchr(Char(value), '.') == NULL) { - Insert(value, 0, (void *)"(double)"); + } else if (strchr(Char(value), '.') == NULL) { + // Ensure value is a double constant, not an integer one. + Append(value, ".0"); + double val2 = strtod(Char(value), &p); + if (errno || *p || val != val2) { + Clear(value); + Append(value, "?"); } } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2007-10-12 21:44:19
|
Revision: 9986 http://swig.svn.sourceforge.net/swig/?rev=9986&view=rev Author: wsfulton Date: 2007-10-12 14:44:18 -0700 (Fri, 12 Oct 2007) Log Message: ----------- Remove incorrect license in generated code. See swig-devel mailing 'licence issue' thread Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-10-12 21:42:20 UTC (rev 9985) +++ trunk/Source/Modules/php4.cxx 2007-10-12 21:44:18 UTC (rev 9986) @@ -144,25 +144,6 @@ static void (*r_prevtracefunc) (SwigType *t, String *mangled, String *clientdata) = 0; } -static const char *php_header = - "/*" - "\n +----------------------------------------------------------------------+" - "\n | PHP version 4.0 |" - "\n +----------------------------------------------------------------------+" - "\n | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group |" - "\n +----------------------------------------------------------------------+" - "\n | This source file is subject to version 2.02 of the PHP license, |" - "\n | that is bundled with this package in the file LICENSE, and is |" - "\n | available at through the world-wide-web at |" - "\n | http://www.php.net/license/2_02.txt. |" - "\n | If you did not receive a copy of the PHP license and are unable to |" - "\n | obtain it through the world-wide-web, please send a note to |" - "\n | li...@ph... so we can mail you a copy immediately. |" - "\n +----------------------------------------------------------------------+" - "\n | Authors: |" - "\n | |" - "\n +----------------------------------------------------------------------+" "\n */\n"; - void SwigPHP_emit_resource_registrations() { Iterator ki; @@ -652,7 +633,6 @@ Printf(s_oinit, "ZEND_INIT_MODULE_GLOBALS(%s, %s_init_globals, %s_destroy_globals);\n", module, module, module); /* start the header section */ - Printf(s_header, php_header); Printf(s_header, "ZEND_BEGIN_MODULE_GLOBALS(%s)\n", module); Printf(s_header, "char *error_msg;\n"); Printf(s_header, "int error_code;\n"); @@ -706,7 +686,6 @@ } Swig_banner(f_h); - Printf(f_h, php_header); Printf(f_h, "\n\n"); Printf(f_h, "#ifndef PHP_%s_H\n", cap_module); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2008-04-05 20:53:24
|
Revision: 10351 http://swig.svn.sourceforge.net/swig/?rev=10351&view=rev Author: wsfulton Date: 2008-04-05 13:53:23 -0700 (Sat, 05 Apr 2008) Log Message: ----------- fix #1934695 Getattr(n, wrap:name) assertion Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2008-04-05 20:27:42 UTC (rev 10350) +++ trunk/Source/Modules/php4.cxx 2008-04-05 20:53:23 UTC (rev 10351) @@ -2712,6 +2712,8 @@ Printf(df->code, " arg1 = (%s)SWIG_ZTS_ConvertResourceData(ptr,type_name,SWIGTYPE%s TSRMLS_CC);\n", SwigType_lstr(pt, 0), SwigType_manglestr(pt)); Printf(df->code, " if (! arg1) zend_error(E_ERROR, \"%s resource already free'd\");\n", Char(name)); + Setattr(n, "wrap:name", destructorname); + emit_action(n, df); Printf(df->code, "}\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2007-11-28 00:46:54
|
Revision: 10174 http://swig.svn.sourceforge.net/swig/?rev=10174&view=rev Author: olly Date: 2007-11-27 16:46:53 -0800 (Tue, 27 Nov 2007) Log Message: ----------- PHP4 reaches EOL at the end of 2007, so remove PHP4 specific entry from the todo list. Tweak message about lack of multiple inheritance to say "PHP" rather than "Php4". Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2007-11-26 21:21:59 UTC (rev 10173) +++ trunk/Source/Modules/php4.cxx 2007-11-28 00:46:53 UTC (rev 10174) @@ -32,9 +32,6 @@ * * Long term: * - * Option to generate code to work with PHP4 instead ("public $_cPtr;" -> - * "var $_cPtr;", "abstract" -> "", no static class functions - but making - * these changes gives a segfault with make check...) * Sort out locale-dependent behaviour of strtod() - it's harmless unless * SWIG ever sets the locale and DOH/base.c calls atof, so we're probably * OK currently at least. @@ -2089,7 +2086,7 @@ String *proxyclassname = SwigType_str(Getattr(n, "classtypeobj"), 0); String *baseclassname = SwigType_str(Getattr(base.item, "name"), 0); Swig_warning(WARN_PHP4_MULTIPLE_INHERITANCE, input_file, line_number, - "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Php4.\n", proxyclassname, baseclassname); + "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in PHP.\n", proxyclassname, baseclassname); base = Next(base); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2008-05-11 21:23:08
|
Revision: 10442 http://swig.svn.sourceforge.net/swig/?rev=10442&view=rev Author: olly Date: 2008-05-11 14:22:58 -0700 (Sun, 11 May 2008) Log Message: ----------- Use GetFlag not Getattr on feature:notabstract Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2008-05-11 21:17:22 UTC (rev 10441) +++ trunk/Source/Modules/php4.cxx 2008-05-11 21:22:58 UTC (rev 10442) @@ -2321,7 +2321,7 @@ base.item = NULL; } - if (Getattr(n, "abstract") && !Getattr(n, "feature:notabstract")) { + if (Getattr(n, "abstract") && !GetFlag(n, "feature:notabstract")) { Swig_print_node(n); Printf(s_phpclasses, "abstract "); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2008-05-11 21:23:55
|
Revision: 10443 http://swig.svn.sourceforge.net/swig/?rev=10443&view=rev Author: olly Date: 2008-05-11 14:23:51 -0700 (Sun, 11 May 2008) Log Message: ----------- And remove a line I added to track down the abstract problem! Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2008-05-11 21:22:58 UTC (rev 10442) +++ trunk/Source/Modules/php4.cxx 2008-05-11 21:23:51 UTC (rev 10443) @@ -2322,7 +2322,6 @@ } if (Getattr(n, "abstract") && !GetFlag(n, "feature:notabstract")) { - Swig_print_node(n); Printf(s_phpclasses, "abstract "); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ol...@us...> - 2008-06-24 00:41:09
|
Revision: 10567 http://swig.svn.sourceforge.net/swig/?rev=10567&view=rev Author: olly Date: 2008-06-23 17:41:07 -0700 (Mon, 23 Jun 2008) Log Message: ----------- Clean up dead and unused code in SwigToPhpType(), and rename to GetShadowReturnType(). Modified Paths: -------------- trunk/Source/Modules/php4.cxx Modified: trunk/Source/Modules/php4.cxx =================================================================== --- trunk/Source/Modules/php4.cxx 2008-06-24 00:33:08 UTC (rev 10566) +++ trunk/Source/Modules/php4.cxx 2008-06-24 00:41:07 UTC (rev 10567) @@ -1194,7 +1194,7 @@ if (native_constructor == NATIVE_CONSTRUCTOR) { Printf(f->code, "add_property_zval(this_ptr,\"" SWIG_PTR "\",_cPtr);\n"); } else { - String *shadowrettype = SwigToPhpType(n, true); + String *shadowrettype = GetShadowReturnType(n); Printf(f->code, "object_init_ex(return_value,ptr_ce_swig_%s);\n", shadowrettype); Delete(shadowrettype); Printf(f->code, "add_property_zval(return_value,\"" SWIG_PTR "\",_cPtr);\n"); @@ -2559,20 +2559,9 @@ return SWIG_OK; } - - String * SwigToPhpType(Node *n, int shadow_flag) { - String *ptype = 0; + String * GetShadowReturnType(Node *n) { SwigType *t = Getattr(n, "type"); - if (shadow_flag) { - ptype = PhpTypeFromTypemap((char *) "pstype", n, (char *) ""); - } - if (!ptype) { - ptype = PhpTypeFromTypemap((char *) "ptype", n, (char *) ""); - } - - if (ptype) return ptype; - /* Map type here */ switch (SwigType_type(t)) { case T_CHAR: @@ -2593,7 +2582,7 @@ case T_POINTER: case T_REFERENCE: case T_USER: - if (shadow_flag && is_shadow(t)) { + if (is_shadow(t)) { return NewString(Char(is_shadow(t))); } break; @@ -2601,7 +2590,7 @@ /* TODO */ break; default: - Printf(stderr, "SwigToPhpType: unhandled data type: %s\n", SwigType_str(t, 0)); + Printf(stderr, "GetShadowReturnType: unhandled data type: %s\n", SwigType_str(t, 0)); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |