[Swig-cvs] SF.net SVN: swig:[12520] trunk

[<ol...@us...>]

Revision: 12520
          http://swig.svn.sourceforge.net/swig/?rev=12520&view=rev
Author:   olly
Date:     2011-03-07 04:06:54 +0000 (Mon, 07 Mar 2011)

Log Message:
-----------
[PHP] Add casts to the typemaps for long long and unsigned long
long to avoid issues when they are used with shorter types via
%apply.

Modified Paths:
--------------
    trunk/CHANGES.current
    trunk/Lib/php/php.swg
    trunk/Lib/php/typemaps.i

Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current	2011-03-07 03:14:24 UTC (rev 12519)
+++ trunk/CHANGES.current	2011-03-07 04:06:54 UTC (rev 12520)
@@ -5,6 +5,11 @@
 Version 2.0.3 (in progress)
 ===========================
 
+2011-03-06: olly
+	    [PHP] Add casts to the typemaps for long long and unsigned long
+	    long to avoid issues when they are used with shorter types via
+	    %apply.
+
 2011-03-02: wsfulton
 	    Templated smart pointers overloaded with both const and non const operator-> generated uncompilable
 	    code when the pointee was a class with either public member variables or static methods.

Modified: trunk/Lib/php/php.swg
===================================================================
--- trunk/Lib/php/php.swg	2011-03-07 03:14:24 UTC (rev 12519)
+++ trunk/Lib/php/php.swg	2011-03-07 04:06:54 UTC (rev 12520)
@@ -201,7 +201,7 @@
     return_value->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%lld", $1);
+    sprintf(temp, "%lld", (long long)$1);
     ZVAL_STRING(return_value, temp, 1);
   }
 %}
@@ -212,7 +212,7 @@
     return_value->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%llu", $1);
+    sprintf(temp, "%llu", (unsigned long long)$1);
     ZVAL_STRING(return_value, temp, 1);
   }
 %}
@@ -239,7 +239,7 @@
     return_value->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%lld", *$1);
+    sprintf(temp, "%lld", (long long)(*$1));
     ZVAL_STRING(return_value, temp, 1);
   }
 %}
@@ -250,7 +250,7 @@
     return_value->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%llu", *$1);
+    sprintf(temp, "%llu", (unsigned long long)(*$1));
     ZVAL_STRING(return_value, temp, 1);
   }
 %}

Modified: trunk/Lib/php/typemaps.i
===================================================================
--- trunk/Lib/php/typemaps.i	2011-03-07 03:14:24 UTC (rev 12519)
+++ trunk/Lib/php/typemaps.i	2011-03-07 04:06:54 UTC (rev 12520)
@@ -134,7 +134,7 @@
     ZVAL_LONG(o, temp$argnum);
   } else {
     char temp[256];
-    sprintf(temp, "%lld", temp$argnum);
+    sprintf(temp, "%lld", (long long)temp$argnum);
     ZVAL_STRING(o, temp, 1);
   }
   t_output_helper( &$result, o );
@@ -151,7 +151,7 @@
     (*$arg)->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%lld", lvalue$argnum);
+    sprintf(temp, "%lld", (long long)lvalue$argnum);
     ZVAL_STRING((*$arg), temp, 1);
   }
 %}
@@ -162,7 +162,7 @@
     ($result)->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%lld", *arg$argnum);
+    sprintf(temp, "%lld", (long long)(*arg$argnum));
     ZVAL_STRING($result, temp, 1);
   }
 %}
@@ -175,7 +175,7 @@
     ZVAL_LONG(o, temp$argnum);
   } else {
     char temp[256];
-    sprintf(temp, "%llu", temp$argnum);
+    sprintf(temp, "%llu", (unsigned long long)temp$argnum);
     ZVAL_STRING(o, temp, 1);
   }
   t_output_helper( &$result, o );
@@ -192,7 +192,7 @@
     (*$arg)->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%llu", lvalue$argnum);
+    sprintf(temp, "%llu", (unsigned long long)lvalue$argnum);
     ZVAL_STRING((*$arg), temp, 1);
   }
 %}
@@ -203,7 +203,7 @@
     ($result)->type = IS_LONG;
   } else {
     char temp[256];
-    sprintf(temp, "%llu", *arg$argnum);
+    sprintf(temp, "%llu", (unsigned long long)(*arg$argnum));
     ZVAL_STRING($result, temp, 1);
   }
 %}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.