[binaryphp-cvs] binaryphp/functions/arrays array.cpp,1.3,1.4

[<da...@us...>]

Update of /cvsroot/binaryphp/binaryphp/functions/arrays
In directory sc8-pr-cvs1:/tmp/cvs-serv17255/functions/arrays

Modified Files:
	array.cpp 
Log Message:
Arrays fully work.

Index: array.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/arrays/array.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** array.cpp	7 Aug 2003 05:39:03 -0000	1.3
--- array.cpp	31 Aug 2003 01:20:17 -0000	1.4
***************
*** 7,21 ****
  	arr.to_array();
  	int i = 0;
! 	for(int i = 0; i < key / 2; ++i)
  	{
! 		php_var key2 = *(va_arg(ap, php_var*));
! 		if(key2 == -1)
  		{
  			bool found = false;
  			for(;;)
  			{
! 				for(i = 0;i < arr.keys.size(); ++i)
  				{
! 					if(arr.keys[i] == (php_var) i)
  						found = true;
  				}
--- 7,22 ----
  	arr.to_array();
  	int i = 0;
! 	for(int i = 0; i < key; ++i)
  	{
! 		php_var *temp = (php_var *) va_arg(ap, void *);
! 		php_var key2;
! 		if(temp == NULL)
  		{
  			bool found = false;
  			for(;;)
  			{
! 				for(int z = 0; z < arr.keys.size(); ++z)
  				{
! 					if(arr.keys[z] == (php_var) i)
  						found = true;
  				}
***************
*** 27,34 ****
  			key2 = i;
  		}
! 		php_var val = *(va_arg(ap, php_var*));
  		arr.keys.push_back(key2);
  		arr.data.push_back(val);
! 	}
  	va_end(ap);
  	return arr;
--- 28,37 ----
  			key2 = i;
  		}
! 		else
! 			key2 = *temp;
! 		php_var val = *((php_var *) va_arg(ap, void *));
  		arr.keys.push_back(key2);
  		arr.data.push_back(val);
! 	};
  	va_end(ap);
  	return arr;