This commit was manufactured by cvs2svn to create tag 'PRE_ENGINE2_SPLIT'.

Zend/FlexLexer.h

@@ -0,0 +1,186 @@
+// $Header$
+
+// FlexLexer.h -- define interfaces for lexical analyzer classes generated
+//		  by flex
+
+// Copyright (c) 1993 The Regents of the University of California.
+// All rights reserved.
+//
+// This code is derived from software contributed to Berkeley by
+// Kent Williams and Tom Epperly.
+//
+// Redistribution and use in source and binary forms with or without
+// modification are permitted provided that: (1) source distributions retain
+// this entire copyright notice and comment, and (2) distributions including
+// binaries display the following acknowledgement:  ``This product includes
+// software developed by the University of California, Berkeley and its
+// contributors'' in the documentation or other materials provided with the
+// distribution and in all advertising materials mentioning features or use
+// of this software.  Neither the name of the University nor the names of
+// its contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+// This file defines FlexLexer, an abstract class which specifies the
+// external interface provided to flex C++ lexer objects, and yyFlexLexer,
+// which defines a particular lexer class.
+//
+// If you want to create multiple lexer classes, you use the -P flag
+// to rename each yyFlexLexer to some other xxFlexLexer.  You then
+// include <FlexLexer.h> in your other sources once per lexer class:
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer xxFlexLexer
+//	#include <FlexLexer.h>
+//
+//	#undef yyFlexLexer
+//	#define yyFlexLexer zzFlexLexer
+//	#include <FlexLexer.h>
+//	...
+
+#ifndef FLEXLEXER_H
+// Never included before - need to define base class.
+#define FLEXLEXER_H
+#include <iostream.h>
+
+extern "C++" {
+
+struct yy_buffer_state;
+typedef int yy_state_type;
+
+class FlexLexer {
+public:
+	virtual ~FlexLexer()	{ }
+
+	const char* YYText()	{ return yytext; }
+	int YYLeng()		{ return yyleng; }
+
+	virtual void
+		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
+	virtual struct yy_buffer_state*
+		yy_create_buffer( istream* s, int size ) = 0;
+	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
+	virtual void yyrestart( istream* s ) = 0;
+
+	virtual int yylex() = 0;
+
+	// Call yylex with new input/output sources.
+	int yylex( istream* new_in, ostream* new_out = 0 )
+		{
+		switch_streams( new_in, new_out );
+		return yylex();
+		}
+
+	// Switch to new input/output streams.  A nil stream pointer
+	// indicates "keep the current one".
+	virtual void switch_streams( istream* new_in = 0,
+					ostream* new_out = 0 ) = 0;
+
+	int lineno() const		{ return yylineno; }
+
+	int debug() const		{ return yy_flex_debug; }
+	void set_debug( int flag )	{ yy_flex_debug = flag; }
+
+protected:
+	char* yytext;
+	int yyleng;
+	int yylineno;		// only maintained if you use %option yylineno
+	int yy_flex_debug;	// only has effect with -d or "%option debug"
+};
+
+}
+#endif
+
+#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
+// Either this is the first time through (yyFlexLexerOnce not defined),
+// or this is a repeated include to define a different flavor of
+// yyFlexLexer, as discussed in the flex man page.
+#define yyFlexLexerOnce
+
+class yyFlexLexer : public FlexLexer {
+public:
+	// arg_yyin and arg_yyout default to the cin and cout, but we
+	// only make that assignment when initializing in yylex().
+	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
+
+	virtual ~yyFlexLexer();
+
+	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
+	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
+	void yy_delete_buffer( struct yy_buffer_state* b );
+	void yyrestart( istream* s );
+
+	virtual int yylex();
+	virtual void switch_streams( istream* new_in, ostream* new_out );
+
+protected:
+	virtual int LexerInput( char* buf, int max_size );
+	virtual void LexerOutput( const char* buf, int size );
+	virtual void LexerError( const char* msg );
+
+	void yyunput( int c, char* buf_ptr );
+	int yyinput();
+
+	void yy_load_buffer_state();
+	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
+	void yy_flush_buffer( struct yy_buffer_state* b );
+
+	int yy_start_stack_ptr;
+	int yy_start_stack_depth;
+	int* yy_start_stack;
+
+	void yy_push_state( int new_state );
+	void yy_pop_state();
+	int yy_top_state();
+
+	yy_state_type yy_get_previous_state();
+	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
+	int yy_get_next_buffer();
+
+	istream* yyin;	// input source for default LexerInput
+	ostream* yyout;	// output sink for default LexerOutput
+
+	struct yy_buffer_state* yy_current_buffer;
+
+	// yy_hold_char holds the character lost when yytext is formed.
+	char yy_hold_char;
+
+	// Number of characters read into yy_ch_buf.
+	int yy_n_chars;
+
+	// Points to current character in buffer.
+	char* yy_c_buf_p;
+
+	int yy_init;		// whether we need to initialize
+	int yy_start;		// start state number
+
+	// Flag which is used to allow yywrap()'s to do buffer switches
+	// instead of setting up a fresh yyin.  A bit of a hack ...
+	int yy_did_buffer_switch_on_eof;
+
+	// The following are not always needed, but may be depending
+	// on use of certain flex features (like REJECT or yymore()).
+
+	yy_state_type yy_last_accepting_state;
+	char* yy_last_accepting_cpos;
+
+	yy_state_type* yy_state_buf;
+	yy_state_type* yy_state_ptr;
+
+	char* yy_full_match;
+	int* yy_full_state;
+	int yy_full_lp;
+
+	int yy_lp;
+	int yy_looking_for_trail_begin;
+
+	int yy_more_flag;
+	int yy_more_len;
+	int yy_more_offset;
+	int yy_prev_more_offset;
+};
+
+#endif

Zend/LICENSE

@@ -0,0 +1,116 @@
+---------------------------------------------------------------------------
+                    The Zend License, version 0.92
+           Copyright (C) 1999-2001    Zend Technologies Ltd.
+---------------------------------------------------------------------------
+
+The Zend scripting engine library is a product of Zend Technologies Ltd.
+It may be used and/or distributed under the terms of the Q Public
+License (QPL) version 1.0, enclosed below.
+
+For more information about Zend please visit http://www.zend.com/
+For license related questions please mail license@zend.com
+
+===========================================================================
+
+			     THE Q PUBLIC LICENSE
+				  version 1.0
+
+		   Copyright (C) 1999 Troll Tech AS, Norway.
+		       Everyone is permitted to copy and
+		       distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0.  Such software is herein referred to as
+the Software.  This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+				 Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license.  Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+     a. Modifications must not alter or remove any copyright notices in
+        the Software.
+
+     b. When modifications to the Software are released under this
+        license, a non-exclusive royalty-free right is granted to the
+        initial developer of the Software to distribute your modification
+        in future versions of the Software provided such versions remain
+        available under these terms in addition to any other license(s) of
+        the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+     a. You must include this license document in the distribution.
+
+     b. You must ensure that all recipients of the machine-executable forms
+        are also able to receive the complete machine-readable source code
+        to the distributed Software, including all modifications, without
+        any charge beyond the costs of data transfer, and place prominent
+        notices in the distribution explaining this.
+
+     c. You must ensure that all modifications included in the
+        machine-executable forms are available under the terms of this
+        license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software.  These items, when distributed, are subject to the following
+   requirements:
+
+     a. You must ensure that all recipients of machine-executable forms of
+        these items are also able to receive and use the complete
+        machine-readable source code to the items without any charge
+        beyond the costs of data transfer.
+
+     b. You must explicitly license all recipients of your items to use
+        and re-distribute original and modified versions of the items in
+        both machine-executable and source code forms. The recipients must
+        be able to do so without any charges whatsoever, and they must be
+        able to re-distribute to anyone they choose.
+
+
+     c. If the items are not available to the general public, and the
+        initial developer of the Software requests a copy of the items,
+        then you must supply one.
+
+			    Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+			          No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+
+
+===========================================================================

Zend/Makefile.am

@@ -0,0 +1,49 @@
+## Process this file with automake to produce Makefile.in -*- makefile -*-
+
+#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output
+
+AUTOMAKE_OPTIONS=foreign
+noinst_LTLIBRARIES=libZend.la
+
+libZend_la_SOURCES=\
+	zend_language_parser.y zend_language_scanner.l \
+	zend_ini_parser.y zend_ini_scanner.l \
+	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
+	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
+	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
+	zend_ini.c
+
+libZend_la_LDFLAGS = @EXTRA_LIBS@
+
+# automake isn't too clever about "non-standard" use of lex and yacc
+
+$(libZend_la_OBJECTS): zend_language_parser.h
+
+zend_ini_scanner.lo: zend_ini_parser.h
+
+# Language parser/scanner rules
+
+zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
+	$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
+
+zend_language_parser.h: zend_language_parser.c
+zend_language_parser.c: $(srcdir)/zend_language_parser.y
+	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c
+
+# INI parser/scanner rules
+
+zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
+	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
+
+zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
+	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
+
+zend_ini_parser.h: zend_ini_parser.c
+
+depend:
+
+zend_execute.lo: $(srcdir)/zend_execute.c
+	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c
+

Zend/ZEND_CHANGES

@@ -0,0 +1,112 @@
+Improvements
+------------
+
+Zend was designed from the ground up for increased speed,
+reduced memory consumption and more reliable execution.  We dare
+say it meets all of these goals and does so pretty well.  Beyond
+that, there are several improvements in the language engine
+features:
+
+* References support.  $foo = &$a; would make $foo and $a be two
+  names to the same variable.  This works with arrays as well,
+  on either side;  e.g., $foo = &$a[7]; would make $foo and $a[7]
+  be two names to the same variable.  Changing one would change
+  the other and vice versa.
+* Object overloading support.  This feature allows various OO
+  libraries to use the OO notation of PHP to access their
+  functionality.  Right now, no use is made of that feature,
+  but we'd have a COM module ready by the time PHP 4.0 is released.
+  A CORBA module would probably follow.
+* include() and eval() are now functions, and not statements.
+  That means they return a value.  The default return value from
+  include() and eval() is 1, so that you can do if (include())
+  without further coding.  The return value may be changed by
+  returning a value from the global scope of the included file
+  or the evaluated string.  For example, if 'return 7;' is executed
+  in the global scope of foo.inc, include("foo.inc") would evaluate
+  to 7.
+* Automatic resource deallocation.  Several people have been bitten
+  by the fact that PHP 3.0 had no concept of reference counting.
+  Zend adds full reference counting for every value in the system,
+  including resources.  As soon as a resource is no longer referenced
+  from any variable, it is automatically destroyed to save memory
+  and resources.  The most obvious example for the advantage in this
+  is a loop that has an SQL query inside it, something like
+  '$result = sql_query(...);'.  In PHP 3.0, every iteration resulted
+  in another SQL result-set allocated in the memory, and all of the
+  result sets weren't destroyed until the end of the script's execution.
+  In Zend, as soon as we overwrite an old result set with a new one,
+  the old result set which is no longer referenced, is destroyed.
+* Full support for nesting arrays and objects within each other, in
+  as many levels as you want.
+* Boolean type.  true and false are now constants of type boolean.
+  Comparing any other value to them would convert that value to a
+  boolean first, and conduct the comparison later.  That means, for
+  example, that 5==true would evaluate to true (in PHP 3.0, true
+  was nothing but a constant for the integer value of 1, so 5==true
+  was identical to 5==1, which was false).
+* Runtime binding of function names.  This complex name has a simple
+  explanation - you can now call functions before they're declared!
+* Added here-docs support.
+* Added foreach.  Two syntaxes supported:
+   foreach(array_expr as $val) statement
+   foreach(array_expr as $key => $val) statement
+* A true unset() implementation.  A variable or element that is unset(), is now
+  sent to oblivion in its entirely, no trace remains from it.
+* Output buffering support!  Use ob_start() to begin output buffering, ob_end_flush()
+  to end buffering and send out the buffered contents, ob_end_clean() to end buffering
+  without sending the buffered contents, and ob_get_contents() to retreive the current
+  contents of the output buffer.
+  Header information (header(), content type, cookies) are not buffered.  By turning
+  on output buffering, you can effectively send header information all throughout your
+  file, regardless of whether you've emitted body output or not.
+* Full variable reference within quoted strings:
+  ${expr}		- full indirect reference support for scalar variables
+  {variable}	- full variable support
+  For example:
+  $foo[5]["bar"] = "foobar";
+  print "{$foo[5]["bar"]}";  // would print "foobar"
+* Ability to call member functions of other classes from within member functions or from
+  the global scope. You can now, for example, override a parent function with a child function,
+  and call the parent function from it. 
+* Runtime information for classes (class name, parent, available functions, etc.).
+* Much more efficient syntax highlighter - runs much quicker, performs more reliably, and
+  generates much tighter HTML.
+* A full-featured debugger has been integrated with the language (supports breakpoints,
+  expression evaluation, step-in/over, function call backtrace, and more).
+
+
+Incompatabilities
+-----------------
+
+Zend claims 100% compatability with the engine of PHP 3.0, and is
+shamelessly lying about it.  Here's why:
+
+* static variable initializers only accept scalar values
+  (in PHP 3.0 they accepted any valid expression).  The impact
+  should be somewhere in between void and non existent, since
+  initializing a static variable with anything but a simple
+  static value makes no sense at all.
+
+* The scope of break and continue is local to that of an
+  include()'d file or an eval()'d string.  The impact should
+  be somewhat smaller of the one above.
+
+* return statement from a require()'d file no longer works.  It
+  hardly worked in PHP 3.0, so the impact should be fairly small.
+  If you want this functionality - use include() instead.
+
+* unset() is no longer a function, but a statement.  It was never
+  documented as a function so the impact should be no bigger than
+  nada.
+
+* The following letter combination is not supported within encapsulated
+  strings:  "{$".  If you have a string that includes this letter
+  combination, for example, print "{$somevar"; (which printed the
+  letter { and the contents of the variable $somevar in PHP 3.0),
+  it will result in a parse error under Zend.  In this case, you
+  would have to change the code to print "\{$somevar";
+  This incompatability is due to the full variable reference
+  within quoted strings feature added in Zend.
+  
+

Zend/Zend.dsp

@@ -0,0 +1,494 @@
+# Microsoft Developer Studio Project File - Name="Zend" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=Zend - Win32 Release_inline
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Zend.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug"
+# ADD RSC /l 0x40d /d "NDebug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_Debug"
+# ADD RSC /l 0x40d /d "_Debug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Zend___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "Zend___Win32_Release_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_inline"
+# PROP Intermediate_Dir "Release_inline"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug"
+# ADD RSC /l 0x40d /d "NDebug"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Zend - Win32 Release"
+# Name "Zend - Win32 Debug"
+# Name "Zend - Win32 Release_inline"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FlexLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.y"
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.l"
+
+!IF  "$(CFG)" == "Zend - Win32 Release"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_TODO
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project

Zend/Zend.m4

@@ -0,0 +1,183 @@
+
+AC_DEFUN(LIBZEND_BISON_CHECK,[
+
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
+else
+    AC_MSG_CHECKING(bison version)
+    set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'`
+    if test "${1}" = "1" -a "${2}" -lt "28"; then
+        AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
+    fi
+    AC_MSG_RESULT(${1}.${2} (ok))
+fi
+
+])
+
+AC_DEFUN(LIBZEND_BASIC_CHECKS,[
+
+AC_REQUIRE([AC_PROG_YACC])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C_O])
+AC_REQUIRE([AC_PROG_LEX])
+AC_REQUIRE([AC_HEADER_STDC])
+
+LIBZEND_BISON_CHECK
+
+dnl Ugly hack to get around a problem with gcc on AIX.
+if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
+   "`uname -sv`" = "AIX 4"; then
+	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
+fi
+
+dnl Hack to work around a Mac OS X cpp problem
+dnl Known versions needing this workaround are 5.3 and 5.4
+if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
+        CPPFLAGS="$CPPFLAGS -traditional-cpp"
+fi
+
+AC_CHECK_HEADERS(
+limits.h \
+malloc.h \
+string.h \
+unistd.h \
+stdarg.h \
+sys/types.h \
+sys/time.h \
+signal.h \
+unix.h \
+dlfcn.h)
+
+AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
+
+AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
+AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
+
+dnl This is required for QNX and may be some BSD derived systems
+AC_CHECK_TYPE( uint, unsigned int )
+AC_CHECK_TYPE( ulong, unsigned long )
+
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_FUNC_MEMCMP
+AC_FUNC_ALLOCA
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
+AC_ZEND_BROKEN_SPRINTF
+
+AC_CHECK_FUNCS(finite isfinite isinf isnan)
+
+ZEND_FP_EXCEPT
+	
+])
+
+
+
+
+
+AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
+
+AC_ARG_ENABLE(debug,
+[  --enable-debug         Compile with debugging symbols],[
+  ZEND_DEBUG=$enableval
+],[
+  ZEND_DEBUG=no
+])  
+
+])
+
+
+
+
+
+
+
+
+
+
+
+
+AC_DEFUN(LIBZEND_OTHER_CHECKS,[
+
+AC_ARG_ENABLE(experimental-zts,
+[  --enable-experimental-zts   This will most likely break your build],[
+  ZEND_EXPERIMENTAL_ZTS=$enableval
+],[
+  ZEND_EXPERIMENTAL_ZTS=no
+])  
+
+AC_ARG_ENABLE(inline-optimization,
+[  --enable-inline-optimization   If you have much memory and are using
+                                 gcc, you might try this.],[
+  ZEND_INLINE_OPTIMIZATION=$enableval
+],[
+  ZEND_INLINE_OPTIMIZATION=no
+])
+
+AC_ARG_ENABLE(memory-limit,
+[  --enable-memory-limit   Compile with memory limit support. ], [
+  ZEND_MEMORY_LIMIT=$enableval
+],[
+  ZEND_MEMORY_LIMIT=no
+])
+
+AC_MSG_CHECKING(whether to enable experimental ZTS)
+AC_MSG_RESULT($ZEND_EXPERIMENTAL_ZTS)
+
+AC_MSG_CHECKING(whether to enable inline optimization for GCC)
+AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
+
+AC_MSG_CHECKING(whether to enable a memory limit)
+AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
+
+AC_MSG_CHECKING(whether to enable Zend debugging)
+AC_MSG_RESULT($ZEND_DEBUG)
+	
+if test "$ZEND_DEBUG" = "yes"; then
+  AC_DEFINE(ZEND_DEBUG,1,[ ])
+  echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
+  if test "$CFLAGS" = "-g -O2"; then
+  	CFLAGS=-g
+  fi
+  test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
+  test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
+    DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
+else
+  AC_DEFINE(ZEND_DEBUG,0,[ ])
+fi
+
+test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
+
+if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
+  AC_DEFINE(ZTS,1,[ ])
+  CFLAGS="$CFLAGS -DZTS"
+  LIBZEND_CPLUSPLUS_CHECKS
+fi  
+
+if test "$ZEND_MEMORY_LIMIT" = "yes"; then
+  AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
+else
+  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
+fi
+
+
+changequote({,})
+if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
+  INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
+else
+  INLINE_CFLAGS="$CFLAGS"
+fi
+changequote([,])
+
+AC_C_INLINE
+
+AC_SUBST(INLINE_CFLAGS)
+
+])
+
+
+AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
+
+])
+

Zend/ZendCore.dep

@@ -0,0 +1,258 @@
+# Microsoft Developer Studio Generated Dependency File, included by ZendCore.mak
+
+.\zend_alloc.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\alloca.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_compile.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_constants.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_execute.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_highlight.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_highlight.h"\
+	".\zend_llist.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_language_parser.tab.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_llist.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_llist.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_opcode.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+.\zend_operators.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ptr_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_ptr_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_stack.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_stack.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_variables.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend_operators.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_API.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_compile.h"\
+	".\zend_config.w32.h"\
+	".\zend_constants.h"\
+	".\zend_execute.h"\
+	".\zend_llist.h"\
+	".\zend_modules.h"\
+	".\zend_operators.h"\
+	".\zend_ptr_stack.h"\
+	".\zend_stack.h"\
+	".\zend_variables.h"\
+	".\zend.h"\
+	".\zend_API.h"\
+	".\zend_errors.h"\
+	".\zend_globals.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	".\zend_list.h"\
+	
+
+.\zend_hash.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	
+
+.\zend_ini.c : \
+	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
+	".\zend_alloc.h"\
+	".\zend_config.w32.h"\
+	".\zend.h"\
+	".\zend_errors.h"\
+	".\zend_hash.h"\
+	".\zend_ini.h"\
+	
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+
+!IF  "$(CFG)" == "ZendCore - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ZendCore - Win32 Debug"
+
+!ENDIF 
+

Zend/ZendTS.dsp

@@ -0,0 +1,643 @@
+# Microsoft Developer Studio Project File - Name="ZendTS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=ZendTS - Win32 Release_TSDbg
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "ZendTS.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_Debug_TS"
+# ADD RSC /l 0x40d /d "_Debug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TS_inline"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TS_inline"
+# PROP Intermediate_Dir "Release_TS_inline"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Output_Dir "ZendTS___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TSDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Output_Dir "Release_TSDbg"
+# PROP Intermediate_Dir "Release_TSDbg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x40d /d "NDebug_TS"
+# ADD RSC /l 0x40d /d "NDebug_TS"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "ZendTS - Win32 Release_TS"
+# Name "ZendTS - Win32 Debug_TS"
+# Name "ZendTS - Win32 Release_TS_inline"
+# Name "ZendTS - Win32 Release_TSDbg"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_language_scanner.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FlexLexer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_builtin_functions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_dynamic_array.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_locks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_fast_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_istdiostream.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=.\zend_ini_parser.y
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputDir=.
+InputPath=.\zend_ini_parser.y
+
+BuildCmds= \
+	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
+
+"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_parser.y"
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend_language_parser.y"
+
+BuildCmds= \
+	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
+
+"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=.\flex.skl
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ini_scanner.l
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputPath=.\zend_ini_scanner.l
+
+"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend_language_scanner.l"
+
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -B -i -Sflex.skl -Pzend -ozend_language_scanner.c zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
+
+# Begin Custom Build
+InputPath=".\zend_language_scanner.l"
+
+"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\LICENSE
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project

Zend/acconfig.h

@@ -0,0 +1,76 @@
+#define ZEND_API
+#define ZEND_DLEXPORT
+
+@TOP@
+
+#undef uint
+#undef ulong
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+
+@BOTTOM@
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+# define zend_sprintf sprintf
+#endif
+
+#include <math.h>
+
+#ifdef HAVE_ISNAN
+#define zend_isnan(a) isnan(a)
+#elif defined(NAN)
+#define zend_isnan(a) (((a)==NAN)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+#else
+#define zend_isnan(a) 0
+#endif
+
+#ifdef HAVE_ISINF
+#define zend_isinf(a) isinf(a)
+#elif defined(INFINITY)
+/* Might not work, but is required by ISO C99 */
+#define zend_isinf(a) (((a)==INFINITY)?1:0)
+#elif defined(HAVE_FPCLASS)
+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
+#else
+#define zend_isinf(a) 0
+#endif
+
+#ifdef HAVE_FINITE
+#define zend_finite(a) finite(a)
+#elif defined(HAVE_ISFINITE) || defined(isfinite)
+#define zend_finite(a) isfinite(a)
+#elif defined(fpclassify)
+#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
+#else
+#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/acinclude.m4

@@ -0,0 +1,47 @@
+dnl $Id$
+dnl
+dnl This file contains local autoconf functions.
+
+AC_DEFUN(ZEND_FP_EXCEPT,[
+  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
+    AC_TRY_COMPILE([
+#include <floatingpoint.h>
+],[
+fp_except x = (fp_except) 0;
+],[
+     ac_cv_type_fp_except=yes
+],[
+     ac_cv_type_fp_except=no
+],[
+     ac_cv_type_fp_except=no
+])])
+  if test "$ac_cv_type_fp_except" = "yes"; then
+    AC_DEFINE(HAVE_FP_EXCEPT, 1, [whether floatingpoint.h defines fp_except])
+  fi
+])
+
+dnl
+dnl Check for broken sprintf()
+dnl
+AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
+  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
+    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
+      ac_cv_broken_sprintf=no
+    ],[
+      ac_cv_broken_sprintf=yes
+    ],[
+      ac_cv_broken_sprintf=no
+    ])
+  ])
+  if test "$ac_cv_broken_sprintf" = "yes"; then
+    ac_result=1
+  else
+    ac_result=0
+  fi
+  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
+])
+
+AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+])
+

Zend/build.mk

@@ -0,0 +1,43 @@
+# Makefile to generate build tools
+#
+# Standard usage:
+#        make -f build.mk
+#
+# Written by Sascha Schumann
+#
+# $Id$ 
+
+
+LT_TARGETS = ltmain.sh ltconfig
+
+config_h_in = zend_config.h.in
+
+makefile_am_files = Makefile.am
+makefile_in_files = $(makefile_am_files:.am=.in)
+makefile_files    = $(makefile_am_files:e.am=e)
+
+targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
+
+all: $(targets)
+
+clean:
+	rm -f $(targets)
+
+$(LT_TARGETS):
+	rm -f $(LT_TARGETS)
+	libtoolize --automake $(AMFLAGS) -f
+
+$(makefile_in_files): $(makefile_am_files)
+	automake -a -i $(AMFLAGS) $(makefile_files)
+
+aclocal.m4: configure.in acinclude.m4
+	aclocal
+
+$(config_h_in): configure.in acconfig.h
+# explicitly remove target since autoheader does not seem to work 
+# correctly otherwise (timestamps are not updated)
+	@rm -f $@
+	autoheader
+
+configure: aclocal.m4 configure.in
+	autoconf

Zend/buildconf

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+case "$1" in
+--copy)
+	automake_flags=--copy
+	shift
+;;
+esac
+
+libtoolize --force --automake $automake_flags
+
+mv aclocal.m4 aclocal.m4.old 2>/dev/null
+aclocal
+if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}aclocal.m4"
+    mv aclocal.m4.old aclocal.m4
+else
+    echo "buildconf: created or modified ${1}aclocal.m4"
+fi
+
+autoheader
+
+automake --add-missing --include-deps $automake_flags
+
+mv configure configure.old 2>/dev/null
+autoconf
+if cmp configure.old configure > /dev/null 2>&1; then
+    echo "buildconf: keeping ${1}configure"
+    mv configure.old configure
+else
+    echo "buildconf: created or modified ${1}configure"
+fi
+

Zend/configure.in

@@ -0,0 +1,45 @@
+dnl $Id$
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(zend.c)
+AM_INIT_AUTOMAKE(zend, 0.80A, nodefine)
+AM_CONFIG_HEADER(zend_config.h)
+AM_SANITY_CHECK
+AM_MAINTAINER_MODE
+AC_PROG_CC
+AM_PROG_LEX
+AM_PROG_CC_STDC
+ZEND_VERSION=$VERSION
+
+dnl We want this one before the checks, so the checks can modify CFLAGS.
+test -z "$CFLAGS" && auto_cflags=1
+
+sinclude(Zend.m4)
+
+LIBZEND_BASIC_CHECKS
+
+AM_PROG_LIBTOOL
+if test "$enable_debug" != "yes"; then
+  AM_SET_LIBTOOL_VARIABLE([--silent])
+fi
+
+dnl
+dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
+dnl and source packages.  This should be harmless on other OSs.
+dnl
+if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+       CFLAGS="$CFLAGS -I/usr/pkg/include"
+       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+fi
+
+LIBZEND_ENABLE_DEBUG
+LIBZEND_OTHER_CHECKS
+
+EXTRA_LIBS="$LIBS"
+LIBS=""
+AC_SUBST(EXTRA_LIBS)
+AC_OUTPUT(Makefile)
+
+# Local Variables:
+# tab-width: 4
+# End:

Zend/zend.c

@@ -0,0 +1,832 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend.h"
+#include "zend_extensions.h"
+#include "zend_modules.h"
+#include "zend_constants.h"
+#include "zend_list.h"
+#include "zend_API.h"
+#include "zend_builtin_functions.h"
+#include "zend_ini.h"
+
+#ifdef ZTS
+#	define GLOBAL_FUNCTION_TABLE	global_function_table
+#	define GLOBAL_CLASS_TABLE		global_class_table
+#	define GLOBAL_CONSTANTS_TABLE	global_constants_table
+#else
+#	define GLOBAL_FUNCTION_TABLE	CG(function_table)
+#	define GLOBAL_CLASS_TABLE		CG(class_table)
+#	define GLOBAL_CONSTANTS_TABLE	CG(zend_constants)
+#endif
+
+#if defined(ZEND_WIN32) && ZEND_DEBUG
+BOOL WINAPI IsDebuggerPresent(VOID);
+#endif
+
+/* true multithread-shared globals */
+ZEND_API zend_class_entry zend_standard_class_def;
+ZEND_API int (*zend_printf)(const char *format, ...);
+ZEND_API zend_write_func_t zend_write;
+ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
+ZEND_API void (*zend_block_interruptions)(void);
+ZEND_API void (*zend_unblock_interruptions)(void);
+ZEND_API void (*zend_ticks_function)(int ticks);
+ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+
+static void (*zend_message_dispatcher_p)(long message, void *data);
+static int (*zend_get_configuration_directive_p)(char *name, uint name_length, zval *contents);
+
+
+#ifdef ZTS
+ZEND_API int compiler_globals_id;
+ZEND_API int executor_globals_id;
+ZEND_API int alloc_globals_id;
+HashTable *global_function_table;
+HashTable *global_class_table;
+HashTable *global_constants_table;
+#endif
+
+zend_utility_values zend_uv;
+
+ZEND_API zval zval_used_for_init; /* True global variable */
+
+/* version information */
+static char *zend_version_info;
+static uint zend_version_info_length;
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2001 Zend Technologies\n"
+
+
+#define PRINT_ZVAL_INDENT 4
+
+static void print_hash(HashTable *ht, int indent)
+{
+	zval **tmp;
+	char *string_key;
+	HashPosition iterator;
+	unsigned long num_key, str_len;
+	int i;
+
+	for (i=0; i<indent; i++) {
+		ZEND_PUTS(" ");
+	}
+	ZEND_PUTS("(\n");
+	indent += PRINT_ZVAL_INDENT;
+	zend_hash_internal_pointer_reset_ex(ht, &iterator);
+	while (zend_hash_get_current_data_ex(ht, (void **) &tmp, &iterator) == SUCCESS) {
+		for (i=0; i<indent; i++) {
+			ZEND_PUTS(" ");
+		}
+		ZEND_PUTS("[");
+		switch (zend_hash_get_current_key_ex(ht, &string_key, &str_len, &num_key, 0, &iterator)) {
+			case HASH_KEY_IS_STRING:
+				ZEND_PUTS(string_key);
+				break;
+			case HASH_KEY_IS_LONG:
+				zend_printf("%ld",num_key);
+				break;
+		}
+		ZEND_PUTS("] => ");
+		zend_print_zval_r(*tmp, indent+PRINT_ZVAL_INDENT);
+		ZEND_PUTS("\n");
+		zend_hash_move_forward_ex(ht, &iterator);
+	}
+	indent -= PRINT_ZVAL_INDENT;
+	for (i=0; i<indent; i++) {
+		ZEND_PUTS(" ");
+	}
+	ZEND_PUTS(")\n");
+}
+
+
+ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy)
+{
+	if (expr->type==IS_STRING) {
+		*use_copy = 0;
+		return;
+	}
+	switch (expr->type) {
+		case IS_NULL:
+			expr_copy->value.str.len = 0;
+			expr_copy->value.str.val = empty_string;
+			break;
+		case IS_BOOL:
+			if (expr->value.lval) {
+				expr_copy->value.str.len = 1;
+				expr_copy->value.str.val = estrndup("1", 1);
+			} else {
+				expr_copy->value.str.len = 0;
+				expr_copy->value.str.val = empty_string;
+			}
+			break;
+		case IS_RESOURCE:
+			expr_copy->value.str.val = (char *) emalloc(sizeof("Resource id #")-1 + MAX_LENGTH_OF_LONG);
+			expr_copy->value.str.len = sprintf(expr_copy->value.str.val, "Resource id #%ld", expr->value.lval);
+			break;
+		case IS_ARRAY:
+			expr_copy->value.str.len = sizeof("Array")-1;
+			expr_copy->value.str.val = estrndup("Array", expr_copy->value.str.len);
+			break;
+		case IS_OBJECT:
+			expr_copy->value.str.len = sizeof("Object")-1;
+			expr_copy->value.str.val = estrndup("Object", expr_copy->value.str.len);
+			break;
+		default:
+			*expr_copy = *expr;
+			zval_copy_ctor(expr_copy);
+			convert_to_string(expr_copy);
+			break;
+	}
+	expr_copy->type = IS_STRING;
+	*use_copy = 1;
+}
+
+
+ZEND_API int zend_print_zval(zval *expr, int indent)
+{
+	return zend_print_zval_ex(zend_write, expr, indent);
+}
+
+
+ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent)
+{
+	zval expr_copy;
+	int use_copy;
+
+	zend_make_printable_zval(expr, &expr_copy, &use_copy);
+	if (use_copy) {
+		expr = &expr_copy;
+	}
+	if (expr->value.str.len==0) { /* optimize away empty strings */
+		if (use_copy) {
+			zval_dtor(expr);
+		}
+		return 0;
+	}
+	write_func(expr->value.str.val,expr->value.str.len);
+	if (use_copy) {
+		zval_dtor(expr);
+	}
+	return expr->value.str.len;
+}
+
+
+ZEND_API void zend_print_zval_r(zval *expr, int indent)
+{
+	zend_print_zval_r_ex(zend_write, expr, indent);
+}
+
+
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent) 
+{
+	switch(expr->type) {
+		case IS_ARRAY:
+			ZEND_PUTS("Array\n");
+			if (++expr->value.ht->nApplyCount>1) {
+				ZEND_PUTS(" *RECURSION*");
+				expr->value.ht->nApplyCount=0;
+				return;
+			}
+			print_hash(expr->value.ht,indent);
+			expr->value.ht->nApplyCount--;
+			break;
+		case IS_OBJECT:
+			{
+				zend_object *object = Z_OBJ_P(expr);
+
+				if (++object->properties->nApplyCount>1) {
+					ZEND_PUTS(" *RECURSION*");
+					object->properties->nApplyCount=0;
+					return;
+				}
+				zend_printf("%s Object\n", object->ce->name);
+				print_hash(object->properties, indent);
+				object->properties->nApplyCount--;
+				break;
+			}
+		default:
+			zend_print_variable(expr);
+			break;
+	}
+}
+
+
+static FILE *zend_fopen_wrapper(const char *filename, char **opened_path)
+{
+	if (opened_path) {
+		*opened_path = estrdup(filename);
+	}
+	return fopen(filename, "rb");
+}
+
+
+static void register_standard_class(void)
+{
+	zend_standard_class_def.type = ZEND_INTERNAL_CLASS;
+	zend_standard_class_def.name_length = sizeof("stdClass") - 1;
+	zend_standard_class_def.name = zend_strndup("stdClass", zend_standard_class_def.name_length);
+	zend_standard_class_def.parent = NULL;
+	zend_hash_init_ex(&zend_standard_class_def.default_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
+	zend_hash_init_ex(&zend_standard_class_def.function_table, 0, NULL, ZEND_FUNCTION_DTOR, 1, 0);
+	zend_standard_class_def.handle_function_call = NULL;
+	zend_standard_class_def.handle_property_get = NULL;
+	zend_standard_class_def.handle_property_set = NULL;
+	zend_standard_class_def.refcount = (int *) malloc(sizeof(int));
+	*zend_standard_class_def.refcount = 1;
+	zend_hash_add(GLOBAL_CLASS_TABLE, "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry), NULL);
+}
+
+
+static void zend_set_default_compile_time_values(TSRMLS_D)
+{
+	/* default compile-time values */
+	CG(asp_tags) = 0;
+	CG(short_tags) = 1;
+	CG(allow_call_time_pass_reference) = 1;
+	CG(extended_info) = 0;
+}
+
+
+#ifdef ZTS
+static void compiler_globals_ctor(zend_compiler_globals *compiler_globals TSRMLS_DC)
+{
+	zend_function tmp_func;
+	zend_class_entry tmp_class;
+
+	compiler_globals->compiled_filename = NULL;
+
+	compiler_globals->function_table = (HashTable *) malloc(sizeof(HashTable));
+	zend_hash_init_ex(compiler_globals->function_table, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
+	zend_hash_copy(compiler_globals->function_table, global_function_table, NULL, &tmp_func, sizeof(zend_function));
+
+	compiler_globals->class_table = (HashTable *) malloc(sizeof(HashTable));
+	zend_hash_init_ex(compiler_globals->class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
+	zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry));
+
+	zend_set_default_compile_time_values(TSRMLS_C);
+
+	CG(interactive) = 0;
+}
+
+
+static void compiler_globals_dtor(zend_compiler_globals *compiler_globals TSRMLS_DC)
+{
+	if (compiler_globals->function_table != global_function_table) {
+		zend_hash_destroy(compiler_globals->function_table);
+		free(compiler_globals->function_table);
+	}
+	if (compiler_globals->class_table != global_class_table) {
+		zend_hash_destroy(compiler_globals->class_table);
+		free(compiler_globals->class_table);
+	}
+}
+
+
+static void executor_globals_ctor(zend_executor_globals *executor_globals TSRMLS_DC)
+{
+	if (global_constants_table) {
+		zend_startup_constants(TSRMLS_C);
+		zend_copy_constants(EG(zend_constants), global_constants_table);
+	}
+	zend_init_rsrc_plist(TSRMLS_C);
+	EG(lambda_count)=0;
+	EG(user_error_handler) = NULL;
+	EG(in_execution) = 0;
+}
+
+
+static void executor_globals_dtor(zend_executor_globals *executor_globals TSRMLS_DC)
+{
+	zend_shutdown_constants(TSRMLS_C);
+	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
+	zend_ini_shutdown(TSRMLS_C);
+}
+
+
+static void zend_new_thread_end_handler(THREAD_T thread_id TSRMLS_DC)
+{
+	zend_copy_ini_directives(TSRMLS_C);
+	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC);
+}
+
+#endif
+
+
+static void alloc_globals_ctor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
+{
+	start_memory_manager(TSRMLS_C);
+}
+
+
+static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC)
+{
+	shutdown_memory_manager(0, 1);
+}
+
+
+#ifdef __FreeBSD__
+/* FreeBSD floating point precision fix */
+#include <floatingpoint.h>
+#endif
+
+
+static void scanner_globals_ctor(zend_scanner_globals *scanner_globals_p TSRMLS_DC)
+{
+	scanner_globals_p->c_buf_p = (char *) 0;
+	scanner_globals_p->init = 1;
+	scanner_globals_p->start = 0;
+	scanner_globals_p->current_buffer = NULL;
+}
+
+
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions)
+{
+#ifdef ZTS
+	zend_compiler_globals *compiler_globals;
+	zend_executor_globals *executor_globals;
+	void ***tsrm_ls;
+#ifdef ZTS
+	extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
+	extern ZEND_API ts_rsrc_id language_scanner_globals_id;
+#else
+	extern zend_scanner_globals ini_scanner_globals;
+	extern zend_scanner_globals language_scanner_globals;
+#endif
+
+	ts_allocate_id(&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor);
+#else
+	alloc_globals_ctor(&alloc_globals TSRMLS_CC);
+#endif
+
+#ifdef __FreeBSD__
+	/* FreeBSD floating point precision fix */
+	fpsetmask(0);
+#endif
+
+	zend_startup_extensions_mechanism();
+
+	/* Set up utility functions and values */
+	zend_error_cb = utility_functions->error_function;
+	zend_printf = utility_functions->printf_function;
+	zend_write = (zend_write_func_t) utility_functions->write_function;
+	zend_fopen = utility_functions->fopen_function;
+	if (!zend_fopen) {
+		zend_fopen = zend_fopen_wrapper;
+	}
+	zend_message_dispatcher_p = utility_functions->message_handler;
+	zend_block_interruptions = utility_functions->block_interruptions;
+	zend_unblock_interruptions = utility_functions->unblock_interruptions;
+	zend_get_configuration_directive_p = utility_functions->get_configuration_directive;
+	zend_ticks_function = utility_functions->ticks_function;
+
+	zend_compile_file = compile_file;
+	zend_execute = execute;
+
+	/* set up version */
+	zend_version_info = strdup(ZEND_CORE_VERSION_INFO);
+	zend_version_info_length = sizeof(ZEND_CORE_VERSION_INFO)-1;
+
+	GLOBAL_FUNCTION_TABLE = (HashTable *) malloc(sizeof(HashTable));
+	GLOBAL_CLASS_TABLE = (HashTable *) malloc(sizeof(HashTable));
+	zend_hash_init_ex(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
+	zend_hash_init_ex(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
+	register_standard_class();
+	zend_hash_init_ex(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1, 0);
+	zend_init_rsrc_list_dtors();
+
+	/* This zval can be used to initialize allocate zval's to an uninit'ed value */
+	zval_used_for_init.is_ref = 0;
+	zval_used_for_init.refcount = 1;
+	zval_used_for_init.type = IS_NULL;
+
+#ifdef ZTS
+	global_constants_table = NULL;
+	ts_allocate_id(&compiler_globals_id, sizeof(zend_compiler_globals), (ts_allocate_ctor) compiler_globals_ctor, (ts_allocate_dtor) compiler_globals_dtor);
+	ts_allocate_id(&executor_globals_id, sizeof(zend_executor_globals), (ts_allocate_ctor) executor_globals_ctor, (ts_allocate_dtor) executor_globals_dtor);
+	ts_allocate_id(&language_scanner_globals_id, sizeof(zend_scanner_globals), (ts_allocate_ctor) scanner_globals_ctor, NULL);
+	ts_allocate_id(&ini_scanner_globals_id, sizeof(zend_scanner_globals), (ts_allocate_ctor) scanner_globals_ctor, NULL);
+	compiler_globals = ts_resource(compiler_globals_id);
+	executor_globals = ts_resource(executor_globals_id);
+	tsrm_ls = ts_resource_ex(0, NULL);
+	compiler_globals_dtor(compiler_globals, tsrm_ls);
+	compiler_globals->function_table = GLOBAL_FUNCTION_TABLE;
+	compiler_globals->class_table = GLOBAL_CLASS_TABLE;
+	zend_startup_constants(tsrm_ls);
+	GLOBAL_CONSTANTS_TABLE = EG(zend_constants);
+#else
+	scanner_globals_ctor(&ini_scanner_globals TSRMLS_CC);
+	scanner_globals_ctor(&language_scanner_globals TSRMLS_CC);
+	zend_startup_constants();
+	zend_set_default_compile_time_values(TSRMLS_C);
+	EG(user_error_handler) = NULL;
+#endif
+	zend_register_standard_constants(TSRMLS_C);
+
+#ifndef ZTS
+	zend_init_rsrc_plist(TSRMLS_C);
+#endif
+
+	if (start_builtin_functions) {
+		zend_startup_builtin_functions(TSRMLS_C);
+	}
+
+	zend_ini_startup(TSRMLS_C);
+
+#ifdef ZTS
+	tsrm_set_new_thread_end_handler(zend_new_thread_end_handler);
+#endif
+
+	return SUCCESS;
+}
+
+
+void zend_shutdown(TSRMLS_D)
+{
+#ifdef ZEND_WIN32
+	zend_shutdown_timeout_thread();
+#endif
+#ifndef ZTS
+	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
+#endif
+	zend_destroy_rsrc_list_dtors();
+	zend_hash_destroy(&module_registry);
+	zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
+	free(GLOBAL_FUNCTION_TABLE);
+	zend_hash_destroy(GLOBAL_CLASS_TABLE);
+	free(GLOBAL_CLASS_TABLE);
+	zend_shutdown_extensions(TSRMLS_C);
+	free(zend_version_info);
+#ifndef ZTS
+	zend_shutdown_constants();
+#endif
+}
+
+
+void zend_set_utility_values(zend_utility_values *utility_values)
+{
+	zend_uv = *utility_values;
+	zend_uv.import_use_extension_length = strlen(zend_uv.import_use_extension);
+}
+
+
+/* this should be compatible with the standard zenderror */
+void zenderror(char *error)
+{
+	zend_error(E_PARSE, error);
+}
+
+
+BEGIN_EXTERN_C()
+ZEND_API void _zend_bailout(char *filename, uint lineno)
+{
+	TSRMLS_FETCH();
+
+	if (!EG(bailout_set)) {
+		zend_output_debug_string(1, "%s(%d) : Bailed out without a bailout address!", filename, lineno);
+		exit(-1);
+	}
+	CG(unclean_shutdown) = 1;
+	CG(in_compilation) = EG(in_execution) = 0;
+	longjmp(EG(bailout), FAILURE);
+}
+END_EXTERN_C()
+
+
+void zend_append_version_info(zend_extension *extension)
+{
+	char *new_info;
+	uint new_info_length;
+
+	new_info_length = sizeof("    with  v,  by \n")
+						+ strlen(extension->name)
+						+ strlen(extension->version)
+						+ strlen(extension->copyright)
+						+ strlen(extension->author);
+
+	new_info = (char *) malloc(new_info_length+1);
+
+	sprintf(new_info, "    with %s v%s, %s, by %s\n", extension->name, extension->version, extension->copyright, extension->author);
+
+	zend_version_info = (char *) realloc(zend_version_info, zend_version_info_length+new_info_length+1);
+	strcat(zend_version_info, new_info);
+	zend_version_info_length += new_info_length;
+	free(new_info);
+}
+
+
+ZEND_API char *get_zend_version()
+{
+	return zend_version_info;
+}
+
+
+void zend_activate(TSRMLS_D)
+{
+	EG(bailout_set) = 0;
+	init_compiler(TSRMLS_C);
+	init_executor(TSRMLS_C);
+	startup_scanner(TSRMLS_C);
+}
+
+
+void zend_activate_modules(TSRMLS_D)
+{
+	zend_hash_apply(&module_registry, (apply_func_t) module_registry_request_startup TSRMLS_CC);
+}
+
+void zend_deactivate_modules(TSRMLS_D)
+{
+	EG(opline_ptr) = NULL; /* we're no longer executing anything */
+
+	zend_try {
+		zend_hash_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC);
+	} zend_end_try();
+}
+
+void zend_deactivate(TSRMLS_D)
+{
+	/* we're no longer executing anything */
+	EG(opline_ptr) = NULL; 
+	EG(active_symbol_table) = NULL;
+
+	zend_try {
+		shutdown_scanner(TSRMLS_C);
+	} zend_end_try();
+
+	/* shutdown_executor() takes care of its own bailout handling */
+	shutdown_executor(TSRMLS_C);
+
+	zend_try {
+		shutdown_compiler(TSRMLS_C);
+	} zend_end_try();
+
+	zend_try {
+		zend_ini_deactivate(TSRMLS_C);
+	} zend_end_try();
+}
+
+
+BEGIN_EXTERN_C()
+ZEND_API void zend_message_dispatcher(long message, void *data)
+{
+	if (zend_message_dispatcher_p) {
+		zend_message_dispatcher_p(message, data);
+	}
+}
+END_EXTERN_C()
+
+
+ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval *contents)
+{
+	if (zend_get_configuration_directive_p) {
+		return zend_get_configuration_directive_p(name, name_length, contents);
+	} else {
+		return FAILURE;
+	}
+}
+
+
+#define ZEND_ERROR_BUFFER_SIZE 1024
+
+ZEND_API void zend_error(int type, const char *format, ...)
+{
+	va_list args;
+	zval ***params;
+	zval *retval;
+	zval *z_error_type, *z_error_message, *z_error_filename, *z_error_lineno, *z_context;
+	char *error_filename;
+	uint error_lineno;
+	zval *orig_user_error_handler;
+	TSRMLS_FETCH();
+
+	/* Obtain relevant filename and lineno */
+	switch (type) {
+		case E_CORE_ERROR:
+		case E_CORE_WARNING:
+			error_filename = NULL;
+			error_lineno = 0;
+			break;
+		case E_PARSE:
+		case E_COMPILE_ERROR:
+		case E_COMPILE_WARNING:
+		case E_ERROR:
+		case E_NOTICE:
+		case E_WARNING:
+		case E_USER_ERROR:
+		case E_USER_WARNING:
+		case E_USER_NOTICE:
+			if (zend_is_compiling(TSRMLS_C)) {
+				error_filename = zend_get_compiled_filename(TSRMLS_C);
+				error_lineno = zend_get_compiled_lineno(TSRMLS_C);
+			} else if (zend_is_executing(TSRMLS_C)) {
+				error_filename = zend_get_executed_filename(TSRMLS_C);
+				error_lineno = zend_get_executed_lineno(TSRMLS_C);
+			} else {
+				error_filename = NULL;
+				error_lineno = 0;
+			}
+			break;
+		default:
+			error_filename = NULL;
+			error_lineno = 0;
+			break;
+	}
+	if (!error_filename) {
+		error_filename = "Unknown";
+	}
+
+
+	va_start(args, format);
+
+	/* if we don't have a user defined error handler */
+	if (!EG(user_error_handler)) {
+		zend_error_cb(type, error_filename, error_lineno, format, args);
+	} else switch (type) {
+		case E_ERROR:
+		case E_PARSE:
+		case E_CORE_ERROR:
+		case E_CORE_WARNING:
+		case E_COMPILE_ERROR:
+		case E_COMPILE_WARNING:
+			/* The error may not be safe to handle in user-space */
+			zend_error_cb(type, error_filename, error_lineno, format, args);
+			break;
+		default:
+			/* Handle the error in user space */
+			ALLOC_INIT_ZVAL(z_error_message);
+			ALLOC_INIT_ZVAL(z_error_type);
+			ALLOC_INIT_ZVAL(z_error_filename);
+			ALLOC_INIT_ZVAL(z_error_lineno);
+			ALLOC_INIT_ZVAL(z_context);
+			z_error_message->value.str.val = (char *) emalloc(ZEND_ERROR_BUFFER_SIZE);
+
+#ifdef HAVE_VSNPRINTF
+			z_error_message->value.str.len = vsnprintf(z_error_message->value.str.val, ZEND_ERROR_BUFFER_SIZE, format, args);
+			if (z_error_message->value.str.len > ZEND_ERROR_BUFFER_SIZE-1) {
+				z_error_message->value.str.len = ZEND_ERROR_BUFFER_SIZE-1;
+			}
+#else
+			strncpy(z_error_message->value.str.val, format, ZEND_ERROR_BUFFER_SIZE);
+			/* This is risky... */
+			/* z_error_message->value.str.len = vsprintf(z_error_message->value.str.val, format, args); */
+#endif
+			z_error_message->type = IS_STRING;
+
+			z_error_type->value.lval = type;
+			z_error_type->type = IS_LONG;
+
+			if (error_filename) {
+				z_error_filename->value.str.len = strlen(error_filename);
+				z_error_filename->value.str.val = estrndup(error_filename, z_error_filename->value.str.len);
+				z_error_filename->type = IS_STRING;
+			}
+				
+			z_error_lineno->value.lval = error_lineno;
+			z_error_lineno->type = IS_LONG;
+
+			z_context->value.ht = EG(active_symbol_table);
+			z_context->type = IS_ARRAY;
+			ZVAL_ADDREF(z_context);  /* we don't want this one to be freed */
+
+			params = (zval ***) emalloc(sizeof(zval **)*5);
+			params[0] = &z_error_type;
+			params[1] = &z_error_message;
+			params[2] = &z_error_filename;
+			params[3] = &z_error_lineno;
+			params[4] = &z_context;
+
+			orig_user_error_handler = EG(user_error_handler);
+			EG(user_error_handler) = NULL;
+			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC)==SUCCESS) {
+				zval_ptr_dtor(&retval);
+			} else {
+				/* The user error handler failed, use built-in error handler */
+				zend_error_cb(type, error_filename, error_lineno, format, args);
+			}
+			EG(user_error_handler) = orig_user_error_handler;
+
+			efree(params);
+			zval_ptr_dtor(&z_error_message);
+			zval_ptr_dtor(&z_error_type);
+			zval_ptr_dtor(&z_error_filename);
+			zval_ptr_dtor(&z_error_lineno);
+			if (ZVAL_REFCOUNT(z_context)==2) {
+				FREE_ZVAL(z_context);
+			}
+			break;
+	}
+
+	va_end(args);
+
+	if (type==E_PARSE) {
+		zend_init_compiler_data_structures(TSRMLS_C);
+	}
+}
+
+
+ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...)
+{
+#if ZEND_DEBUG
+	va_list args;
+
+	va_start(args, format);
+#	ifdef ZEND_WIN32
+	{
+		char output_buf[1024];
+
+		vsnprintf(output_buf, 1024, format, args);
+		OutputDebugString(output_buf);
+		OutputDebugString("\n");
+		if (trigger_break && IsDebuggerPresent()) {
+			DebugBreak();
+		}
+	}
+#	else
+	vfprintf(stderr, format, args);
+	fprintf(stderr, "\n");
+#	endif
+	va_end(args);
+#endif
+}
+
+
+ZEND_API int zend_execute_scripts(int type TSRMLS_DC, int file_count, ...)
+{
+	va_list files;
+	int i;
+	zend_file_handle *file_handle;
+	zend_op_array *orig_op_array = EG(active_op_array);
+
+	va_start(files, file_count);
+	for (i=0; i<file_count; i++) {
+		file_handle = va_arg(files, zend_file_handle *);
+		if (!file_handle) {
+			continue;
+		}
+		EG(active_op_array) = zend_compile_file(file_handle, ZEND_INCLUDE TSRMLS_CC);
+		zend_destroy_file_handle(file_handle TSRMLS_CC);
+		if (EG(active_op_array)) {
+			zend_execute(EG(active_op_array) TSRMLS_CC);
+			zval_ptr_dtor(EG(return_value_ptr_ptr));
+			EG(return_value_ptr_ptr) = &EG(global_return_value_ptr);
+			EG(global_return_value_ptr) = NULL;
+			destroy_op_array(EG(active_op_array));
+			efree(EG(active_op_array));
+		} else if (type==ZEND_REQUIRE) {
+			va_end(files);
+			EG(active_op_array) = orig_op_array;
+			return FAILURE;
+		}
+	}
+	va_end(files);
+	EG(active_op_array) = orig_op_array;
+
+	return SUCCESS;
+}
+
+#define COMPILED_STRING_DESCRIPTION_FORMAT "%s(%d) : %s"
+
+ZEND_API char *zend_make_compiled_string_description(char *name TSRMLS_DC)
+{
+	char *cur_filename;
+	int cur_lineno;
+	char *compiled_string_description;
+
+	if (zend_is_compiling(TSRMLS_C)) {
+		cur_filename = zend_get_compiled_filename(TSRMLS_C);
+		cur_lineno = zend_get_compiled_lineno(TSRMLS_C);
+	} else if (zend_is_executing(TSRMLS_C)) {
+		cur_filename = zend_get_executed_filename(TSRMLS_C);
+		cur_lineno = zend_get_executed_lineno(TSRMLS_C);
+	} else {
+		cur_filename = "Unknown";
+		cur_lineno = 0;
+	}
+
+	compiled_string_description = emalloc(sizeof(COMPILED_STRING_DESCRIPTION_FORMAT)+strlen(name)+strlen(cur_filename)+MAX_LENGTH_OF_LONG);
+	sprintf(compiled_string_description, COMPILED_STRING_DESCRIPTION_FORMAT, cur_filename, cur_lineno, name);
+	return compiled_string_description;
+}
+
+
+void free_estring(char **str_p)
+{
+	efree(*str_p);
+}

Zend/zend.h

@@ -0,0 +1,499 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_H
+#define ZEND_H
+
+#define ZEND_VERSION "1.0.7"
+
+#ifdef __cplusplus
+#define BEGIN_EXTERN_C() extern "C" {
+#define END_EXTERN_C() }
+#else
+#define BEGIN_EXTERN_C()
+#define END_EXTERN_C()
+#endif
+
+#include <stdio.h>
+
+/*
+ * general definitions
+ */
+
+#ifdef ZEND_WIN32
+# include "zend_config.w32.h"
+# define ZEND_PATHS_SEPARATOR		';'
+#else
+# include "zend_config.h"
+# define ZEND_PATHS_SEPARATOR		':'
+#endif
+
+/* all HAVE_XXX test have to be after the include of zend_config above */
+
+#ifdef HAVE_UNIX_H
+# include <unix.h>
+#endif
+
+#ifdef HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+
+#ifdef HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
+
+#if defined(HAVE_LIBDL)
+
+# ifndef RTLD_LAZY
+#  define RTLD_LAZY 1    /* Solaris 1, FreeBSD's (2.1.7.1 and older) */
+# endif
+
+# ifndef RTLD_GLOBAL
+#  define RTLD_GLOBAL 0
+# endif
+
+# define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
+# define DL_UNLOAD					dlclose
+# define DL_FETCH_SYMBOL			dlsym
+# define DL_HANDLE					void *
+# define ZEND_EXTENSIONS_SUPPORT	1
+#elif defined(ZEND_WIN32)
+# define DL_LOAD(libname)			LoadLibrary(libname)
+# define DL_FETCH_SYMBOL			GetProcAddress
+# define DL_UNLOAD					FreeLibrary
+# define DL_HANDLE					HMODULE
+# define ZEND_EXTENSIONS_SUPPORT	1
+#else
+# define DL_HANDLE					void *
+# define ZEND_EXTENSIONS_SUPPORT	0
+#endif
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))
+# define do_alloca(p) alloca(p)
+# define free_alloca(p)
+#else
+# define do_alloca(p)		emalloc(p)
+# define free_alloca(p)	efree(p)
+#endif
+
+#if ZEND_DEBUG
+#define ZEND_FILE_LINE_D				char *__zend_filename, uint __zend_lineno
+#define ZEND_FILE_LINE_DC				, ZEND_FILE_LINE_D
+#define ZEND_FILE_LINE_ORIG_D			char *__zend_orig_filename, uint __zend_orig_lineno
+#define ZEND_FILE_LINE_ORIG_DC			, ZEND_FILE_LINE_ORIG_D
+#define ZEND_FILE_LINE_RELAY_C			__zend_filename, __zend_lineno
+#define ZEND_FILE_LINE_RELAY_CC			, ZEND_FILE_LINE_RELAY_C
+#define ZEND_FILE_LINE_C				__FILE__, __LINE__
+#define ZEND_FILE_LINE_CC				, ZEND_FILE_LINE_C
+#define ZEND_FILE_LINE_EMPTY_C			NULL, 0
+#define ZEND_FILE_LINE_EMPTY_CC			, ZEND_FILE_LINE_EMPTY_C
+#define ZEND_FILE_LINE_ORIG_RELAY_C		__zend_orig_filename, __zend_orig_lineno
+#define ZEND_FILE_LINE_ORIG_RELAY_CC	, ZEND_FILE_LINE_ORIG_RELAY_C
+#else
+#define ZEND_FILE_LINE_D
+#define ZEND_FILE_LINE_DC
+#define ZEND_FILE_LINE_ORIG_D
+#define ZEND_FILE_LINE_ORIG_DC
+#define ZEND_FILE_LINE_RELAY_C
+#define ZEND_FILE_LINE_RELAY_CC
+#define ZEND_FILE_LINE_C
+#define ZEND_FILE_LINE_CC
+#define ZEND_FILE_LINE_EMPTY_C
+#define ZEND_FILE_LINE_EMPTY_CC
+#define ZEND_FILE_LINE_ORIG_RELAY_C
+#define ZEND_FILE_LINE_ORIG_RELAY_CC
+#endif	/* ZEND_DEBUG */
+
+#ifdef ZTS
+#define ZTS_V 1
+#else
+#define ZTS_V 0
+#endif
+
+#include "zend_errors.h"
+#include "zend_alloc.h"
+
+typedef unsigned char zend_bool;
+typedef unsigned char zend_uchar;
+typedef unsigned int zend_uint;
+typedef unsigned long zend_ulong;
+typedef unsigned short zend_ushort;
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647L
+#endif
+
+#ifndef LONG_MIN
+#define LONG_MIN (- LONG_MAX - 1)
+#endif
+
+#undef SUCCESS
+#undef FAILURE
+#define SUCCESS 0
+#define FAILURE -1				/* this MUST stay a negative number, or it may affect functions! */
+
+
+#include "zend_hash.h"
+#include "zend_llist.h"
+
+#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval *this_ptr, int return_value_used TSRMLS_DC
+#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, this_ptr, return_value_used TSRMLS_CC
+
+/*
+ * zval
+ */
+typedef struct _zval_struct zval;
+typedef struct _zend_class_entry zend_class_entry;
+
+typedef struct _zend_object {
+	zend_class_entry *ce;
+	HashTable *properties;
+} zend_object;
+
+typedef union _zvalue_value {
+	long lval;					/* long value */
+	double dval;				/* double value */
+	struct {
+		char *val;
+		int len;
+	} str;
+	HashTable *ht;				/* hash table value */
+	zend_object obj;
+} zvalue_value;
+
+
+struct _zval_struct {
+	/* Variable information */
+	zvalue_value value;		/* value */
+	zend_uchar type;	/* active type */
+	zend_uchar is_ref;
+	zend_ushort refcount;
+};
+
+
+
+typedef struct _zend_function_entry {
+	char *fname;
+	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
+	unsigned char *func_arg_types;
+} zend_function_entry;
+
+
+typedef struct _zend_property_reference {
+	int type;  /* read, write or r/w */
+	zval *object;
+	zend_llist *elements_list;
+} zend_property_reference;
+
+
+
+typedef struct _zend_overloaded_element {
+	int type;		/* array offset or object proprety */
+	zval element;
+} zend_overloaded_element;
+
+/* excpt.h on Digital Unix 4.0 defines function_table */
+#undef function_table
+
+struct _zend_class_entry {
+	char type;
+	char *name;
+	uint name_length;
+	struct _zend_class_entry *parent; 
+	int *refcount;
+	zend_bool constants_updated;
+
+	HashTable function_table;
+	HashTable default_properties;
+	zend_function_entry *builtin_functions;
+
+	/* handlers */
+	void (*handle_function_call)(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
+	zval (*handle_property_get)(zend_property_reference *property_reference);
+	int (*handle_property_set)(zend_property_reference *property_reference, zval *value);
+};
+
+
+
+typedef struct _zend_utility_functions {
+	void (*error_function)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+	int (*printf_function)(const char *format, ...);
+	int (*write_function)(const char *str, uint str_length);
+	FILE *(*fopen_function)(const char *filename, char **opened_path);
+	void (*message_handler)(long message, void *data);
+	void (*block_interruptions)(void);
+	void (*unblock_interruptions)(void);
+	int (*get_configuration_directive)(char *name, uint name_length, zval *contents);
+	void (*ticks_function)(int ticks);
+} zend_utility_functions;
+
+		
+typedef struct _zend_utility_values {
+	char *import_use_extension;
+	uint import_use_extension_length;
+} zend_utility_values;
+
+
+typedef int (*zend_write_func_t)(const char *str, uint str_length);
+
+
+#undef MIN
+#undef MAX
+#define MAX(a,b)  (((a)>(b))?(a):(b))
+#define MIN(a,b)  (((a)<(b))?(a):(b))
+#define ZEND_STRL(str)		(str), (sizeof(str)-1)
+#define ZEND_STRS(str)		(str), (sizeof(str))
+#define ZEND_NORMALIZE_BOOL(n)			\
+	((n) ? (((n)>0) ? 1 : -1) : 0)
+
+
+/* data types */
+#define IS_NULL		0
+#define IS_LONG		1
+#define IS_DOUBLE	2
+#define IS_STRING	3
+#define IS_ARRAY	4
+#define IS_OBJECT	5
+#define IS_BOOL		6
+#define IS_RESOURCE	7
+#define IS_CONSTANT	8
+#define IS_CONSTANT_ARRAY	9
+
+/* Special data type to temporarily mark large numbers */
+#define FLAG_IS_BC	10 /* for parser internal use only */
+
+/* Ugly hack to support constants as static array indices */
+#define IS_CONSTANT_INDEX	0x80
+
+
+/* overloaded elements data types */
+#define OE_IS_ARRAY	(1<<0)
+#define OE_IS_OBJECT	(1<<1)
+#define OE_IS_METHOD	(1<<2)
+
+
+/* Argument passing types */
+#define BYREF_NONE 0
+#define BYREF_FORCE 1
+#define BYREF_ALLOW 2
+#define BYREF_FORCE_REST 3
+
+int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions);
+void zend_shutdown(TSRMLS_D);
+
+void zend_set_utility_values(zend_utility_values *utility_values);
+
+BEGIN_EXTERN_C()
+ZEND_API void _zend_bailout(char *filename, uint lineno);
+END_EXTERN_C()
+
+#define zend_bailout()		_zend_bailout(__FILE__, __LINE__)
+
+#define zend_try												\
+	{															\
+		jmp_buf orig_bailout;									\
+		zend_bool orig_bailout_set=EG(bailout_set);				\
+																\
+		EG(bailout_set) = 1;									\
+		memcpy(&orig_bailout, &EG(bailout), sizeof(jmp_buf));	\
+		if (setjmp(EG(bailout))==0)
+#define zend_catch												\
+		else
+#define zend_end_try()											\
+		memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf));	\
+		EG(bailout_set) = orig_bailout_set;						\
+	}
+
+ZEND_API char *get_zend_version(void);
+ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);
+ZEND_API int zend_print_zval(zval *expr, int indent);
+ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent);
+ZEND_API void zend_print_zval_r(zval *expr, int indent);
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent);
+ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...);
+
+#if ZEND_DEBUG
+#define Z_DBG(expr)		(expr)
+#else
+#define	Z_DBG(expr)
+#endif
+
+ZEND_API extern char *empty_string;
+
+ZEND_API void free_estring(char **str_p);
+
+#define STR_FREE(ptr) if (ptr && ptr!=empty_string) { efree(ptr); }
+#define STR_FREE_REL(ptr) if (ptr && ptr!=empty_string) { efree_rel(ptr); }
+
+#define STR_REALLOC(ptr, size)										\
+	if (ptr!=empty_string) {										\
+		ptr = (char *) erealloc(ptr, size);							\
+	} else {														\
+		ptr = (char *) emalloc(size);								\
+		memset(ptr, 0, size);										\
+	}
+
+/* output support */
+#define ZEND_WRITE(str, str_len)		zend_write((str), (str_len))
+#define ZEND_PUTS(str)					zend_write((str), strlen((str)))
+#define ZEND_PUTC(c)					zend_write(&(c), 1), (c)
+
+
+BEGIN_EXTERN_C()
+extern ZEND_API int (*zend_printf)(const char *format, ...);
+extern ZEND_API zend_write_func_t zend_write;
+extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
+extern ZEND_API void (*zend_block_interruptions)(void);
+extern ZEND_API void (*zend_unblock_interruptions)(void);
+extern ZEND_API void (*zend_ticks_function)(int ticks);
+extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+
+
+ZEND_API void zend_error(int type, const char *format, ...);
+
+void zenderror(char *error);
+
+extern ZEND_API zend_class_entry zend_standard_class_def;
+extern zend_utility_values zend_uv;
+extern ZEND_API zval zval_used_for_init;
+
+END_EXTERN_C()
+
+#define ZEND_UV(name) (zend_uv.name)
+
+
+#define HANDLE_BLOCK_INTERRUPTIONS()		if (zend_block_interruptions) { zend_block_interruptions(); }
+#define HANDLE_UNBLOCK_INTERRUPTIONS()		if (zend_unblock_interruptions) { zend_unblock_interruptions(); }
+
+BEGIN_EXTERN_C()
+ZEND_API void zend_message_dispatcher(long message, void *data);
+END_EXTERN_C()
+
+ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval *contents);
+
+
+/* Messages for applications of Zend */
+#define ZMSG_FAILED_INCLUDE_FOPEN		1L
+#define ZMSG_FAILED_REQUIRE_FOPEN		2L
+#define ZMSG_FAILED_HIGHLIGHT_FOPEN		3L
+#define ZMSG_MEMORY_LEAK_DETECTED		4L
+#define ZMSG_MEMORY_LEAK_REPEATED		5L
+#define ZMSG_LOG_SCRIPT_NAME			6L
+
+
+#define ZVAL_ADDREF(pz)		(++(pz)->refcount)
+#define ZVAL_DELREF(pz)		(--(pz)->refcount)
+#define ZVAL_REFCOUNT(pz)	((pz)->refcount)
+
+#define INIT_PZVAL(z)		\
+	(z)->refcount = 1;		\
+	(z)->is_ref = 0;	
+
+#define INIT_ZVAL(z) z = zval_used_for_init;
+
+#define ALLOC_INIT_ZVAL(zp)						\
+	ALLOC_ZVAL(zp);		\
+	INIT_ZVAL(*zp);
+
+#define MAKE_STD_ZVAL(zv)				 \
+	ALLOC_ZVAL(zv); \
+	INIT_PZVAL(zv);
+
+#define PZVAL_IS_REF(z)		((z)->is_ref)
+
+#define SEPARATE_ZVAL(ppzv)									\
+	{														\
+		zval *orig_ptr = *(ppzv);							\
+															\
+		if (orig_ptr->refcount>1) {							\
+			orig_ptr->refcount--;							\
+			ALLOC_ZVAL(*(ppzv));							\
+			**(ppzv) = *orig_ptr;							\
+			zval_copy_ctor(*(ppzv));						\
+			(*(ppzv))->refcount=1;							\
+			(*(ppzv))->is_ref = 0;							\
+		}													\
+	}
+
+#define SEPARATE_ZVAL_IF_NOT_REF(ppzv)		\
+	if (!PZVAL_IS_REF(*ppzv)) {				\
+		SEPARATE_ZVAL(ppzv);				\
+	}
+
+#define SEPARATE_ZVAL_TO_MAKE_IS_REF(ppzv)	\
+	if (!PZVAL_IS_REF(*ppzv)) {				\
+		SEPARATE_ZVAL(ppzv);				\
+		(*(ppzv))->is_ref = 1;				\
+	}
+
+#define COPY_PZVAL_TO_ZVAL(zv, pzv)			\
+	(zv) = *(pzv);							\
+	if ((pzv)->refcount>1) {				\
+		zval_copy_ctor(&(zv));				\
+		(pzv)->refcount--;					\
+	} else {								\
+		FREE_ZVAL(pzv);						\
+	}										\
+	INIT_PZVAL(&(zv));
+
+#define REPLACE_ZVAL_VALUE(ppzv_dest,pzv_src,copy) {	\
+	int is_ref,refcount;						\
+												\
+	SEPARATE_ZVAL_IF_NOT_REF(ppzv_dest);		\
+	is_ref = (*ppzv_dest)->is_ref;				\
+	refcount = (*ppzv_dest)->refcount;			\
+	zval_dtor(*ppzv_dest);						\
+	**ppzv_dest = *pzv_src;						\
+	if (copy) {                                  \
+		zval_copy_ctor(*ppzv_dest);				\
+    }		                                    \
+	(*ppzv_dest)->is_ref = is_ref;				\
+	(*ppzv_dest)->refcount = refcount;			\
+}
+
+#define ZEND_MAX_RESERVED_RESOURCES	4
+
+#ifdef ZEND_WIN32
+/* Only use this macro if you know for sure that all of the switches values
+   are covered by its case statements */
+#define EMPTY_SWITCH_DEFAULT_CASE() \
+			default:				\
+				__assume(0);		\
+				break;
+#else
+#define EMPTY_SWITCH_DEFAULT_CASE()
+#endif
+
+#endif /* ZEND_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_API.h

@@ -0,0 +1,406 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   |          Andrei Zmievski <andrei@php.net>                            |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_API_H
+#define ZEND_API_H
+
+#include "zend_modules.h"
+#include "zend_list.h"
+#include "zend_fast_cache.h"
+#include "zend_operators.h"
+#include "zend_variables.h"
+#include "zend_execute.h"
+
+#define ZEND_FN(name) zend_if_##name
+#define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)
+#define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(ZEND_FN(name))
+
+#define ZEND_NAMED_FE(zend_name, name, arg_types) { #zend_name, name, arg_types },
+#define ZEND_FE(name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(name), arg_types)
+#define ZEND_FALIAS(name, alias, arg_types) ZEND_NAMED_FE(name, ZEND_FN(alias), arg_types)
+
+#define ZEND_MINIT(module)       zend_minit_##module
+#define ZEND_MSHUTDOWN(module)   zend_mshutdown_##module
+#define ZEND_RINIT(module)       zend_rinit_##module
+#define ZEND_RSHUTDOWN(module)   zend_rshutdown_##module
+#define ZEND_MINFO(module)       zend_info_##module
+
+#define ZEND_MINIT_FUNCTION(module)      int ZEND_MINIT(module)(INIT_FUNC_ARGS)
+#define ZEND_MSHUTDOWN_FUNCTION(module)  int ZEND_MSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS)
+#define ZEND_RINIT_FUNCTION(module)      int ZEND_RINIT(module)(INIT_FUNC_ARGS)
+#define ZEND_RSHUTDOWN_FUNCTION(module)  int ZEND_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS)
+#define ZEND_MINFO_FUNCTION(module)      void ZEND_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS)
+
+#define ZEND_GET_MODULE(name) \
+	ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }
+
+#define ZEND_BEGIN_MODULE_GLOBALS(module_name)		\
+	typedef struct _zend_##module_name##_globals {
+#define ZEND_END_MODULE_GLOBALS(module_name)		\
+	} zend_##module_name##_globals;
+
+#ifdef ZTS
+
+#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
+	ts_rsrc_id module_name##_globals_id;
+#define ZEND_EXTERN_MODULE_GLOBALS(module_name)								\
+	extern ts_rsrc_id module_name##_globals_id;
+#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
+	ts_allocate_id(&module_name##_globals_id, sizeof(zend_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor);
+
+#else
+
+#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
+	zend_##module_name##_globals module_name##_globals;
+#define ZEND_EXTERN_MODULE_GLOBALS(module_name)								\
+	extern zend_##module_name##_globals module_name##_globals;
+#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
+	globals_ctor(&module_name##_globals);
+
+#endif
+
+
+
+#define INIT_CLASS_ENTRY(class_container, class_name, functions)	\
+	{																\
+		class_container.name = strdup(class_name);					\
+		class_container.name_length = sizeof(class_name)-1;			\
+		class_container.builtin_functions = functions;				\
+		class_container.handle_function_call = NULL;				\
+		class_container.handle_property_get = NULL;					\
+		class_container.handle_property_set = NULL;					\
+	}
+
+#define INIT_OVERLOADED_CLASS_ENTRY(class_container, class_name, functions, handle_fcall, handle_propget, handle_propset) \
+	{															\
+		class_container.name = strdup(class_name);				\
+		class_container.name_length = sizeof(class_name)-1;		\
+		class_container.builtin_functions = functions;			\
+		class_container.handle_function_call = handle_fcall;	\
+		class_container.handle_property_get = handle_propget;	\
+		class_container.handle_property_set = handle_propset;	\
+	}
+
+
+
+int zend_next_free_module(void);
+
+ZEND_API int zend_get_parameters(int ht, int param_count, ...);
+ZEND_API int _zend_get_parameters_array(int ht, int param_count, zval **argument_array TSRMLS_DC);
+ZEND_API int zend_get_parameters_ex(int param_count, ...);
+ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_array TSRMLS_DC);
+
+#define zend_get_parameters_array(ht, param_count, argument_array)			\
+	_zend_get_parameters_array(ht, param_count, argument_array TSRMLS_CC)
+#define zend_get_parameters_array_ex(param_count, argument_array)			\
+	_zend_get_parameters_array_ex(param_count, argument_array TSRMLS_CC)
+
+
+/* Parameter parsing API -- andrei */
+
+#define ZEND_PARSE_PARAMS_QUIET 1<<1
+ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
+ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
+
+/* End of parameter parsing API -- andrei */
+
+int zend_register_functions(zend_function_entry *functions, HashTable *function_table, int type TSRMLS_DC);
+void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table TSRMLS_DC);
+ZEND_API int zend_register_module(zend_module_entry *module_entry);
+
+ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry TSRMLS_DC);
+ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name TSRMLS_DC);
+
+ZEND_API zend_module_entry *zend_get_module(int module_number);
+ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC);
+
+ZEND_API void zend_wrong_param_count(TSRMLS_D);
+ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name);
+
+#define getThis() (this_ptr)
+
+#define WRONG_PARAM_COUNT					ZEND_WRONG_PARAM_COUNT()
+#define WRONG_PARAM_COUNT_WITH_RETVAL(ret)	ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
+#define ARG_COUNT(dummy)	(ht)
+#define ZEND_NUM_ARGS()		(ht)
+#define ZEND_WRONG_PARAM_COUNT()					{ zend_wrong_param_count(TSRMLS_C); return; }
+#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)		{ zend_wrong_param_count(TSRMLS_C); return ret; }
+
+#ifndef ZEND_WIN32
+#define DLEXPORT
+#endif
+
+ZEND_API int zend_startup_module(zend_module_entry *module);
+
+#define array_init(arg)			_array_init((arg) ZEND_FILE_LINE_CC)
+#define object_init(arg)		_object_init((arg) ZEND_FILE_LINE_CC TSRMLS_CC)
+#define object_init_ex(arg, ce)	_object_init_ex((arg), (ce) ZEND_FILE_LINE_CC TSRMLS_CC)
+ZEND_API int _array_init(zval *arg ZEND_FILE_LINE_DC);
+ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC TSRMLS_DC);
+ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC TSRMLS_DC);
+
+/* no longer supported */
+ZEND_API int add_assoc_function(zval *arg, char *key,void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS));
+
+ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n);
+ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len);
+ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b);
+ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r);
+ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d);
+ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
+ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate);
+ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+
+#define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key)+1, __n)
+#define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
+#define add_assoc_bool(__arg, __key, __b) add_assoc_bool_ex(__arg, __key, strlen(__key)+1, __b)
+#define add_assoc_resource(__arg, __key, __r) add_assoc_resource_ex(__arg, __key, strlen(__key)+1, __r)
+#define add_assoc_double(__arg, __key, __d) add_assoc_double_ex(__arg, __key, strlen(__key)+1, __d)
+#define add_assoc_string(__arg, __key, __str, __duplicate) add_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
+#define add_assoc_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
+#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key)+1, __value)
+
+/* unset() functions are only suported for legacy modules and null() functions should be used */
+#define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
+#define add_index_unset(__arg, __key) add_index_null(__arg, __key)
+#define add_next_index_unset(__arg) add_next_index_null(__arg)
+#define add_property_unset(__arg, __key) add_property_null(__arg, __key)
+
+ZEND_API int add_index_long(zval *arg, uint idx, long n);
+ZEND_API int add_index_null(zval *arg, uint idx);
+ZEND_API int add_index_bool(zval *arg, uint idx, int b);
+ZEND_API int add_index_resource(zval *arg, uint idx, int r);
+ZEND_API int add_index_double(zval *arg, uint idx, double d);
+ZEND_API int add_index_string(zval *arg, uint idx, char *str, int duplicate);
+ZEND_API int add_index_stringl(zval *arg, uint idx, char *str, uint length, int duplicate);
+ZEND_API int add_index_zval(zval *arg, uint index, zval *value);
+
+ZEND_API int add_next_index_long(zval *arg, long n);
+ZEND_API int add_next_index_null(zval *arg);
+ZEND_API int add_next_index_bool(zval *arg, int b);
+ZEND_API int add_next_index_resource(zval *arg, int r);
+ZEND_API int add_next_index_double(zval *arg, double d);
+ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate);
+ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate);
+ZEND_API int add_next_index_zval(zval *arg, zval *value);
+
+ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate);
+ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate);
+
+#define add_get_assoc_string(__arg, __key, __str, __dest, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __dest, __duplicate)
+#define add_get_assoc_stringl(__arg, __key, __str, __length, __dest, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __dest, __duplicate)
+
+ZEND_API int add_get_index_long(zval *arg, uint idx, long l, void **dest);
+ZEND_API int add_get_index_double(zval *arg, uint idx, double d, void **dest);
+ZEND_API int add_get_index_string(zval *arg, uint idx, char *str, void **dest, int duplicate);
+ZEND_API int add_get_index_stringl(zval *arg, uint idx, char *str, uint length, void **dest, int duplicate);
+
+ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long l);
+ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len);
+ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b);
+ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long r);
+ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d);
+ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
+ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len,  char *str, uint length, int duplicate);
+ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+
+#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key)+1, __n)
+#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) + 1)
+#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, strlen(__key)+1, __b)
+#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, strlen(__key)+1, __r)
+#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key)+1, __d) 
+#define add_property_string(__arg, __key, __str, __duplicate) add_property_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
+#define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
+#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value)       
+
+ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, int param_count, zval *params[] TSRMLS_DC);
+ZEND_API int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
+
+ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
+                                  int is_ref, int num_symbol_tables, ...);
+
+#define add_method(arg,key,method)	add_assoc_function((arg),(key),(method))
+
+#if ZEND_DEBUG
+#define CHECK_ZVAL_STRING(z) \
+	if ((z)->value.str.val[ (z)->value.str.len ] != '\0') zend_error(E_WARNING, "String is not zero-terminated (%s)", (z)->value.str.val);
+#define CHECK_ZVAL_STRING_REL(z) \
+	if ((z)->value.str.val[ (z)->value.str.len ] != '\0') zend_error(E_WARNING, "String is not zero-terminated (%s) (source: %s:%d)", (z)->value.str.val ZEND_FILE_LINE_RELAY_CC);
+#else
+#define CHECK_ZVAL_STRING(z)
+#define CHECK_ZVAL_STRING_REL(z)
+#endif
+
+#define ZVAL_RESOURCE(z,l) {			\
+		(z)->type = IS_RESOURCE;        \
+		(z)->value.lval = l;	        \
+	}
+
+#define ZVAL_BOOL(z,b) {				\
+		(z)->type = IS_BOOL;	        \
+		(z)->value.lval = b;	        \
+	}
+
+#define ZVAL_NULL(z) {					\
+		(z)->type = IS_NULL;	        \
+	}
+
+#define ZVAL_LONG(z,l) {				\
+		(z)->type = IS_LONG;	        \
+		(z)->value.lval = l;	        \
+	}
+
+#define ZVAL_DOUBLE(z,d) {				\
+		(z)->type = IS_DOUBLE;	        \
+		(z)->value.dval = d;	        \
+	}
+
+#define ZVAL_STRING(z,s,duplicate) {	\
+		char *__s=(s);					\
+		(z)->value.str.len = strlen(__s);	\
+		(z)->value.str.val = (duplicate?estrndup(__s,(z)->value.str.len):__s);	\
+		(z)->type = IS_STRING;	        \
+	}
+
+#define ZVAL_STRINGL(z,s,l,duplicate) {	\
+		char *__s=(s); int __l=l;		\
+		(z)->value.str.len = __l;	    \
+		(z)->value.str.val = (duplicate?estrndup(__s,__l):__s);	\
+		(z)->type = IS_STRING;		    \
+	}
+
+#define ZVAL_EMPTY_STRING(z) {	        \
+		(z)->value.str.len = 0;  	    \
+		(z)->value.str.val = empty_string; \
+		(z)->type = IS_STRING;		    \
+	}
+
+#define ZVAL_FALSE(z)  					ZVAL_BOOL(z,0)
+#define ZVAL_TRUE(z)  					ZVAL_BOOL(z,1)
+
+#define RETVAL_RESOURCE(l)				ZVAL_RESOURCE(return_value,l)
+#define RETVAL_BOOL(b)					ZVAL_BOOL(return_value,b)
+#define RETVAL_NULL() 					ZVAL_NULL(return_value)
+#define RETVAL_LONG(l) 					ZVAL_LONG(return_value,l)
+#define RETVAL_DOUBLE(d) 				ZVAL_DOUBLE(return_value,d)
+#define RETVAL_STRING(s,duplicate) 		ZVAL_STRING(return_value,s,duplicate)
+#define RETVAL_STRINGL(s,l,duplicate) 	ZVAL_STRINGL(return_value,s,l,duplicate)
+#define RETVAL_EMPTY_STRING() 			ZVAL_EMPTY_STRING(return_value)
+#define RETVAL_FALSE  					ZVAL_BOOL(return_value,0)
+#define RETVAL_TRUE   					ZVAL_BOOL(return_value,1)
+
+#define RETURN_RESOURCE(l) 				{ RETVAL_RESOURCE(l); return; }
+#define RETURN_BOOL(b) 					{ RETVAL_BOOL(b); return; }
+#define RETURN_NULL() 					{ RETVAL_NULL(); return;}
+#define RETURN_LONG(l) 					{ RETVAL_LONG(l); return; }
+#define RETURN_DOUBLE(d) 				{ RETVAL_DOUBLE(d); return; }
+#define RETURN_STRING(s,duplicate) 		{ RETVAL_STRING(s,duplicate); return; }
+#define RETURN_STRINGL(s,l,duplicate) 	{ RETVAL_STRINGL(s,l,duplicate); return; }
+#define RETURN_EMPTY_STRING() 			{ RETVAL_EMPTY_STRING(); return; }
+#define RETURN_FALSE  					{ RETVAL_FALSE; return; }
+#define RETURN_TRUE   					{ RETVAL_TRUE; return; }
+
+#define SET_VAR_STRING(n,v)	{																				\
+								{																			\
+									zval *var;																\
+									ALLOC_ZVAL(var);														\
+									ZVAL_STRING(var,v,0);													\
+									ZEND_SET_GLOBAL_VAR(n, var);											\
+								}																			\
+							}
+
+#define SET_VAR_STRINGL(n,v,l)	{														\
+									{													\
+										zval *var;										\
+										ALLOC_ZVAL(var);								\
+										ZVAL_STRINGL(var,v,l,0);						\
+										ZEND_SET_GLOBAL_VAR(n, var);					\
+									}													\
+								}
+
+#define SET_VAR_LONG(n,v)	{															\
+								{														\
+									zval *var;											\
+									ALLOC_ZVAL(var);									\
+									ZVAL_LONG(var,v);									\
+									ZEND_SET_GLOBAL_VAR(n, var);						\
+								}														\
+							}
+
+#define SET_VAR_DOUBLE(n,v)	{															\
+								{														\
+									zval *var;											\
+									ALLOC_ZVAL(var);									\
+									ZVAL_DOUBLE(var,v);									\
+									ZEND_SET_GLOBAL_VAR(n, var);						\
+								}														\
+							}
+
+
+#define ZEND_SET_SYMBOL(symtable, name, var)										\
+	{																				\
+		char *_name = (name);														\
+																					\
+		ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 1, 0);	\
+	}
+
+#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref)				\
+	{																									\
+		zval **orig_var;																				\
+																										\
+		if (zend_hash_find(symtable, (name), (name_length), (void **) &orig_var)==SUCCESS				\
+			&& PZVAL_IS_REF(*orig_var)) {																\
+			(var)->refcount = (*orig_var)->refcount;													\
+			(var)->is_ref = 1;																			\
+																										\
+			if (_refcount) {																			\
+				(var)->refcount += _refcount-1;															\
+			}																							\
+			zval_dtor(*orig_var);																		\
+			**orig_var = *(var);																		\
+			FREE_ZVAL(var);																					\
+		} else {																						\
+			(var)->is_ref = _is_ref;																	\
+			if (_refcount) {																			\
+				(var)->refcount = _refcount;															\
+			}																							\
+			zend_hash_update(symtable, (name), (name_length), &(var), sizeof(zval *), NULL);			\
+		}																								\
+	}
+
+
+#define ZEND_SET_GLOBAL_VAR(name, var)				\
+	ZEND_SET_SYMBOL(&EG(symbol_table), name, var)
+
+#define ZEND_SET_GLOBAL_VAR_WITH_LENGTH(name, name_length, var, _refcount, _is_ref)		\
+	ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), name, name_length, var, _refcount, _is_ref)
+
+#define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? Z_OBJPROP_P(p) : NULL)))
+#define ZVAL_IS_NULL(z) ((z)->type==IS_NULL)
+
+#endif /* ZEND_API_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_alloc.c

@@ -0,0 +1,769 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include <stdlib.h>
+
+#include "zend.h"
+#include "zend_alloc.h"
+#include "zend_globals.h"
+#include "zend_fast_cache.h"
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef ZTS
+ZEND_API zend_alloc_globals alloc_globals;
+#endif
+
+
+#define ZEND_DISABLE_MEMORY_CACHE 0
+
+
+#ifdef ZEND_WIN32
+#define ZEND_DO_MALLOC(size)		(AG(memory_heap) ? HeapAlloc(AG(memory_heap), HEAP_NO_SERIALIZE, size) : malloc(size))
+#define ZEND_DO_FREE(ptr)			(AG(memory_heap) ? HeapFree(AG(memory_heap), HEAP_NO_SERIALIZE, ptr) : free(ptr))
+#define ZEND_DO_REALLOC(ptr, size)	(AG(memory_heap) ? HeapReAlloc(AG(memory_heap), HEAP_NO_SERIALIZE, ptr, size) : realloc(ptr, size))
+#else
+#define ZEND_DO_MALLOC(size)		malloc(size)
+#define ZEND_DO_FREE(ptr)			free(ptr)
+#define ZEND_DO_REALLOC(ptr, size)	realloc(ptr, size)
+#endif
+
+#if ZEND_DEBUG
+# define END_MAGIC_SIZE sizeof(long)
+static long mem_block_end_magic = MEM_BLOCK_END_MAGIC;
+#else
+# define END_MAGIC_SIZE 0
+#endif
+
+
+# if MEMORY_LIMIT
+#  if ZEND_DEBUG
+#define CHECK_MEMORY_LIMIT(s, rs) _CHECK_MEMORY_LIMIT(s, rs, __zend_filename, __zend_lineno)
+#  else
+#define CHECK_MEMORY_LIMIT(s, rs)	_CHECK_MEMORY_LIMIT(s, rs, NULL,0)
+#  endif
+
+#define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\
+								if (AG(memory_limit)<AG(allocated_memory)) {\
+									if ((AG(memory_limit)+1048576)<AG(allocated_memory)) { \
+										/* failed to handle this gracefully, exit() */ \
+										exit(1);	\
+									}	\
+									if (!AG(memory_exhausted)) {	\
+										if (!file) { \
+											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", AG(memory_limit),s); \
+										} else { \
+											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", AG(memory_limit), file, lineno, s); \
+										} \
+										AG(memory_exhausted)=1;	\
+									}	\
+								} \
+							}
+# endif
+
+#ifndef CHECK_MEMORY_LIMIT
+#define CHECK_MEMORY_LIMIT(s, rs)
+#endif
+
+
+#define REMOVE_POINTER_FROM_LIST(p)				\
+	if (!p->persistent && p==AG(head)) {		\
+		AG(head) = p->pNext;					\
+	} else if (p->persistent && p==AG(phead)) {	\
+		AG(phead) = p->pNext;					\
+	} else {									\
+		p->pLast->pNext = p->pNext;				\
+	}											\
+	if (p->pNext) {								\
+		p->pNext->pLast = p->pLast;				\
+	}
+
+#define ADD_POINTER_TO_LIST(p)		\
+	if (p->persistent) {			\
+		p->pNext = AG(phead);		\
+		if (AG(phead)) {			\
+			AG(phead)->pLast = p;	\
+		}							\
+		AG(phead) = p;				\
+	} else {						\
+		p->pNext = AG(head);		\
+		if (AG(head)) {				\
+			AG(head)->pLast = p;	\
+		}							\
+		AG(head) = p;				\
+	}								\
+	p->pLast = (zend_mem_header *) NULL;
+
+#define DECLARE_CACHE_VARS()	\
+	unsigned int real_size;		\
+	unsigned int cache_index
+
+#define REAL_SIZE(size) ((size+7) & ~0x7)
+
+#define CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size)	\
+	real_size = REAL_SIZE(size);				\
+	cache_index = real_size >> 3;
+
+#define SIZE real_size
+
+#define CACHE_INDEX cache_index
+
+ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p;
+	DECLARE_CACHE_VARS();
+	TSRMLS_FETCH();
+
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
+
+	if (!ZEND_DISABLE_MEMORY_CACHE && (CACHE_INDEX < MAX_CACHED_MEMORY) && (AG(cache_count)[CACHE_INDEX] > 0)) {
+		p = AG(cache)[CACHE_INDEX][--AG(cache_count)[CACHE_INDEX]];
+#if ZEND_DEBUG
+		p->filename = __zend_filename;
+		p->lineno = __zend_lineno;
+		p->orig_filename = __zend_orig_filename;
+		p->orig_lineno = __zend_orig_lineno;
+		p->magic = MEM_BLOCK_START_MAGIC;
+		p->reported = 0;
+		/* Setting the thread id should not be necessary, because we fetched this block
+		 * from this thread's cache
+		 */
+		AG(cache_stats)[CACHE_INDEX][1]++;
+		memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long));
+#endif
+		p->persistent = 0;
+		p->cached = 0;
+		p->size = size;
+		return (void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING);
+	} else {
+#if ZEND_DEBUG
+		if (CACHE_INDEX<MAX_CACHED_MEMORY) {
+			AG(cache_stats)[CACHE_INDEX][0]++;
+		}
+#endif
+		p  = (zend_mem_header *) ZEND_DO_MALLOC(sizeof(zend_mem_header) + MEM_HEADER_PADDING + SIZE + END_MAGIC_SIZE);
+	}
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+
+	if (!p) {
+		fprintf(stderr,"FATAL:  emalloc():  Unable to allocate %ld bytes\n", (long) size);
+#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
+		kill(getpid(), SIGSEGV);
+#else
+		exit(1);
+#endif
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (void *)p;
+	}
+	p->persistent = p->cached = 0;
+	ADD_POINTER_TO_LIST(p);
+	p->size = size; /* Save real size for correct cache output */
+#if ZEND_DEBUG
+	p->filename = __zend_filename;
+	p->lineno = __zend_lineno;
+	p->orig_filename = __zend_orig_filename;
+	p->orig_lineno = __zend_orig_lineno;
+	p->magic = MEM_BLOCK_START_MAGIC;
+	p->reported = 0;
+# ifdef ZTS
+	p->thread_id = tsrm_thread_id();
+# endif
+	memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long));
+#endif
+#if MEMORY_LIMIT
+	CHECK_MEMORY_LIMIT(size, SIZE);
+	if (AG(allocated_memory) > AG(allocated_memory_peak)) {
+		AG(allocated_memory_peak) = AG(allocated_memory);
+	}
+#endif
+
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return (void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING);
+}
+
+
+ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p = (zend_mem_header *) ((char *)ptr - sizeof(zend_mem_header) - MEM_HEADER_PADDING);
+	DECLARE_CACHE_VARS();
+	TSRMLS_FETCH();
+
+#if defined(ZTS) && TSRM_DEBUG
+	if (p->thread_id != tsrm_thread_id()) {
+		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x freed at %s:(%d) on thread %x, ignoring",
+			p->filename, p->lineno, p->thread_id,
+			__zend_filename, __zend_lineno, tsrm_thread_id());
+		return;
+	}
+#endif
+
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(p->size);
+#if ZEND_DEBUG
+	if (!_mem_block_check(ptr, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
+		return;
+	}
+	memset(ptr, 0x5a, p->size);
+#endif
+
+	if (!ZEND_DISABLE_MEMORY_CACHE 
+		&& !p->persistent && (CACHE_INDEX < MAX_CACHED_MEMORY) && (AG(cache_count)[CACHE_INDEX] < MAX_CACHED_ENTRIES)) {
+		AG(cache)[CACHE_INDEX][AG(cache_count)[CACHE_INDEX]++] = p;
+		p->cached = 1;
+#if ZEND_DEBUG
+		p->magic = MEM_BLOCK_CACHED_MAGIC;
+#endif
+		return;
+	}
+	HANDLE_BLOCK_INTERRUPTIONS();
+	REMOVE_POINTER_FROM_LIST(p);
+
+#if MEMORY_LIMIT
+	AG(allocated_memory) -= SIZE;
+#endif
+	
+	ZEND_DO_FREE(p);
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+}
+
+
+ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	void *p;
+	int final_size = size*nmemb;
+	
+	HANDLE_BLOCK_INTERRUPTIONS();
+	p = _emalloc(final_size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	if (!p) {
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (void *) p;
+	}
+	memset(p, 0, final_size);
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return p;
+}
+
+
+ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p;
+	zend_mem_header *orig;
+	DECLARE_CACHE_VARS();
+	TSRMLS_FETCH();
+
+	if (!ptr) {
+		return _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	}
+
+	p = orig = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-MEM_HEADER_PADDING);
+
+#if defined(ZTS) && TSRM_DEBUG
+	if (p->thread_id != tsrm_thread_id()) {
+		void *new_p;
+
+		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x reallocated at %s:(%d) on thread %x, duplicating",
+			p->filename, p->lineno, p->thread_id,
+			__zend_filename, __zend_lineno, tsrm_thread_id());
+		new_p = _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		memcpy(new_p, ptr, p->size);
+		return new_p;
+	}
+#endif
+
+	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+	REMOVE_POINTER_FROM_LIST(p);
+	p = (zend_mem_header *) ZEND_DO_REALLOC(p,sizeof(zend_mem_header)+MEM_HEADER_PADDING+SIZE+END_MAGIC_SIZE);
+	if (!p) {
+		if (!allow_failure) {
+			fprintf(stderr,"FATAL:  erealloc():  Unable to allocate %ld bytes\n", (long) size);
+#if ZEND_DEBUG && HAVE_KILL && HAVE_GETPID
+			kill(getpid(), SIGSEGV);
+#else
+			exit(1);
+#endif
+		}
+		ADD_POINTER_TO_LIST(orig);
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (void *)NULL;
+	}
+	ADD_POINTER_TO_LIST(p);
+#if ZEND_DEBUG
+	p->filename = __zend_filename;
+	p->lineno = __zend_lineno;
+	p->magic = MEM_BLOCK_START_MAGIC;
+	memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long));
+#endif	
+#if MEMORY_LIMIT
+	CHECK_MEMORY_LIMIT(size - p->size, SIZE - REAL_SIZE(p->size));
+	if (AG(allocated_memory) > AG(allocated_memory_peak)) {
+		AG(allocated_memory_peak) = AG(allocated_memory);
+	}
+#endif
+
+	p->size = size;
+
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return (void *)((char *)p+sizeof(zend_mem_header)+MEM_HEADER_PADDING);
+}
+
+
+ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	int length;
+	char *p;
+
+	length = strlen(s)+1;
+	HANDLE_BLOCK_INTERRUPTIONS();
+	p = (char *) _emalloc(length ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	if (!p) {
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (char *)NULL;
+	}
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	memcpy(p, s, length);
+	return p;
+}
+
+
+ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	char *p;
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+	p = (char *) _emalloc(length+1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	if (!p) {
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		return (char *)NULL;
+	}
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	memcpy(p, s, length);
+	p[length] = 0;
+	return p;
+}
+
+
+ZEND_API char *zend_strndup(const char *s, uint length)
+{
+	char *p;
+
+	p = (char *) malloc(length+1);
+	if (!p) {
+		return (char *)NULL;
+	}
+	if (length) {
+		memcpy(p, s, length);
+	}
+	p[length] = 0;
+	return p;
+}
+
+
+ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
+{
+#if MEMORY_LIMIT
+	TSRMLS_FETCH();
+
+	AG(memory_limit) = memory_limit;
+	return SUCCESS;
+#else
+	return FAILURE;
+#endif
+}
+
+
+ZEND_API void start_memory_manager(TSRMLS_D)
+{
+#if 0
+#ifndef ZTS
+	int i, j;
+	void *cached_entries[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
+#endif
+#endif
+
+	AG(phead) = AG(head) = NULL;
+	
+#if MEMORY_LIMIT
+	AG(memory_limit) = 1<<30;		/* rediculous limit, effectively no limit */
+	AG(allocated_memory) = 0;
+	AG(memory_exhausted) = 0;
+	AG(allocated_memory_peak) = 0;
+#endif
+
+	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
+	memset(AG(cache_count), 0, sizeof(AG(cache_count)));
+
+#ifdef ZEND_WIN32
+	AG(memory_heap) = HeapCreate(HEAP_NO_SERIALIZE, 256*1024, 0);
+#endif
+
+#if 0
+#ifndef ZTS
+	/* Initialize cache, to prevent fragmentation */
+	/* We can't do this in ZTS mode, because calling emalloc() from within start_memory_manager()
+	 * will yield an endless recursion calling to alloc_globals_ctor()
+	 */
+	for (i=1; i<MAX_CACHED_MEMORY; i++) {
+		for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
+			cached_entries[i][j] = emalloc(8*i);
+		}
+	}
+	for (i=1; i<MAX_CACHED_MEMORY; i++) {
+		for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
+			efree(cached_entries[i][j]);
+		}
+	}
+#endif
+#endif
+
+#if ZEND_DEBUG
+	memset(AG(cache_stats), 0, sizeof(AG(cache_stats)));
+	memset(AG(fast_cache_stats), 0, sizeof(AG(fast_cache_stats)));
+#endif
+}
+
+
+ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
+{
+	zend_mem_header *p, *t;
+	unsigned int fci, i, j;
+#if ZEND_DEBUG
+	int had_leaks = 0;
+#endif
+	zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry;
+	TSRMLS_FETCH();
+
+#if defined(ZEND_WIN32) && !ZEND_DEBUG
+	if (clean_cache && AG(memory_heap)) {
+		HeapDestroy(AG(memory_heap));
+		return;
+	}
+#endif
+
+	for (fci=0; fci<MAX_FAST_CACHE_TYPES; fci++) {
+		fast_cache_list_entry = AG(fast_cache_list_head)[fci];
+		while (fast_cache_list_entry) {
+			next_fast_cache_list_entry = fast_cache_list_entry->next;
+			efree(fast_cache_list_entry);
+			fast_cache_list_entry = next_fast_cache_list_entry;
+		}
+		AG(fast_cache_list_head)[fci] = NULL;
+	}
+
+	if (1 || clean_cache) {
+		zend_mem_header *ptr;
+
+		for (i=1; i<MAX_CACHED_MEMORY; i++) {
+			for (j=0; j<AG(cache_count)[i]; j++) {
+				ptr = (zend_mem_header *) AG(cache)[i][j];
+#if MEMORY_LIMIT
+				AG(allocated_memory) -= REAL_SIZE(ptr->size);
+#endif
+				REMOVE_POINTER_FROM_LIST(ptr);
+				ZEND_DO_FREE(ptr);
+			}
+			AG(cache_count)[i] = 0;
+		}
+	}
+
+	p = AG(head);
+	t = AG(head);
+	while (t) {
+		if (!t->cached) {
+#if ZEND_DEBUG
+			if (!t->cached && !t->reported) {
+				zend_mem_header *iterator;
+				int total_leak=0, total_leak_count=0;
+
+				had_leaks = 1;
+				if (!silent) {
+					zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, t);
+				}
+				t->reported = 1;
+				for (iterator=t->pNext; iterator; iterator=iterator->pNext) {
+					if (!iterator->cached
+						&& iterator->filename==t->filename
+						&& iterator->lineno==t->lineno) {
+						total_leak += iterator->size;
+						total_leak_count++;
+						iterator->reported = 1;
+					}
+				}
+				if (!silent && total_leak_count>0) {
+					zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *) (long) (total_leak_count));
+				}
+			}
+#endif
+#if MEMORY_LIMIT
+			AG(allocated_memory) -= t->size;
+#endif
+			p = t->pNext;
+			REMOVE_POINTER_FROM_LIST(t);
+			ZEND_DO_FREE(t);
+			t = p;
+		} else {
+			t = t->pNext;
+		}
+	}
+
+#if MEMORY_LIMIT
+	AG(memory_exhausted)=0;
+	AG(allocated_memory_peak) = 0;
+#endif
+
+
+#if (ZEND_DEBUG)
+	do {
+		zval display_memory_cache_stats;
+		int i, j;
+
+		if (clean_cache) {
+			/* we're shutting down completely, don't even touch the INI subsystem */
+			break;
+		}
+		if (zend_get_configuration_directive("display_memory_cache_stats", sizeof("display_memory_cache_stats"), &display_memory_cache_stats)==FAILURE) {
+			break;
+		}
+		if (!atoi(display_memory_cache_stats.value.str.val)) {
+			break;
+		}
+		fprintf(stderr, "Memory cache statistics\n"
+						"-----------------------\n\n"
+						"[zval, %2ld]\t\t%d / %d (%.2f%%)\n"
+						"[hash, %2ld]\t\t%d / %d (%.2f%%)\n",
+						(long) sizeof(zval),
+						AG(fast_cache_stats)[ZVAL_CACHE_LIST][1], AG(fast_cache_stats)[ZVAL_CACHE_LIST][0]+AG(fast_cache_stats)[ZVAL_CACHE_LIST][1],
+						((double) AG(fast_cache_stats)[ZVAL_CACHE_LIST][1] / (AG(fast_cache_stats)[ZVAL_CACHE_LIST][0]+AG(fast_cache_stats)[ZVAL_CACHE_LIST][1]))*100,
+						(long) sizeof(HashTable),
+						AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1], AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][0]+AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1],
+						((double) AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1] / (AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][0]+AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1]))*100);
+
+
+		for (i=0; i<MAX_CACHED_MEMORY; i+=2) {
+			fprintf(stderr, "[%2d, %2d]\t\t", i, i+1);
+			for (j=0; j<2; j++) {
+				fprintf(stderr, "%d / %d (%.2f%%)\t\t",
+						AG(cache_stats)[i+j][1], AG(cache_stats)[i+j][0]+AG(cache_stats)[i+j][1],
+						((double) AG(cache_stats)[i+j][1] / (AG(cache_stats)[i+j][0]+AG(cache_stats)[i+j][1]))*100);
+			}
+			fprintf(stderr, "\n");
+		}
+					
+	} while (0);
+
+#if defined(ZEND_WIN32) && ZEND_DEBUG
+	if (clean_cache && AG(memory_heap)) {
+		HeapDestroy(AG(memory_heap));
+	}
+#endif
+
+#endif
+}
+
+
+#if ZEND_DEBUG
+void zend_debug_alloc_output(char *format, ...)
+{
+	char output_buf[256];
+	va_list args;
+
+	va_start(args, format);
+	vsprintf(output_buf, format, args);
+	va_end(args);
+
+#ifdef ZEND_WIN32
+	OutputDebugString(output_buf);
+#else
+	fprintf(stderr, "%s", output_buf);
+#endif
+}
+
+
+ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p = (zend_mem_header *) ((char *)ptr - sizeof(zend_mem_header) - MEM_HEADER_PADDING);
+	int no_cache_notice=0;
+	int valid_beginning=1;
+	int had_problems=0;
+	long end_magic;
+
+	if (silent==2) {
+		silent = 1;
+		no_cache_notice = 1;
+	}
+	if (silent==3) {
+		silent = 0;
+		no_cache_notice = 1;
+	}
+	if (!silent) {
+		zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL);
+		zend_debug_alloc_output("---------------------------------------\n");
+		zend_debug_alloc_output("%s(%d) : Block 0x%0.8lX status:\n" ZEND_FILE_LINE_RELAY_CC, (long) p);
+		if (__zend_orig_filename) {
+			zend_debug_alloc_output("%s(%d) : Actual location (location was relayed)\n" ZEND_FILE_LINE_ORIG_RELAY_CC);
+		}
+		zend_debug_alloc_output("%10s\t","Beginning:  ");
+	}
+
+	switch (p->magic) {
+		case MEM_BLOCK_START_MAGIC:
+			if (!silent) {
+				zend_debug_alloc_output("OK (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
+			}
+			break; /* ok */
+		case MEM_BLOCK_FREED_MAGIC:
+			if (!silent) {
+				zend_debug_alloc_output("Freed\n");
+				had_problems = 1;
+			} else {
+				return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+			}
+			break;
+		case MEM_BLOCK_CACHED_MAGIC:
+			if (!silent) {
+				if (!no_cache_notice) {
+					zend_debug_alloc_output("Cached (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
+					had_problems = 1;
+				}
+			} else {
+				if (!no_cache_notice) {
+					return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+				}
+			}
+			break;
+		default:
+			if (!silent) {
+				zend_debug_alloc_output("Overrun (magic=0x%0.8lX, expected=0x%0.8lX)\n", p->magic, MEM_BLOCK_START_MAGIC);
+			} else {
+				return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+			}
+			had_problems = 1;
+			valid_beginning = 0;
+			break;
+	}
+
+
+	memcpy(&end_magic, (((char *) p)+sizeof(zend_mem_header)+MEM_HEADER_PADDING+p->size), sizeof(long));
+
+	if (valid_beginning && (end_magic != MEM_BLOCK_END_MAGIC)) {
+		char *overflow_ptr, *magic_ptr=(char *) &mem_block_end_magic;
+		int overflows=0;
+		int i;
+
+		if (silent) {
+			return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		}
+		had_problems = 1;
+		overflow_ptr = (char *) &end_magic;
+
+		for (i=0; i<sizeof(long); i++) {
+			if (overflow_ptr[i]!=magic_ptr[i]) {
+				overflows++;
+			}
+		}
+
+		zend_debug_alloc_output("%10s\t", "End:");
+		zend_debug_alloc_output("Overflown (magic=0x%0.8lX instead of 0x%0.8lX)\n", end_magic, MEM_BLOCK_END_MAGIC);
+		zend_debug_alloc_output("%10s\t","");
+		if (overflows>=sizeof(long)) {
+			zend_debug_alloc_output("At least %d bytes overflown\n", sizeof(long));
+		} else {
+			zend_debug_alloc_output("%d byte(s) overflown\n", overflows);
+		}
+	} else if (!silent) {
+		zend_debug_alloc_output("%10s\t", "End:");
+		if (valid_beginning) {
+			zend_debug_alloc_output("OK\n");
+		} else {
+			zend_debug_alloc_output("Unknown\n");
+		}
+	}
+
+	if (had_problems) {
+		int foo = 5;
+
+		foo += 1;
+	}
+		
+	if (!silent) {
+		zend_debug_alloc_output("---------------------------------------\n");
+	}
+	return ((!had_problems) ? 1 : 0);
+}
+
+
+ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p;
+	int errors=0;
+	TSRMLS_FETCH();
+
+	p = AG(head);
+	
+
+	zend_debug_alloc_output("------------------------------------------------\n");
+	zend_debug_alloc_output("Full Memory Check at %s:%d\n" ZEND_FILE_LINE_RELAY_CC);
+
+	while (p) {
+		if (!_mem_block_check((void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING), (silent?2:3) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
+			errors++;
+		}
+		p = p->pNext;
+	}
+	zend_debug_alloc_output("End of full memory check %s:%d (%d errors)\n" ZEND_FILE_LINE_RELAY_CC, errors);
+	zend_debug_alloc_output("------------------------------------------------\n");
+}
+#endif
+
+
+ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zend_mem_header *p = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-MEM_HEADER_PADDING);
+	TSRMLS_FETCH();
+
+#if ZEND_DEBUG
+	_mem_block_check(ptr, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+#endif
+
+	HANDLE_BLOCK_INTERRUPTIONS();
+
+	/* remove the block from the non persistent list */
+	REMOVE_POINTER_FROM_LIST(p);
+
+	p->persistent = 1;
+
+	/* add the block to the persistent list */
+	ADD_POINTER_TO_LIST(p);
+	HANDLE_UNBLOCK_INTERRUPTIONS();
+	return REAL_SIZE(p->size)+sizeof(zend_mem_header)+MEM_HEADER_PADDING;
+}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_alloc.h

@@ -0,0 +1,141 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_ALLOC_H
+#define ZEND_ALLOC_H
+
+#include <stdio.h>
+
+#include "../TSRM/TSRM.h"
+#include "zend_globals_macros.h"
+
+#define MEM_BLOCK_START_MAGIC	0x7312F8DCL
+#define MEM_BLOCK_END_MAGIC		0x2A8FCC84L
+#define MEM_BLOCK_FREED_MAGIC	0x99954317L
+#define MEM_BLOCK_CACHED_MAGIC	0xFB8277DCL
+
+typedef struct _zend_mem_header {
+#if ZEND_DEBUG
+	long magic;
+	char *filename;
+	uint lineno;
+	int reported;
+	char *orig_filename;
+	uint orig_lineno;
+# ifdef ZTS
+	THREAD_T thread_id;
+# endif
+#endif
+    struct _zend_mem_header *pNext;
+    struct _zend_mem_header *pLast;
+	unsigned int size:30;
+	unsigned int persistent:1;
+	unsigned int cached:1;
+} zend_mem_header;
+
+typedef union _align_test {
+	void *ptr;
+	double dbl;
+	long lng;
+} align_test;
+
+#define MAX_CACHED_MEMORY	11
+#define MAX_CACHED_ENTRIES	256
+#define PRE_INIT_CACHE_ENTRIES	32
+
+#if (defined (__GNUC__) && __GNUC__ >= 2)
+#define PLATFORM_ALIGNMENT (__alignof__ (align_test))
+#else
+#define PLATFORM_ALIGNMENT (sizeof(align_test))
+#endif
+
+#define MEM_HEADER_PADDING (((PLATFORM_ALIGNMENT-sizeof(zend_mem_header))%PLATFORM_ALIGNMENT+PLATFORM_ALIGNMENT)%PLATFORM_ALIGNMENT)
+
+
+BEGIN_EXTERN_C()
+
+ZEND_API char *zend_strndup(const char *s, unsigned int length);
+
+ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+
+/* Standard wrapper macros */
+#define emalloc(size)					_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define efree(ptr)						_efree((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define ecalloc(nmemb,size)				_ecalloc((nmemb), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define erealloc(ptr,size)				_erealloc((ptr), (size),0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define erealloc_recoverable(ptr,size)	_erealloc((ptr), (size),1 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define estrdup(s)						_estrdup((s) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define estrndup(s,length)				_estrndup((s), (length) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define persist_alloc(p)				_persist_alloc((p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+
+/* Relay wrapper macros */
+#define emalloc_rel(size)					_emalloc((size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define efree_rel(ptr)						_efree((ptr) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define ecalloc_rel(nmemb, size)			_ecalloc((nmemb), (size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define erealloc_rel(ptr, size)				_erealloc((ptr), (size), 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define erealloc_recoverable_rel(ptr, size)	_erealloc((ptr), (size), 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define estrdup_rel(s)						_estrdup((s) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define estrndup_rel(s, length)				_estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+#define persist_alloc_rel(p)				_persist_alloc((p) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
+
+/* Selective persistent/non persistent allocation macros */
+#define pemalloc(size,persistent) ((persistent)?malloc(size):emalloc(size))
+#define pefree(ptr,persistent)  ((persistent)?free(ptr):efree(ptr))
+#define pecalloc(nmemb,size,persistent) ((persistent)?calloc((nmemb),(size)):ecalloc((nmemb),(size)))
+#define perealloc(ptr,size,persistent) ((persistent)?realloc((ptr),(size)):erealloc((ptr),(size)))
+#define perealloc_recoverable(ptr,size,persistent) ((persistent)?realloc((ptr),(size)):erealloc_recoverable((ptr),(size)))
+#define pestrdup(s,persistent) ((persistent)?strdup(s):estrdup(s))
+
+#define safe_estrdup(ptr)  ((ptr)?(estrdup(ptr)):(empty_string))
+#define safe_estrndup(ptr,len) ((ptr)?(estrndup((ptr),(len))):(empty_string))
+
+ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
+
+ZEND_API void start_memory_manager(TSRMLS_D);
+ZEND_API void shutdown_memory_manager(int silent, int clean_cache);
+
+#if ZEND_DEBUG
+ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+void zend_debug_alloc_output(char *format, ...);
+#define mem_block_check(ptr, silent) _mem_block_check(ptr, silent ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define full_mem_check(silent) _full_mem_check(silent ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#else
+#define mem_block_check(type, ptr, silent)
+#define full_mem_check(silent)
+#endif
+
+
+END_EXTERN_C()
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_builtin_functions.h

@@ -0,0 +1,26 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_BUILTIN_FUNCTIONS_H
+#define ZEND_BUILTIN_FUNCTIONS_H
+
+int zend_startup_builtin_functions(TSRMLS_D);
+
+#endif /* ZEND_BUILTIN_FUNCTIONS_H */

Zend/zend_compile.h

@@ -0,0 +1,621 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_COMPILE_H
+#define ZEND_COMPILE_H
+
+#include "zend.h"
+
+#ifdef HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+
+#ifdef __cplusplus
+#include <iostream.h>
+#endif
+
+#include "zend_llist.h"
+
+#define DEBUG_ZEND 0
+
+#define FREE_PNODE(znode)	zval_dtor(&znode->u.constant);
+#define FREE_OP(op, should_free) if (should_free) zval_dtor(&Ts[(op)->u.var].tmp_var);
+
+#define SET_UNUSED(op)  (op).op_type = IS_UNUSED
+
+#define INC_BPC(op_array)	if (CG(interactive)) { ((op_array)->backpatch_count++); }
+#define DEC_BPC(op_array)	if (CG(interactive)) { ((op_array)->backpatch_count--); }
+#define HANDLE_INTERACTIVE()  if (CG(interactive)) { execute_new_code(TSRMLS_C); }
+
+typedef struct _zend_op_array zend_op_array;
+
+typedef struct _znode {
+	int op_type;
+	union {
+		zval constant;
+
+		zend_uint var;
+		zend_uint opline_num; /*  Needs to be signed */
+		zend_uint fetch_type;
+		zend_op_array *op_array;
+		struct {
+			zend_uint var;	/* dummy */
+			zend_uint type;
+		} EA;
+	} u;
+} znode;
+
+
+typedef struct _zend_op {
+	zend_uchar opcode;
+	znode result;
+	znode op1;
+	znode op2;
+	ulong extended_value;
+	uint lineno;
+} zend_op;
+
+
+typedef struct _zend_brk_cont_element {
+	int cont;
+	int brk;
+	int parent;
+} zend_brk_cont_element;
+
+
+struct _zend_op_array {
+	zend_uchar type;	/* MUST be the first element of this struct! */
+
+	zend_uchar *arg_types;		/* MUST be the second element of this struct! */
+	char *function_name;			/* MUST be the third element of this struct! */
+
+	zend_uint *refcount;
+
+	zend_op *opcodes;
+	zend_uint last, size;
+
+	zend_uint T;
+
+	zend_brk_cont_element *brk_cont_array;
+	zend_uint last_brk_cont;
+	zend_uint current_brk_cont;
+	zend_bool uses_globals;
+
+	/* static variables support */
+	HashTable *static_variables;
+
+	zend_op *start_op;
+	int backpatch_count;
+
+	zend_bool return_reference;
+	zend_bool done_pass_two;
+
+	char *filename;
+
+	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+};
+
+
+typedef struct _zend_internal_function {
+	zend_uchar type;	/* MUST be the first element of this struct! */
+
+	zend_uchar *arg_types;		/* MUST be the second element of this struct */
+	char *function_name;			/* MUST be the third element of this struct */
+
+	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
+} zend_internal_function;
+
+
+typedef struct _zend_overloaded_function {
+	zend_uchar type;	/* MUST be the first element of this struct! */
+
+	zend_uchar *arg_types;		/* MUST be the second element of this struct */
+	char *function_name;		/* MUST be the third element of this struct */
+
+	zend_uint var;
+} zend_overloaded_function;
+
+
+typedef union _zend_function {
+	zend_uchar type;	/* MUST be the first element of this struct! */
+	struct {
+		zend_uchar type;  /* never used */
+		zend_uchar *arg_types;
+		char *function_name;
+	} common;
+	
+	zend_op_array op_array;
+	zend_internal_function internal_function;
+	zend_overloaded_function overloaded_function;
+} zend_function;
+
+
+typedef struct _zend_function_state {
+	HashTable *function_symbol_table;
+	zend_function *function;
+	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+} zend_function_state;
+
+
+typedef struct _zend_switch_entry {
+	znode cond;
+	int default_case;
+	int control_var;
+} zend_switch_entry;
+
+
+typedef struct _list_llist_element {
+	znode var;
+	zend_llist dimensions;
+	znode value;
+} list_llist_element;
+
+
+typedef struct _zend_file_handle {
+	zend_uchar type;
+	char *filename;
+	char *opened_path;
+	union {
+		int fd;
+		FILE *fp;
+#ifdef __cplusplus
+		istream *is;
+#endif
+	} handle;
+	zend_bool free_filename;
+} zend_file_handle;
+
+
+
+#define IS_CONST	(1<<0)
+#define IS_TMP_VAR	(1<<1)
+#define IS_VAR		(1<<2)
+#define IS_UNUSED	(1<<3)	/* Unused variable */
+
+
+#define EXT_TYPE_UNUSED		(1<<0)
+
+#include "zend_globals.h"
+
+BEGIN_EXTERN_C()
+
+void init_compiler(TSRMLS_D);
+void shutdown_compiler(TSRMLS_D);
+void zend_init_compiler_data_structures(TSRMLS_D);
+
+extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
+
+void zend_activate(TSRMLS_D);
+void zend_deactivate(TSRMLS_D);
+void zend_activate_modules(TSRMLS_D);
+void zend_deactivate_modules(TSRMLS_D);
+
+
+int lex_scan(zval *zendlval TSRMLS_DC);
+void startup_scanner(TSRMLS_D);
+void shutdown_scanner(TSRMLS_D);
+
+ZEND_API char *zend_set_compiled_filename(char *new_compiled_filename TSRMLS_DC);
+ZEND_API void zend_restore_compiled_filename(char *original_compiled_filename TSRMLS_DC);
+ZEND_API char *zend_get_compiled_filename(TSRMLS_D);
+ZEND_API int zend_get_compiled_lineno(TSRMLS_D);
+
+#ifdef ZTS
+const char *zend_get_zendtext(TSRMLS_D);
+int zend_get_zendleng(TSRMLS_D);
+#endif
+
+
+/* parser-driven code generators */
+void zend_do_binary_op(int op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_unary_op(int op, znode *result, znode *op1 TSRMLS_DC);
+void zend_do_binary_assign_op(int op, znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_assign(znode *result, znode *variable, znode *value TSRMLS_DC);
+void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar TSRMLS_DC);
+void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC);
+void fetch_simple_variable_ex(znode *result, znode *varname, int bp, int op TSRMLS_DC);
+void zend_do_indirect_references(znode *result, znode *num_references, znode *variable TSRMLS_DC);
+void zend_do_fetch_global_or_static_variable(znode *varname, znode *static_assignment, int fetch_type TSRMLS_DC);
+void zend_do_fetch_globals(znode *varname TSRMLS_DC);
+
+void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC);
+void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC);
+void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC);
+void zend_do_print(znode *result, znode *arg TSRMLS_DC);
+void zend_do_echo(znode *arg TSRMLS_DC);
+typedef int (*unary_op_type)(zval *, zval *);
+ZEND_API unary_op_type get_unary_op(int opcode);
+ZEND_API void *get_binary_op(int opcode);
+
+void zend_do_while_cond(znode *expr, znode *close_bracket_token TSRMLS_DC);
+void zend_do_while_end(znode *while_token, znode *close_bracket_token TSRMLS_DC);
+void zend_do_do_while_begin(TSRMLS_D);
+void zend_do_do_while_end(znode *do_token, znode *expr_open_bracket, znode *expr TSRMLS_DC);
+
+
+void zend_do_if_cond(znode *cond, znode *closing_bracket_token TSRMLS_DC);
+void zend_do_if_after_statement(znode *closing_bracket_token, unsigned char initialize TSRMLS_DC);
+void zend_do_if_end(TSRMLS_D);
+
+void zend_do_for_cond(znode *expr, znode *second_semicolon_token TSRMLS_DC);
+void zend_do_for_before_statement(znode *cond_start, znode *second_semicolon_token TSRMLS_DC);
+void zend_do_for_end(znode *second_semicolon_token TSRMLS_DC);
+
+void zend_do_pre_incdec(znode *result, znode *op1, int op TSRMLS_DC);
+void zend_do_post_incdec(znode *result, znode *op1, int op TSRMLS_DC);
+
+void zend_do_begin_variable_parse(TSRMLS_D);
+void zend_do_end_variable_parse(int type, int arg_offset TSRMLS_DC);
+
+void zend_do_free(znode *op1 TSRMLS_DC);
+
+void zend_do_init_string(znode *result TSRMLS_DC);
+void zend_do_add_char(znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC);
+void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC);
+
+void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference TSRMLS_DC);
+void zend_do_end_function_declaration(znode *function_token TSRMLS_DC);
+void zend_do_receive_arg(int op, znode *var, znode *offset, znode *initialization, unsigned char pass_type TSRMLS_DC);
+int zend_do_begin_function_call(znode *function_name TSRMLS_DC);
+void zend_do_begin_dynamic_function_call(znode *function_name TSRMLS_DC);
+void zend_do_begin_class_member_function_call(znode *class_name, znode *function_name TSRMLS_DC);
+void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
+void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);
+ZEND_API int do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table, int compile_time);
+void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce);
+void zend_do_early_binding(TSRMLS_D);
+
+void zend_do_pass_param(znode *param, int op, int offset TSRMLS_DC);
+
+
+void zend_do_boolean_or_begin(znode *expr1, znode *op_token TSRMLS_DC);
+void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, znode *op_token TSRMLS_DC);
+void zend_do_boolean_and_begin(znode *expr1, znode *op_token TSRMLS_DC);               
+void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, znode *op_token TSRMLS_DC);
+
+void zend_do_brk_cont(int op, znode *expr TSRMLS_DC);
+
+void zend_do_switch_cond(znode *cond TSRMLS_DC);
+void zend_do_switch_end(znode *case_list TSRMLS_DC);
+void zend_do_case_before_statement(znode *case_list, znode *case_token, znode *case_expr TSRMLS_DC);
+void zend_do_case_after_statement(znode *result, znode *case_token TSRMLS_DC);
+void zend_do_default_before_statement(znode *case_list, znode *default_token TSRMLS_DC);
+
+void zend_do_begin_class_declaration(znode *class_name, znode *parent_class_name TSRMLS_DC);
+void zend_do_end_class_declaration(TSRMLS_D);
+void zend_do_declare_property(znode *var_name, znode *value TSRMLS_DC);
+
+void zend_do_fetch_property(znode *result, znode *object, znode *property TSRMLS_DC);
+
+
+void zend_do_push_object(znode *object TSRMLS_DC);
+void zend_do_pop_object(znode *object TSRMLS_DC);
+
+
+void zend_do_begin_new_object(znode *new_token, znode *class_name TSRMLS_DC);
+void zend_do_end_new_object(znode *result, znode *class_name, znode *new_token, znode *argument_list TSRMLS_DC);
+
+void zend_do_fetch_constant(znode *result, znode *constant_name, int mode TSRMLS_DC);
+
+void zend_do_shell_exec(znode *result, znode *cmd TSRMLS_DC);
+
+void zend_do_init_array(znode *result, znode *expr, znode *offset, int is_ref TSRMLS_DC);
+void zend_do_add_array_element(znode *result, znode *expr, znode *offset, int is_ref TSRMLS_DC);
+void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr);
+void zend_do_list_init(TSRMLS_D);
+void zend_do_list_end(znode *result, znode *expr TSRMLS_DC);
+void zend_do_add_list_element(znode *element TSRMLS_DC);
+void zend_do_new_list_begin(TSRMLS_D);
+void zend_do_new_list_end(TSRMLS_D);
+
+void zend_do_cast(znode *result, znode *expr, int type TSRMLS_DC);
+void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC);
+
+void zend_do_unset(znode *variable TSRMLS_DC);
+void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC);
+
+void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable TSRMLS_DC);
+void zend_do_foreach_cont(znode *value, znode *key, znode *as_token TSRMLS_DC);
+void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token TSRMLS_DC);
+
+void zend_do_declare_begin(TSRMLS_D);
+void zend_do_declare_stmt(znode *var, znode *val TSRMLS_DC);
+void zend_do_declare_end(TSRMLS_D);
+
+void zend_do_end_heredoc(TSRMLS_D);
+
+void zend_do_exit(znode *result, znode *message TSRMLS_DC);
+
+void zend_do_begin_silence(znode *strudel_token TSRMLS_DC);
+void zend_do_end_silence(znode *strudel_token TSRMLS_DC);
+
+void zend_do_begin_qm_op(znode *cond, znode *qm_token TSRMLS_DC);
+void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token TSRMLS_DC);
+void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, znode *colon_token TSRMLS_DC);
+
+void zend_do_extended_info(TSRMLS_D);
+void zend_do_extended_fcall_begin(TSRMLS_D);
+void zend_do_extended_fcall_end(TSRMLS_D);
+
+void zend_do_ticks(TSRMLS_D);
+
+ZEND_API void function_add_ref(zend_function *function);
+
+#define INITIAL_OP_ARRAY_SIZE 64
+
+
+/* helper functions in zend_language_scanner.l */
+ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSRMLS_DC);
+ZEND_API zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC);	
+ZEND_API zend_op_array *compile_filename(int type, zval *filename TSRMLS_DC);
+ZEND_API int zend_execute_scripts(int type TSRMLS_DC, int file_count, ...);
+ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API void init_op_array(zend_op_array *op_array, int type, int initial_ops_size TSRMLS_DC);
+ZEND_API void destroy_op_array(zend_op_array *op_array);
+ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC);
+ZEND_API void zend_file_handle_dtor(zend_file_handle *fh);
+
+ZEND_API void destroy_zend_function(zend_function *function);
+ZEND_API void destroy_zend_class(zend_class_entry *ce);
+void zend_class_add_ref(zend_class_entry *ce);
+
+#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function
+#define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class
+
+zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC);
+void init_op(zend_op *op TSRMLS_DC);
+int get_next_op_number(zend_op_array *op_array);
+int print_class(zend_class_entry *class_entry TSRMLS_DC);
+void print_op_array(zend_op_array *op_array, int optimizations);
+int pass_two(zend_op_array *op_array TSRMLS_DC);
+zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array);
+ZEND_API zend_bool zend_is_compiling(TSRMLS_D);
+ZEND_API char *zend_make_compiled_string_description(char *name TSRMLS_DC);
+
+int zendlex(znode *zendlval TSRMLS_DC);
+
+#define ZEND_NOP					0
+									
+#define ZEND_ADD					1
+#define ZEND_SUB					2
+#define ZEND_MUL					3
+#define ZEND_DIV					4
+#define ZEND_MOD					5
+#define ZEND_SL						6
+#define ZEND_SR						7
+#define ZEND_CONCAT					8
+#define ZEND_BW_OR					9
+#define ZEND_BW_AND					10
+#define ZEND_BW_XOR					11
+#define ZEND_BW_NOT					12
+#define ZEND_BOOL_NOT				13
+#define ZEND_BOOL_XOR				14
+#define ZEND_IS_IDENTICAL			15
+#define ZEND_IS_NOT_IDENTICAL       16
+#define ZEND_IS_EQUAL				17
+#define ZEND_IS_NOT_EQUAL			18
+#define ZEND_IS_SMALLER				19
+#define ZEND_IS_SMALLER_OR_EQUAL	20
+#define ZEND_CAST					21
+#define ZEND_QM_ASSIGN				22
+
+#define ZEND_ASSIGN_ADD				23
+#define ZEND_ASSIGN_SUB				24
+#define ZEND_ASSIGN_MUL				25
+#define ZEND_ASSIGN_DIV				26
+#define ZEND_ASSIGN_MOD				27
+#define ZEND_ASSIGN_SL				28
+#define ZEND_ASSIGN_SR				29
+#define ZEND_ASSIGN_CONCAT			30
+#define ZEND_ASSIGN_BW_OR			31
+#define ZEND_ASSIGN_BW_AND			32
+#define ZEND_ASSIGN_BW_XOR			33
+									
+#define ZEND_PRE_INC				34
+#define ZEND_PRE_DEC				35
+#define ZEND_POST_INC				36
+#define ZEND_POST_DEC				37
+								 	
+#define ZEND_ASSIGN					38
+#define ZEND_ASSIGN_REF				39
+
+#define ZEND_ECHO					40
+#define ZEND_PRINT					41
+
+#define ZEND_JMP					42
+#define ZEND_JMPZ					43
+#define ZEND_JMPNZ					44
+#define ZEND_JMPZNZ					45
+#define ZEND_JMPZ_EX				46
+#define ZEND_JMPNZ_EX				47
+#define ZEND_CASE					48
+#define ZEND_SWITCH_FREE			49
+#define ZEND_BRK					50
+#define ZEND_CONT					51
+#define ZEND_BOOL					52
+
+#define ZEND_INIT_STRING			53
+#define ZEND_ADD_CHAR				54
+#define ZEND_ADD_STRING				55
+#define ZEND_ADD_VAR				56
+
+#define ZEND_BEGIN_SILENCE			57
+#define ZEND_END_SILENCE			58
+
+#define ZEND_INIT_FCALL_BY_NAME		59
+#define ZEND_DO_FCALL				60
+#define ZEND_DO_FCALL_BY_NAME		61
+#define ZEND_RETURN					62
+
+#define ZEND_RECV					63
+#define ZEND_RECV_INIT				64
+									
+#define ZEND_SEND_VAL				65
+#define ZEND_SEND_VAR				66
+#define ZEND_SEND_REF				67
+
+#define ZEND_NEW 					68
+#define ZEND_JMP_NO_CTOR			69
+#define ZEND_FREE					70
+									
+#define ZEND_INIT_ARRAY				71
+#define ZEND_ADD_ARRAY_ELEMENT		72
+									
+#define ZEND_INCLUDE_OR_EVAL		73
+									
+#define ZEND_UNSET_VAR				74
+#define ZEND_UNSET_DIM_OBJ			75
+#define ZEND_ISSET_ISEMPTY			76
+									
+#define ZEND_FE_RESET				77
+#define ZEND_FE_FETCH				78
+									
+#define ZEND_EXIT					79
+
+
+/* the following 18 opcodes are 6 groups of 3 opcodes each, and must
+ * remain in that order!
+ */
+#define ZEND_FETCH_R				80
+#define ZEND_FETCH_DIM_R			81
+#define ZEND_FETCH_OBJ_R			82
+#define ZEND_FETCH_W				83
+#define ZEND_FETCH_DIM_W			84
+#define ZEND_FETCH_OBJ_W			85
+#define ZEND_FETCH_RW				86
+#define ZEND_FETCH_DIM_RW			87
+#define ZEND_FETCH_OBJ_RW			88
+#define ZEND_FETCH_IS				89
+#define ZEND_FETCH_DIM_IS			90
+#define ZEND_FETCH_OBJ_IS			91
+#define ZEND_FETCH_FUNC_ARG			92
+#define ZEND_FETCH_DIM_FUNC_ARG		93
+#define ZEND_FETCH_OBJ_FUNC_ARG		94
+#define ZEND_FETCH_UNSET			95
+#define ZEND_FETCH_DIM_UNSET		96
+#define ZEND_FETCH_OBJ_UNSET		97
+
+#define ZEND_FETCH_DIM_TMP_VAR		98
+#define ZEND_FETCH_CONSTANT			99
+
+#define ZEND_DECLARE_FUNCTION_OR_CLASS	100
+
+#define ZEND_EXT_STMT				101
+#define ZEND_EXT_FCALL_BEGIN		102
+#define ZEND_EXT_FCALL_END			103
+#define ZEND_EXT_NOP				104
+
+#define ZEND_TICKS					105
+
+#define ZEND_SEND_VAR_NO_REF		106
+
+/* end of block */
+
+
+
+
+/* global/local fetches */
+#define ZEND_FETCH_GLOBAL	0
+#define ZEND_FETCH_LOCAL	1
+#define ZEND_FETCH_STATIC	2
+
+/* var status for backpatching */
+#define BP_VAR_R			0
+#define BP_VAR_W			1
+#define BP_VAR_RW			2
+#define BP_VAR_IS			3
+#define BP_VAR_NA			4	/* if not applicable */
+#define BP_VAR_FUNC_ARG		5
+#define BP_VAR_UNSET		6
+
+
+#define ZEND_INTERNAL_FUNCTION		1
+#define ZEND_USER_FUNCTION			2
+#define ZEND_OVERLOADED_FUNCTION	3
+#define	ZEND_EVAL_CODE				4
+
+#define ZEND_INTERNAL_CLASS		1
+#define ZEND_USER_CLASS			2
+
+#define ZEND_EVAL				(1<<0)
+#define ZEND_INCLUDE			(1<<1)
+#define ZEND_INCLUDE_ONCE		(1<<2)
+#define ZEND_REQUIRE			(1<<3)
+#define ZEND_REQUIRE_ONCE		(1<<4)
+
+#define ZEND_ISSET				(1<<0)
+#define ZEND_ISEMPTY			(1<<1)
+
+#define ZEND_CT	(1<<0)
+#define ZEND_RT (1<<1)
+
+
+#define ZEND_HANDLE_FILENAME		0
+#define ZEND_HANDLE_FD				1
+#define ZEND_HANDLE_FP				2
+#define ZEND_HANDLE_STDIOSTREAM		3
+#define ZEND_HANDLE_FSTREAM			4
+
+#define ZEND_DECLARE_CLASS				1
+#define ZEND_DECLARE_FUNCTION			2
+#define ZEND_DECLARE_INHERITED_CLASS	3
+
+#define ZEND_FETCH_STANDARD		0
+#define ZEND_FETCH_ADD_LOCK		1
+
+#define ZEND_MEMBER_FUNC_CALL	1<<0
+#define ZEND_CTOR_CALL			1<<1
+
+#define ZEND_ARG_SEND_BY_REF (1<<0)
+#define ZEND_ARG_COMPILE_TIME_BOUND (1<<1)
+
+#define AI_USE_PTR(ai) \
+	if ((ai).ptr_ptr) { \
+		(ai).ptr = *((ai).ptr_ptr); \
+		(ai).ptr_ptr = &((ai).ptr); \
+	} else { \
+		(ai).ptr = NULL; \
+	}
+
+/* Lost In Stupid Parentheses */
+#define ARG_SHOULD_BE_SENT_BY_REF(offset, conduct_check, arg_types)	\
+	(																\
+		conduct_check												\
+		&& arg_types												\
+		&&															\
+		(															\
+			(														\
+				offset<=arg_types[0]								\
+				&& arg_types[offset]==BYREF_FORCE					\
+			)														\
+		||	(														\
+				offset>=arg_types[0]								\
+				&& arg_types[arg_types[0]]==BYREF_FORCE_REST		\
+			)														\
+		)															\
+	)
+
+#define ZEND_RETURN_VAL 0
+#define ZEND_RETURN_REF 1
+
+END_EXTERN_C()
+
+#endif /* ZEND_COMPILE_H */

Zend/zend_config.w32.h

@@ -0,0 +1,86 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_CONFIG_W32_H
+#define ZEND_CONFIG_W32_H
+
+
+#include <string.h>
+#include <windows.h>
+#include <float.h>
+
+typedef unsigned long ulong;
+typedef unsigned int uint;
+
+#define HAVE_ALLOCA 1
+#define HAVE_LIMITS_H 1
+#include <malloc.h>
+
+#undef HAVE_KILL
+#define HAVE_GETPID 1
+/* #define HAVE_ALLOCA_H 1 */
+#define HAVE_MEMCPY 1
+#define HAVE_STRDUP 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIOSTR_H 1
+#define HAVE_CLASS_ISTDIOSTREAM
+#define istdiostream stdiostream
+#define HAVE_STDARG_H	1
+#define HAVE_SNPRINTF	1
+#define HAVE_VSNPRINTF	1
+
+#define vsnprintf _vsnprintf
+#define zend_isinf(a)	0
+
+#define zend_sprintf sprintf
+
+/* This will cause the compilation process to be MUCH longer, but will generate
+ * a much quicker PHP binary
+ */
+#undef inline
+#ifdef ZEND_WIN32_FORCE_INLINE
+# define inline __forceinline
+#else
+# define inline
+#endif
+
+#define zend_finite(A) _finite(A)
+#define zend_isnan(A) _isnan(A)
+
+#ifdef LIBZEND_EXPORTS
+#	define ZEND_API __declspec(dllexport)
+#else
+#	define ZEND_API __declspec(dllimport)
+#endif
+
+#define ZEND_DLEXPORT		__declspec(dllexport)
+
+/* 0x00200000L is MB_SERVICE_NOTIFICATION, which is only supported under Windows NT 
+ * (and requires _WIN32_WINNT to be defined, which prevents the resulting executable
+ * from running under Windows 9x
+ * Windows 9x should silently ignore it, so it's being used here directly
+ */
+#ifndef MB_SERVICE_NOTIFICATION
+#define	MB_SERVICE_NOTIFICATION		0x00200000L
+#endif
+
+#define ZEND_SERVICE_MB_STYLE		(MB_TOPMOST|MB_SERVICE_NOTIFICATION)
+
+#endif /* ZEND_CONFIG_W32_H */

Zend/zend_constants.c

@@ -0,0 +1,263 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend.h"
+#include "zend_constants.h"
+#include "zend_variables.h"
+#include "zend_operators.h"
+#include "zend_globals.h"
+
+
+void free_zend_constant(zend_constant *c)
+{
+	if (!(c->flags & CONST_PERSISTENT)) {
+		zval_dtor(&c->value);
+	}
+	free(c->name);
+}
+
+
+void copy_zend_constant(zend_constant *c)
+{
+	c->name = zend_strndup(c->name, c->name_len);
+	if (!(c->flags & CONST_PERSISTENT)) {
+		zval_copy_ctor(&c->value);
+	}
+}
+
+
+void zend_copy_constants(HashTable *target, HashTable *source)
+{
+	zend_constant tmp_constant;
+
+	zend_hash_copy(target, source, (copy_ctor_func_t) copy_zend_constant, &tmp_constant, sizeof(zend_constant));
+}
+
+
+static int clean_non_persistent_constant(zend_constant *c TSRMLS_DC)
+{
+	if (c->flags & CONST_PERSISTENT) {
+		return ZEND_HASH_APPLY_STOP;
+	} else {
+		return ZEND_HASH_APPLY_REMOVE;
+	}
+}
+
+
+static int clean_module_constant(zend_constant *c, int *module_number TSRMLS_DC)
+{
+	if (c->module_number == *module_number) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+void clean_module_constants(int module_number TSRMLS_DC)
+{
+	zend_hash_apply_with_argument(EG(zend_constants), (apply_func_arg_t) clean_module_constant, (void *) &module_number TSRMLS_CC);
+}
+
+
+int zend_startup_constants(TSRMLS_D)
+{
+#ifdef ZEND_WIN32
+	DWORD dwBuild=0;
+	DWORD dwVersion = GetVersion();
+	DWORD dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
+	DWORD dwWindowsMinorVersion =  (DWORD)(HIBYTE(LOWORD(dwVersion)));
+#endif
+
+	EG(zend_constants) = (HashTable *) malloc(sizeof(HashTable));
+
+	if (zend_hash_init(EG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1)==FAILURE) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+
+
+void zend_register_standard_constants(TSRMLS_D)
+{
+	REGISTER_MAIN_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_WARNING", E_COMPILE_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_USER_ERROR", E_USER_ERROR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_USER_WARNING", E_USER_WARNING, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
+
+	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
+
+	/* true/false constants */
+	{
+		zend_constant c;
+	
+		c.value.type = IS_BOOL;
+		c.flags = CONST_PERSISTENT;
+		c.module_number = 0;
+
+		c.name = zend_strndup(ZEND_STRL("TRUE"));
+		c.name_len = sizeof("TRUE");
+		c.value.value.lval = 1;
+		c.value.type = IS_BOOL;
+		zend_register_constant(&c TSRMLS_CC);
+		
+		c.name = zend_strndup(ZEND_STRL("FALSE"));
+		c.name_len = sizeof("FALSE");
+		c.value.value.lval = 0;
+		c.value.type = IS_BOOL;
+		zend_register_constant(&c TSRMLS_CC);
+
+		c.name = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE"));
+		c.name_len = sizeof("ZEND_THREAD_SAFE");
+		c.value.value.lval = ZTS_V;
+		c.value.type = IS_BOOL;
+		zend_register_constant(&c TSRMLS_CC);
+
+		c.name = zend_strndup(ZEND_STRL("NULL"));
+		c.name_len = sizeof("NULL");
+		c.value.type = IS_NULL;
+		zend_register_constant(&c TSRMLS_CC);
+	}
+}
+
+
+int zend_shutdown_constants(TSRMLS_D)
+{
+	zend_hash_destroy(EG(zend_constants));
+	free(EG(zend_constants));
+	return SUCCESS;
+}
+
+
+void clean_non_persistent_constants(TSRMLS_D)
+{
+	zend_hash_reverse_apply(EG(zend_constants), (apply_func_t) clean_non_persistent_constant TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number TSRMLS_DC)
+{
+	zend_constant c;
+	
+	c.value.type = IS_LONG;
+	c.value.value.lval = lval;
+	c.flags = flags;
+	c.name = zend_strndup(name,name_len);
+	c.name_len = name_len;
+	c.module_number = module_number;
+	zend_register_constant(&c TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number TSRMLS_DC)
+{
+	zend_constant c;
+	
+	c.value.type = IS_DOUBLE;
+	c.value.value.dval = dval;
+	c.flags = flags;
+	c.name = zend_strndup(name,name_len);
+	c.name_len = name_len;
+	c.module_number = module_number;
+	zend_register_constant(&c TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number TSRMLS_DC)
+{
+	zend_constant c;
+	
+	c.value.type = IS_STRING;
+	c.value.value.str.val = strval;
+	c.value.value.str.len = strlen;
+	c.flags = flags;
+	c.name = zend_strndup(name,name_len);
+	c.name_len = name_len;
+	c.module_number = module_number;
+	zend_register_constant(&c TSRMLS_CC);
+}
+
+
+ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number TSRMLS_DC)
+{
+	zend_register_stringl_constant(name, name_len, strval, strlen(strval), flags, module_number TSRMLS_CC);
+}
+
+
+ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC)
+{
+	zend_constant *c;
+	char *lookup_name = estrndup(name,name_len);
+	int retval;
+
+	zend_str_tolower(lookup_name, name_len);
+
+	if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
+		if ((c->flags & CONST_CS) && memcmp(c->name, name, name_len)!=0) {
+			retval=0;
+		} else {
+			retval=1;
+			*result = c->value;
+			zval_copy_ctor(result);
+		}
+	} else {
+		retval=0;
+	}
+	
+	efree(lookup_name);
+	return retval;
+}
+
+
+ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
+{
+	char *lowercase_name = zend_strndup(c->name, c->name_len);
+	int ret = SUCCESS;
+
+#if 0
+	printf("Registering constant for module %d\n",c->module_number);
+#endif
+
+	zend_str_tolower(lowercase_name, c->name_len);
+	if (zend_hash_add(EG(zend_constants), lowercase_name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
+		free(c->name);
+		zval_dtor(&c->value);
+		zend_error(E_NOTICE,"Constant %s already defined",lowercase_name);
+		ret = FAILURE;
+	}
+	free(lowercase_name);
+	return ret;
+}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_constants.h

@@ -0,0 +1,64 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_CONSTANTS_H
+#define ZEND_CONSTANTS_H
+
+#include "zend_globals.h"
+
+#define CONST_CS 0x1				/* Case Sensitive */
+#define CONST_PERSISTENT 0x2
+
+typedef struct _zend_constant {
+	zval value;
+	int flags;
+	char *name;
+	uint name_len;
+	int module_number;
+} zend_constant;
+
+#define REGISTER_LONG_CONSTANT(name,lval,flags)  zend_register_long_constant((name),sizeof(name),(lval),(flags),module_number TSRMLS_CC)
+#define REGISTER_DOUBLE_CONSTANT(name,dval,flags)  zend_register_double_constant((name),sizeof(name),(dval),(flags),module_number TSRMLS_CC)
+#define REGISTER_STRING_CONSTANT(name,str,flags)  zend_register_string_constant((name),sizeof(name),(str),(flags),module_number TSRMLS_CC)
+#define REGISTER_STRINGL_CONSTANT(name,str,len,flags)  zend_register_stringl_constant((name),sizeof(name),(str),(len),(flags),module_number TSRMLS_CC)
+
+#define REGISTER_MAIN_LONG_CONSTANT(name,lval,flags)  zend_register_long_constant((name),sizeof(name),(lval),(flags),0 TSRMLS_CC)
+#define REGISTER_MAIN_DOUBLE_CONSTANT(name,dval,flags)  zend_register_double_constant((name),sizeof(name),(dval),(flags),0 TSRMLS_CC)
+#define REGISTER_MAIN_STRING_CONSTANT(name,str,flags)  zend_register_string_constant((name),sizeof(name),(str),(flags),0 TSRMLS_CC)
+#define REGISTER_MAIN_STRINGL_CONSTANT(name,str,len,flags)  zend_register_stringl_constant((name),sizeof(name),(str),(len),(flags),0 TSRMLS_CC)
+
+void clean_module_constants(int module_number TSRMLS_DC);
+void free_zend_constant(zend_constant *c);
+int zend_startup_constants(TSRMLS_D);
+int zend_shutdown_constants(TSRMLS_D);
+void zend_register_standard_constants(TSRMLS_D);
+void clean_non_persistent_constants(TSRMLS_D);
+ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC);
+ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number TSRMLS_DC);
+ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number TSRMLS_DC);
+ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number TSRMLS_DC);
+ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number TSRMLS_DC);
+ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC);
+void zend_copy_constants(HashTable *target, HashTable *sourc);
+void copy_zend_constant(zend_constant *c);
+
+#define ZEND_CONSTANT_DTOR (void (*)(void *)) free_zend_constant
+
+#endif

Zend/zend_dynamic_array.c

@@ -0,0 +1,62 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#include "zend.h"
+
+typedef struct _dynamic_array {
+        char *array;
+        unsigned int element_size;
+        unsigned int current;
+        unsigned int allocated;
+} dynamic_array;
+
+ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size)
+{
+	da->element_size = element_size;
+	da->allocated = size;
+	da->current = 0;
+	da->array = (char *) emalloc(size*element_size);
+	if (da->array == NULL) {
+		return 1;
+	}
+	return 0;
+}
+
+ZEND_API void *zend_dynamic_array_push(dynamic_array *da)
+{
+	if (da->current == da->allocated) {
+		da->allocated *= 2;
+		da->array = (char *) erealloc(da->array, da->allocated*da->element_size);
+	}
+	return (void *)(da->array+(da->current++)*da->element_size);
+}
+
+ZEND_API void *zend_dynamic_array_pop(dynamic_array *da)
+{
+	return (void *)(da->array+(--(da->current))*da->element_size);
+
+}
+
+ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index)
+{
+	if (index >= da->current) {
+		return NULL;
+	}
+	return (void *)(da->array+index*da->element_size);
+}

Zend/zend_dynamic_array.h

@@ -0,0 +1,38 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_DYNAMIC_ARRAY_H
+#define ZEND_DYNAMIC_ARRAY_H
+
+typedef struct _dynamic_array {
+	char *array;
+	unsigned int element_size;
+	unsigned int last_used;
+	unsigned int allocated;
+} dynamic_array;
+
+BEGIN_EXTERN_C()
+ZEND_API int zend_dynamic_array_init(dynamic_array *da);
+ZEND_API void *zend_dynamic_array_push(dynamic_array *da);
+ZEND_API void *zend_dynamic_array_pop(dynamic_array *da);
+ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index);
+END_EXTERN_C()
+
+#endif /* ZEND_DYNAMIC_ARRAY_H */

Zend/zend_errors.h

@@ -0,0 +1,40 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_ERRORS_H
+#define ZEND_ERRORS_H
+
+#define E_ERROR				(1<<0L)
+#define E_WARNING			(1<<1L)
+#define E_PARSE				(1<<2L)
+#define E_NOTICE			(1<<3L)
+#define E_CORE_ERROR		(1<<4L)
+#define E_CORE_WARNING		(1<<5L)
+#define E_COMPILE_ERROR		(1<<6L)
+#define E_COMPILE_WARNING	(1<<7L)
+#define E_USER_ERROR		(1<<8L)
+#define E_USER_WARNING		(1<<9L)
+#define E_USER_NOTICE		(1<<10L)
+
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE)
+#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
+
+#endif /* ZEND_ERRORS_H */
+

Zend/zend_execute.h

@@ -0,0 +1,161 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_EXECUTE_H
+#define ZEND_EXECUTE_H
+
+#include "zend_compile.h"
+#include "zend_hash.h"
+#include "zend_variables.h"
+#include "zend_operators.h"
+
+typedef union _temp_variable {
+	zval tmp_var;
+	struct {
+		zval **ptr_ptr;
+		zval *ptr;
+	} var;
+	struct {
+		zval tmp_var; /* a dummy */
+
+		union {
+			struct {
+				zval *str;
+				int offset;
+			} str_offset;
+			zend_property_reference overloaded_element;
+		} data;
+			
+		unsigned char type;
+	} EA;
+} temp_variable;
+
+
+ZEND_API extern void (*zend_execute)(zend_op_array *op_array TSRMLS_DC);
+
+void init_executor(TSRMLS_D);
+void shutdown_executor(TSRMLS_D);
+ZEND_API void execute(zend_op_array *op_array TSRMLS_DC);
+ZEND_API int zend_is_true(zval *op);
+static inline void safe_free_zval_ptr(zval *p)
+{
+	TSRMLS_FETCH();
+
+	if (p!=EG(uninitialized_zval_ptr)) {
+		FREE_ZVAL(p);
+	}
+}
+
+ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
+static inline int i_zend_is_true(zval *op)
+{
+	int result;
+
+	switch (op->type) {
+		case IS_NULL:
+			result = 0;
+			break;
+		case IS_LONG:
+		case IS_BOOL:
+		case IS_RESOURCE:
+			result = (op->value.lval?1:0);
+			break;
+		case IS_DOUBLE:
+			result = (op->value.dval ? 1 : 0);
+			break;
+		case IS_STRING:
+			if (op->value.str.len == 0
+				|| (op->value.str.len==1 && op->value.str.val[0]=='0')) {
+				result = 0;
+			} else {
+				result = 1;
+			}
+			break;
+		case IS_ARRAY:
+			result = (zend_hash_num_elements(op->value.ht)?1:0);
+			break;
+		case IS_OBJECT:
+			result = (zend_hash_num_elements(Z_OBJPROP_P(op))?1:0);
+			break;
+		default:
+			result = 0;
+			break;
+	}
+	return result;
+}
+
+ZEND_API int zval_update_constant(zval **pp, void *arg TSRMLS_DC);
+
+/* dedicated Zend executor functions - do not use! */
+static inline void zend_ptr_stack_clear_multiple(TSRMLS_D)
+{
+	void **p = EG(argument_stack).top_element-2;
+	int delete_count = (ulong) *p;
+
+	EG(argument_stack).top -= (delete_count+2);
+	while (--delete_count>=0) {
+		zval_ptr_dtor((zval **) --p);
+	}
+	EG(argument_stack).top_element = p;
+}
+
+static inline int zend_ptr_stack_get_arg(int requested_arg, void **data TSRMLS_DC)
+{
+	void **p = EG(argument_stack).top_element-2;
+	int arg_count = (ulong) *p;
+
+	if (requested_arg>arg_count) {
+		return FAILURE;
+	}
+	*data = (p-arg_count+requested_arg-1);
+	return SUCCESS;
+}
+
+void execute_new_code(TSRMLS_D);
+
+
+/* services */
+ZEND_API char *get_active_function_name(TSRMLS_D);
+ZEND_API char *zend_get_executed_filename(TSRMLS_D);
+ZEND_API uint zend_get_executed_lineno(TSRMLS_D);
+ZEND_API zend_bool zend_is_executing(TSRMLS_D);
+
+ZEND_API void zend_set_timeout(long seconds);
+ZEND_API void zend_unset_timeout(TSRMLS_D);
+ZEND_API void zend_timeout(int dummy);
+
+#ifdef ZEND_WIN32
+void zend_init_timeout_thread();
+void zend_shutdown_timeout_thread();
+#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
+#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
+#endif
+
+#define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
+#define zendi_zval_dtor(p) zval_dtor(&(p))
+
+#define active_opline (*EG(opline_ptr))
+
+void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts TSRMLS_DC);
+
+#define IS_OVERLOADED_OBJECT 1
+#define IS_STRING_OFFSET 2
+
+#endif /* ZEND_EXECUTE_H */

Zend/zend_execute_API.c

@@ -0,0 +1,803 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include <stdio.h>
+#include <signal.h>
+
+#include "zend.h"
+#include "zend_compile.h"
+#include "zend_execute.h"
+#include "zend_API.h"
+#include "zend_ptr_stack.h"
+#include "zend_constants.h"
+#include "zend_extensions.h"
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+
+ZEND_API void (*zend_execute)(zend_op_array *op_array TSRMLS_DC);
+
+#ifdef ZEND_WIN32
+#include <process.h>
+/* true global */
+static WNDCLASS wc;
+static HWND timeout_window;
+static HANDLE timeout_thread_event;
+static DWORD timeout_thread_id;
+static int timeout_thread_initialized=0;
+#endif
+
+
+#if ZEND_DEBUG
+static void (*original_sigsegv_handler)(int);
+static void zend_handle_sigsegv(int dummy)
+{
+	fflush(stdout);
+	fflush(stderr);
+	if (original_sigsegv_handler==zend_handle_sigsegv) {
+		signal(SIGSEGV, original_sigsegv_handler);
+	} else {
+		signal(SIGSEGV, SIG_DFL);
+	}
+	{
+		TSRMLS_FETCH();
+
+		fprintf(stderr, "SIGSEGV caught on opcode %d on opline %d of %s() at %s:%d\n\n",
+				active_opline->opcode,
+				active_opline-EG(active_op_array)->opcodes,
+				get_active_function_name(TSRMLS_C),
+				zend_get_executed_filename(TSRMLS_C),
+				zend_get_executed_lineno(TSRMLS_C));
+	}
+	if (original_sigsegv_handler!=zend_handle_sigsegv) {
+		original_sigsegv_handler(dummy);
+	}
+}
+#endif
+
+
+static void zend_extension_activator(zend_extension *extension TSRMLS_DC)
+{
+	if (extension->activate) {
+		extension->activate();
+	}
+}
+
+
+static void zend_extension_deactivator(zend_extension *extension TSRMLS_DC)
+{
+	if (extension->deactivate) {
+		extension->deactivate();
+	}
+}
+
+
+static int is_not_internal_function(zend_function *function TSRMLS_DC)
+{
+	if (function->type == ZEND_INTERNAL_FUNCTION) {
+		return ZEND_HASH_APPLY_STOP;
+	} else {
+		return ZEND_HASH_APPLY_REMOVE;
+	}
+}
+
+
+static int is_not_internal_class(zend_class_entry *ce TSRMLS_DC)
+{
+	if (ce->type == ZEND_INTERNAL_CLASS) {
+		return ZEND_HASH_APPLY_STOP;
+	} else {
+		return ZEND_HASH_APPLY_REMOVE;
+	}
+}
+
+
+void init_executor(TSRMLS_D)
+{
+	INIT_ZVAL(EG(uninitialized_zval));
+	INIT_ZVAL(EG(error_zval));
+	EG(uninitialized_zval_ptr)=&EG(uninitialized_zval);
+	EG(error_zval_ptr)=&EG(error_zval);
+	zend_ptr_stack_init(&EG(arg_types_stack));
+/* destroys stack frame, therefore makes core dumps worthless */
+#if 0&&ZEND_DEBUG
+	original_sigsegv_handler = signal(SIGSEGV, zend_handle_sigsegv);
+#endif
+	EG(return_value_ptr_ptr) = &EG(global_return_value_ptr);
+	EG(global_return_value_ptr) = NULL;
+
+	EG(symtable_cache_ptr) = EG(symtable_cache)-1;
+	EG(symtable_cache_limit)=EG(symtable_cache)+SYMTABLE_CACHE_SIZE-1;
+	EG(no_extensions)=0;
+
+	EG(function_table) = CG(function_table);
+	EG(class_table) = CG(class_table);
+
+	EG(in_execution) = 0;
+
+	zend_ptr_stack_init(&EG(argument_stack));
+
+	zend_hash_init(&EG(symbol_table), 50, NULL, ZVAL_PTR_DTOR, 0);
+	EG(active_symbol_table) = &EG(symbol_table);
+
+	zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_activator TSRMLS_CC);
+	EG(opline_ptr) = NULL;
+	EG(garbage_ptr) = 0;
+
+	zend_hash_init(&EG(included_files), 5, NULL, NULL, 0);
+
+	EG(ticks_count) = 0;
+
+	EG(user_error_handler) = NULL;
+
+	zend_ptr_stack_init(&EG(user_error_handlers));
+
+	EG(orig_error_reporting) = EG(error_reporting);
+
+#ifdef ZEND_WIN32
+	EG(timed_out) = 0;
+#endif
+}
+
+
+void shutdown_executor(TSRMLS_D)
+{
+	zend_try {
+		zend_ptr_stack_destroy(&EG(arg_types_stack));
+				
+		while (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
+			zend_hash_destroy(*EG(symtable_cache_ptr));
+			efree(*EG(symtable_cache_ptr));
+			EG(symtable_cache_ptr)--;
+		}
+		zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_deactivator TSRMLS_CC);
+
+		zend_hash_destroy(&EG(symbol_table));
+
+		while (EG(garbage_ptr)--) {
+			if (EG(garbage)[EG(garbage_ptr)]->refcount==1) {
+				zval_ptr_dtor(&EG(garbage)[EG(garbage_ptr)]);
+			}
+		}
+
+		zend_ptr_stack_destroy(&EG(argument_stack));
+
+		/* Destroy all op arrays */
+		zend_hash_reverse_apply(EG(function_table), (apply_func_t) is_not_internal_function TSRMLS_CC);
+		zend_hash_reverse_apply(EG(class_table), (apply_func_t) is_not_internal_class TSRMLS_CC);
+	} zend_end_try();
+
+	/* The regular list must be destroyed after the main symbol table and
+	 * op arrays are destroyed.
+	 */
+	zend_destroy_rsrc_list(&EG(regular_list) TSRMLS_CC);
+
+	zend_try {
+		clean_non_persistent_constants(TSRMLS_C);
+#if ZEND_DEBUG
+	signal(SIGSEGV, original_sigsegv_handler);
+#endif
+
+		zend_hash_destroy(&EG(included_files));
+
+		if (EG(user_error_handler)) {
+			zval_dtor(EG(user_error_handler));
+			FREE_ZVAL(EG(user_error_handler));
+		}
+
+		zend_ptr_stack_clean(&EG(user_error_handlers), ZVAL_DESTRUCTOR, 1);
+		zend_ptr_stack_destroy(&EG(user_error_handlers));
+
+		EG(error_reporting) = EG(orig_error_reporting);
+	} zend_end_try();
+}
+
+
+ZEND_API char *get_active_function_name(TSRMLS_D)
+{
+	switch(EG(function_state_ptr)->function->type) {
+		case ZEND_USER_FUNCTION: {
+				char *function_name = ((zend_op_array *) EG(function_state_ptr)->function)->function_name;
+			
+				if (function_name) {
+					return function_name;
+				} else {
+					return "main";
+				}
+			}
+			break;
+		case ZEND_INTERNAL_FUNCTION:
+			return ((zend_internal_function *) EG(function_state_ptr)->function)->function_name;
+			break;
+		default:
+			return NULL;
+	}
+}
+
+
+ZEND_API char *zend_get_executed_filename(TSRMLS_D)
+{
+	if (EG(active_op_array)) {
+		return EG(active_op_array)->filename;
+	} else {
+		return "[no active file]";
+	}
+}
+
+
+ZEND_API uint zend_get_executed_lineno(TSRMLS_D)
+{
+	if (EG(opline_ptr)) {
+		return active_opline->lineno;
+	} else {
+		return 0;
+	}
+}
+
+
+ZEND_API zend_bool zend_is_executing(TSRMLS_D)
+{
+	return EG(in_execution);
+}
+
+
+ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC)
+{
+#if DEBUG_ZEND>=2
+	printf("Reducing refcount for %x (%x):  %d->%d\n", *zval_ptr, zval_ptr, (*zval_ptr)->refcount, (*zval_ptr)->refcount-1);
+#endif
+	(*zval_ptr)->refcount--;
+	if ((*zval_ptr)->refcount==0) {
+		zval_dtor(*zval_ptr);
+		safe_free_zval_ptr(*zval_ptr);
+	} else if (((*zval_ptr)->refcount == 1) && ((*zval_ptr)->type != IS_OBJECT)) {
+		(*zval_ptr)->is_ref = 0;
+	}
+}
+	
+
+ZEND_API int zend_is_true(zval *op)
+{
+	return i_zend_is_true(op);
+}
+
+
+ZEND_API int zval_update_constant(zval **pp, void *arg TSRMLS_DC)
+{
+	zval *p = *pp;
+	zend_bool inline_change = (zend_bool) (unsigned long) arg;
+	zval const_value;
+
+	if (p->type == IS_CONSTANT) {
+		int refcount;
+
+		SEPARATE_ZVAL(pp);
+		p = *pp;
+
+		refcount = p->refcount;
+
+		if (!zend_get_constant(p->value.str.val, p->value.str.len, &const_value TSRMLS_CC)) {
+			zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
+						p->value.str.val,
+						p->value.str.val);
+			p->type = IS_STRING;
+			if (!inline_change) {
+				zval_copy_ctor(p);
+			}
+		} else {
+			if (inline_change) {
+				STR_FREE(p->value.str.val);
+			}
+			*p = const_value;
+		}
+		INIT_PZVAL(p);
+		p->refcount = refcount;
+	} else if (p->type == IS_CONSTANT_ARRAY) {
+		zval **element;
+		char *str_index;
+		ulong str_index_len, num_index;
+
+		SEPARATE_ZVAL(pp);
+		p = *pp;
+		p->type = IS_ARRAY;
+		
+		/* First go over the array and see if there are any constant indices */
+		zend_hash_internal_pointer_reset(p->value.ht);
+		while (zend_hash_get_current_data(p->value.ht, (void **) &element)==SUCCESS) {
+			if (!(Z_TYPE_PP(element) & IS_CONSTANT_INDEX)) {
+				zend_hash_move_forward(p->value.ht);
+				continue;
+			}
+			Z_TYPE_PP(element) &= ~IS_CONSTANT_INDEX;
+			if (zend_hash_get_current_key_ex(p->value.ht, &str_index, &str_index_len, &num_index, 0, NULL)!=HASH_KEY_IS_STRING) {
+				zend_hash_move_forward(p->value.ht);
+				continue;
+			}
+			if (!zend_get_constant(str_index, str_index_len-1, &const_value TSRMLS_CC)) {
+				zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",	str_index, str_index);
+				zend_hash_move_forward(p->value.ht);
+				continue;
+			}
+			switch (const_value.type) {
+				case IS_STRING:
+					zend_hash_update(p->value.ht, const_value.value.str.val, const_value.value.str.len+1, element, sizeof(zval *), NULL);
+					(*element)->refcount++;
+					break;
+				case IS_LONG:
+					zend_hash_index_update(p->value.ht, const_value.value.lval, element, sizeof(zval *), NULL);
+					(*element)->refcount++;
+					break;
+			}
+			zend_hash_del(p->value.ht, str_index, str_index_len);
+		}
+		zend_hash_apply_with_argument(p->value.ht, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
+	}
+	return 0;
+}
+
+
+int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, int param_count, zval *params[] TSRMLS_DC)
+{
+	zval ***params_array = (zval ***) emalloc(sizeof(zval **)*param_count);
+	int i;
+	int ex_retval;
+	zval *local_retval_ptr;
+
+	for (i=0; i<param_count; i++) {
+		params_array[i] = &params[i];
+	}
+	ex_retval = call_user_function_ex(function_table, object_pp, function_name, &local_retval_ptr, param_count, params_array, 1, NULL TSRMLS_CC);
+	if (local_retval_ptr) {
+		COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
+	} else {
+		INIT_ZVAL(*retval_ptr);
+	}
+	efree(params_array);
+	return ex_retval;
+}
+
+
+int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC)
+{
+	int i;
+	zval **original_return_value;
+	HashTable *calling_symbol_table;
+	zend_function_state function_state;
+	zend_function_state *original_function_state_ptr;
+	zend_op_array *original_op_array;
+	zend_op **original_opline_ptr;
+	int orig_free_op1, orig_free_op2;
+	int (*orig_unary_op)(zval *result, zval *op1);
+	int (*orig_binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+	zval function_name_copy;
+
+	*retval_ptr_ptr = NULL;
+
+	if (function_name->type==IS_ARRAY) { /* assume array($obj, $name) couple */
+		zval **tmp_object_ptr, **tmp_real_function_name;
+
+		if (zend_hash_index_find(function_name->value.ht, 0, (void **) &tmp_object_ptr)==FAILURE) {
+			return FAILURE;
+		}
+		if (zend_hash_index_find(function_name->value.ht, 1, (void **) &tmp_real_function_name)==FAILURE) {
+			return FAILURE;
+		}
+		function_name = *tmp_real_function_name;
+		SEPARATE_ZVAL_IF_NOT_REF(tmp_object_ptr);
+		object_pp = tmp_object_ptr;
+		(*object_pp)->is_ref = 1;
+	}
+
+	if (object_pp && !*object_pp) {
+		object_pp = NULL;
+	}
+	if (object_pp) {
+		if (Z_TYPE_PP(object_pp) == IS_OBJECT) {
+			function_table = &(*object_pp)->value.obj.ce->function_table;
+		} else if (Z_TYPE_PP(object_pp) == IS_STRING) {
+			zend_class_entry *ce;
+			char *lc_class;
+			int found;
+
+			lc_class = estrndup(Z_STRVAL_PP(object_pp), Z_STRLEN_PP(object_pp));
+			zend_str_tolower(lc_class, Z_STRLEN_PP(object_pp));
+			found = zend_hash_find(EG(class_table), lc_class, Z_STRLEN_PP(object_pp) + 1, (void **) &ce);
+			efree(lc_class);
+			if (found == FAILURE)
+				return FAILURE;
+
+			function_table = &ce->function_table;
+			object_pp = NULL;
+		} else
+			return FAILURE;
+	}
+
+	if (function_name->type!=IS_STRING) {
+		return FAILURE;
+	}
+
+	function_name_copy = *function_name;
+	zval_copy_ctor(&function_name_copy);
+	zend_str_tolower(function_name_copy.value.str.val, function_name_copy.value.str.len);
+
+	original_function_state_ptr = EG(function_state_ptr);
+	if (zend_hash_find(function_table, function_name_copy.value.str.val, function_name_copy.value.str.len+1, (void **) &function_state.function)==FAILURE) {
+		zval_dtor(&function_name_copy);
+		return FAILURE;
+	}
+	zval_dtor(&function_name_copy);
+
+	for (i=0; i<param_count; i++) {
+		zval *param;
+
+		if (function_state.function->common.arg_types
+			&& i<function_state.function->common.arg_types[0]
+			&& function_state.function->common.arg_types[i+1]==BYREF_FORCE
+			&& !PZVAL_IS_REF(*params[i])) {
+			if ((*params[i])->refcount>1) {
+				zval *new_zval;
+
+				if (no_separation) {
+					return FAILURE;
+				}
+				ALLOC_ZVAL(new_zval);
+				*new_zval = **params[i];
+				zval_copy_ctor(new_zval);
+				new_zval->refcount = 1;
+				(*params[i])->refcount--;
+				*params[i] = new_zval;
+			}
+			(*params[i])->refcount++;
+			(*params[i])->is_ref = 1;
+			param = *params[i];
+		} else if (*params[i] != &EG(uninitialized_zval)) {
+			(*params[i])->refcount++;
+			param = *params[i];
+		} else {
+			ALLOC_ZVAL(param);
+			*param = **(params[i]);
+			INIT_PZVAL(param);
+		}
+		zend_ptr_stack_push(&EG(argument_stack), param);
+	}
+
+	zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) (long) param_count, NULL);
+
+	EG(function_state_ptr) = &function_state;
+
+	if (function_state.function->type == ZEND_USER_FUNCTION) {
+		calling_symbol_table = EG(active_symbol_table);
+		if (symbol_table) {
+			EG(active_symbol_table) = symbol_table;
+		} else {
+			ALLOC_HASHTABLE(EG(active_symbol_table));
+			zend_hash_init(EG(active_symbol_table), 0, NULL, ZVAL_PTR_DTOR, 0);
+		}
+		if (object_pp) {
+			zval *dummy, **this_ptr;
+				
+			ALLOC_ZVAL(dummy);
+			INIT_ZVAL(*dummy);	
+			zend_hash_update(EG(active_symbol_table), "this", sizeof("this"), &dummy, sizeof(zval *), (void **) &this_ptr);
+			zend_assign_to_variable_reference(NULL, this_ptr, object_pp, NULL TSRMLS_CC);
+		}
+		original_return_value = EG(return_value_ptr_ptr);
+		original_op_array = EG(active_op_array);
+		EG(return_value_ptr_ptr) = retval_ptr_ptr;
+		EG(active_op_array) = (zend_op_array *) function_state.function;
+		original_opline_ptr = EG(opline_ptr);
+		orig_free_op1 = EG(free_op1);
+		orig_free_op2 = EG(free_op2);
+		orig_unary_op = EG(unary_op);
+		orig_binary_op = EG(binary_op);
+		zend_execute(EG(active_op_array) TSRMLS_CC);
+		if (!symbol_table) {
+			zend_hash_destroy(EG(active_symbol_table));
+			FREE_HASHTABLE(EG(active_symbol_table));
+		}
+		EG(active_symbol_table) = calling_symbol_table;
+		EG(active_op_array) = original_op_array;
+		EG(return_value_ptr_ptr)=original_return_value;
+		EG(opline_ptr) = original_opline_ptr;
+		EG(free_op1) = orig_free_op1;
+		EG(free_op2) = orig_free_op2;
+		EG(unary_op) = orig_unary_op;
+		EG(binary_op) = orig_binary_op;
+	} else {
+		ALLOC_INIT_ZVAL(*retval_ptr_ptr);
+		((zend_internal_function *) function_state.function)->handler(param_count, *retval_ptr_ptr, (object_pp?*object_pp:NULL), 1 TSRMLS_CC);
+		INIT_PZVAL(*retval_ptr_ptr);
+	}
+	zend_ptr_stack_clear_multiple(TSRMLS_C);
+	EG(function_state_ptr) = original_function_state_ptr;
+
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC)
+{
+	zval pv;
+	zend_op_array *new_op_array;
+	zend_op_array *original_active_op_array = EG(active_op_array);
+	zend_function_state *original_function_state_ptr = EG(function_state_ptr);
+	int original_handle_op_arrays;
+	int retval;
+
+	if (retval_ptr) {
+		pv.value.str.len = strlen(str)+sizeof("return  ;")-1;
+		pv.value.str.val = emalloc(pv.value.str.len+1);
+		strcpy(pv.value.str.val, "return ");
+		strcat(pv.value.str.val, str);
+		strcat(pv.value.str.val, " ;");
+	} else {
+		pv.value.str.len = strlen(str);
+		pv.value.str.val = estrndup(str, pv.value.str.len);
+	}
+	pv.type = IS_STRING;
+
+	/*printf("Evaluating '%s'\n", pv.value.str.val);*/
+
+	original_handle_op_arrays = CG(handle_op_arrays);
+	CG(handle_op_arrays) = 0;
+	new_op_array = compile_string(&pv, string_name TSRMLS_CC);
+	CG(handle_op_arrays) = original_handle_op_arrays;
+
+	if (new_op_array) {
+		zval *local_retval_ptr=NULL;
+		zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
+		zend_op **original_opline_ptr = EG(opline_ptr);
+		
+		EG(return_value_ptr_ptr) = &local_retval_ptr;
+		EG(active_op_array) = new_op_array;
+		EG(no_extensions)=1;
+
+		zend_execute(new_op_array TSRMLS_CC);
+
+		if (local_retval_ptr) {
+			if (retval_ptr) {
+				COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
+			} else {
+				zval_ptr_dtor(&local_retval_ptr);
+			}
+		} else {
+			if (retval_ptr) {
+				INIT_ZVAL(*retval_ptr);
+			}
+		}
+
+		EG(no_extensions)=0;
+		EG(opline_ptr) = original_opline_ptr;
+		EG(active_op_array) = original_active_op_array;
+		EG(function_state_ptr) = original_function_state_ptr;
+		destroy_op_array(new_op_array);
+		efree(new_op_array);
+		EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
+		retval = SUCCESS;
+	} else {
+		retval = FAILURE;
+	}
+	zval_dtor(&pv);
+	return retval;
+}
+
+
+void execute_new_code(TSRMLS_D)
+{
+    zend_op *opline, *end;
+	zend_op *ret_opline;
+
+	if (!CG(interactive)
+		|| CG(active_op_array)->backpatch_count>0
+		|| CG(active_op_array)->function_name
+		|| CG(active_op_array)->type!=ZEND_USER_FUNCTION) {
+		return;
+	}
+
+	ret_opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+	ret_opline->opcode = ZEND_RETURN;
+	ret_opline->op1.op_type = IS_CONST;
+	INIT_ZVAL(ret_opline->op1.u.constant);
+	SET_UNUSED(ret_opline->op2);
+
+	if (!CG(active_op_array)->start_op) {
+		CG(active_op_array)->start_op = CG(active_op_array)->opcodes;
+	}
+    
+	opline=CG(active_op_array)->start_op;
+	end=CG(active_op_array)->opcodes+CG(active_op_array)->last;
+
+    while (opline<end) {
+        if (opline->op1.op_type==IS_CONST) {
+            opline->op1.u.constant.is_ref = 1;
+            opline->op1.u.constant.refcount = 2; /* Make sure is_ref won't be reset */
+        }
+        if (opline->op2.op_type==IS_CONST) {
+            opline->op2.u.constant.is_ref = 1;
+            opline->op2.u.constant.refcount = 2;
+        }
+        opline++;
+    }
+
+	EG(active_op_array) = CG(active_op_array);
+	zend_execute(CG(active_op_array) TSRMLS_CC);
+	zval_ptr_dtor(EG(return_value_ptr_ptr));
+	CG(active_op_array)->last--;	/* get rid of that ZEND_RETURN */
+	CG(active_op_array)->start_op = CG(active_op_array)->opcodes+CG(active_op_array)->last;
+}
+
+
+ZEND_API void zend_timeout(int dummy)
+{
+	TSRMLS_FETCH();
+
+	/* is there any point in this?  we're terminating the request anyway...
+	PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
+	*/
+	zend_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
+			  EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
+}
+
+
+#ifdef ZEND_WIN32
+static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	switch (message) {
+		case WM_DESTROY:
+			PostQuitMessage(0);
+			break;
+		case WM_REGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
+			if (lParam==0) {
+				KillTimer(timeout_window, wParam);
+			} else {
+				SetTimer(timeout_window, wParam, lParam*1000, NULL);
+			}
+			break;
+		case WM_UNREGISTER_ZEND_TIMEOUT:
+			/* wParam is the thread id pointer */
+			KillTimer(timeout_window, wParam);
+			break;
+		case WM_TIMER: {
+#ifdef ZTS
+				void ***tsrm_ls;
+
+				tsrm_ls = ts_resource_ex(0, &wParam);
+				if (!tsrm_ls) {
+					/* Thread died before receiving its timeout? */
+					break;
+				}
+#endif
+				KillTimer(timeout_window, wParam);
+				EG(timed_out) = 1;
+			}
+			break;
+		default:
+			return DefWindowProc(hWnd,message,wParam,lParam);
+	}
+	return 0;
+}
+
+
+
+static unsigned __stdcall timeout_thread_proc(void *pArgs)
+{
+	MSG message;
+
+	wc.style=0;
+	wc.lpfnWndProc = zend_timeout_WndProc;
+	wc.cbClsExtra=0;
+	wc.cbWndExtra=0;
+	wc.hInstance=NULL;
+	wc.hIcon=NULL;
+	wc.hCursor=NULL;
+	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
+	wc.lpszMenuName=NULL;
+	wc.lpszClassName = "Zend Timeout Window";
+	if (!RegisterClass(&wc)) {
+		return -1;
+	}
+	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
+	SetEvent(timeout_thread_event);
+	while (GetMessage(&message, NULL, 0, 0)) {
+		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
+		if (message.message == WM_QUIT) {
+			break;
+		}
+	}
+	DestroyWindow(timeout_window);
+	UnregisterClass(wc.lpszClassName, NULL);
+	return 0;
+}
+
+
+void zend_init_timeout_thread()
+{
+	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
+	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	WaitForSingleObject(timeout_thread_event, INFINITE);
+}
+
+
+void zend_shutdown_timeout_thread()
+{
+	if (!timeout_thread_initialized) {
+		return;
+	}
+	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);
+}
+
+#endif
+
+/* This one doesn't exists on QNX */
+#ifndef SIGPROF
+#define SIGPROF 27
+#endif
+
+void zend_set_timeout(long seconds)
+{
+	TSRMLS_FETCH();
+
+	EG(timeout_seconds) = seconds;
+#ifdef ZEND_WIN32
+	if (timeout_thread_initialized==0 && InterlockedIncrement(&timeout_thread_initialized)==1) {
+		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
+		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
+		 */
+		zend_init_timeout_thread();
+	}
+	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
+#else
+#	ifdef HAVE_SETITIMER
+	{
+		struct itimerval t_r;		/* timeout requested */
+		sigset_t sigset;
+
+		t_r.it_value.tv_sec = seconds;
+		t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
+
+		setitimer(ITIMER_PROF, &t_r, NULL);
+		signal(SIGPROF, zend_timeout);
+		sigemptyset(&sigset);
+		sigaddset(&sigset, SIGPROF);
+		sigprocmask(SIG_UNBLOCK,&sigset,NULL);
+	}
+#	endif
+#endif
+}
+
+
+void zend_unset_timeout(TSRMLS_D)
+{
+#ifdef ZEND_WIN32
+	PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
+#else
+#	ifdef HAVE_SETITIMER
+	{
+		struct itimerval no_timeout;
+
+		no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
+
+		setitimer(ITIMER_PROF, &no_timeout, NULL);
+	}
+#	endif
+#endif
+}

Zend/zend_execute_locks.h

@@ -0,0 +1,32 @@
+#ifndef ZEND_EXECUTE_LOCKS_H
+#define ZEND_EXECUTE_LOCKS_H
+
+#define PZVAL_LOCK(z) zend_pzval_lock_func(z)
+
+static inline void zend_pzval_lock_func(zval *z)
+{
+	((z)->refcount++);
+}
+
+#define PZVAL_UNLOCK(z) zend_pzval_unlock_func(z TSRMLS_CC)
+
+static inline void zend_pzval_unlock_func(zval *z TSRMLS_DC)
+{
+	((z)->refcount--);
+	if (!(z)->refcount) {
+		(z)->refcount = 1;
+		(z)->is_ref = 0;
+		EG(garbage)[EG(garbage_ptr)++] = (z);
+	}
+}
+
+static inline void zend_clean_garbage(TSRMLS_D)
+{
+	while (EG(garbage_ptr)) {
+		zval_ptr_dtor(&EG(garbage)[--EG(garbage_ptr)]);
+	}
+}
+
+#define SELECTIVE_PZVAL_LOCK(pzv, pzn)		if (!((pzn)->u.EA.type & EXT_TYPE_UNUSED)) { PZVAL_LOCK(pzv); }
+
+#endif /* ZEND_EXECUTE_LOCKS_H */

Zend/zend_extensions.c

@@ -0,0 +1,218 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend_extensions.h"
+
+ZEND_API zend_llist zend_extensions;
+static int last_resource_number;
+
+int zend_load_extension(char *path)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	DL_HANDLE handle;
+	zend_extension *new_extension;
+	zend_extension_version_info *extension_version_info;
+
+	handle = DL_LOAD(path);
+	if (!handle) {
+#ifndef ZEND_WIN32
+		fprintf(stderr, "Failed loading %s:  %s\n", path, dlerror());
+#else
+		fprintf(stderr, "Failed loading %s\n", path);
+#endif
+		return FAILURE;
+	}
+
+	extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
+	new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
+	if (!extension_version_info || !new_extension) {
+		fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		return FAILURE;
+	}
+
+
+	/* allow extension to proclaim compatibility with any Zend version */
+	if (extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
+		if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
+			fprintf(stderr, "%s requires Zend Engine API version %d\n"
+					"The installed Zend Engine API version is %d\n\n",
+					new_extension->name,
+					extension_version_info->zend_extension_api_no,
+					ZEND_EXTENSION_API_NO);
+			DL_UNLOAD(handle);
+			return FAILURE;
+		} else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
+			fprintf(stderr, "%s designed to be used with the Zend Engine API %d is outdated\n"
+					"It requires a more recent version of the Zend Engine\n"
+					"The installed Zend Engine API version is %d\n"
+					"Contact %s at %s for a later version of this module.\n\n",
+					new_extension->name,
+					extension_version_info->zend_extension_api_no,
+					ZEND_EXTENSION_API_NO,
+					new_extension->author,
+					new_extension->URL);
+			DL_UNLOAD(handle);
+			return FAILURE;
+		} 
+	} else if (ZTS_V!=extension_version_info->thread_safe) {
+		fprintf(stderr, "Cannot load %s - it %s thread safe, whereas Zend %s\n",
+					new_extension->name,
+					(extension_version_info->thread_safe?"is":"isn't"),
+					(ZTS_V?"is":"isn't"));
+		DL_UNLOAD(handle);
+		return FAILURE;
+	} else if (ZEND_DEBUG!=extension_version_info->debug) {
+		fprintf(stderr, "Cannot load %s - it %s debug information, whereas Zend %s\n",
+					new_extension->name,
+					(extension_version_info->debug?"contains":"does not contain"),
+					(ZEND_DEBUG?"does":"does not"));
+		DL_UNLOAD(handle);
+		return FAILURE;
+	}
+
+	return zend_register_extension(new_extension, handle);
+#else
+	fprintf(stderr, "Extensions are not supported on this platform.\n");
+	return FAILURE;
+#endif
+}
+
+
+int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	zend_extension extension;
+
+	extension = *new_extension;
+	extension.handle = handle;
+
+	zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension);
+
+	zend_llist_add_element(&zend_extensions, &extension);
+
+	/*fprintf(stderr, "Loaded %s, version %s\n", extension.name, extension.version);*/
+#endif
+
+	return SUCCESS;
+}
+
+
+static void zend_extension_shutdown(zend_extension *extension TSRMLS_DC)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	if (extension->shutdown) {
+		extension->shutdown(extension);
+	}
+#endif
+}
+
+static int zend_extension_startup(zend_extension *extension)
+{
+#if ZEND_EXTENSIONS_SUPPORT
+	if (extension->startup) {
+		if (extension->startup(extension)!=SUCCESS) {
+			return 1;
+		}
+		zend_append_version_info(extension);
+	}
+#endif
+	return 0;
+}
+
+
+int zend_startup_extensions_mechanism()
+{
+	/* Startup extensions mechanism */
+	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+	last_resource_number = 0;
+	return SUCCESS;
+}
+
+
+int zend_startup_extensions()
+{
+	zend_llist_apply_with_del(&zend_extensions, (int (*)(void *)) zend_extension_startup);
+	return SUCCESS;
+}
+
+
+void zend_shutdown_extensions(TSRMLS_D)
+{
+	zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_shutdown TSRMLS_CC);
+	zend_llist_destroy(&zend_extensions);
+}
+
+
+void zend_extension_dtor(zend_extension *extension)
+{
+#if ZEND_EXTENSIONS_SUPPORT && !ZEND_DEBUG
+	if (extension->handle) {
+		DL_UNLOAD(extension->handle);
+	}
+#endif
+}
+
+
+static void zend_extension_message_dispatcher(zend_extension *extension, int num_args, va_list args TSRMLS_DC)
+{
+	int message;
+	void *arg;
+
+	if (!extension->message_handler || num_args!=2) {
+		return;
+	}
+	message = va_arg(args, int);
+	arg = va_arg(args, void *);
+	extension->message_handler(message, arg);
+}
+
+
+ZEND_API void zend_extension_dispatch_message(int message, void *arg)
+{
+	TSRMLS_FETCH();
+
+	zend_llist_apply_with_arguments(&zend_extensions, (llist_apply_with_args_func_t) zend_extension_message_dispatcher TSRMLS_CC, 2, message, arg);
+}
+
+
+ZEND_API int zend_get_resource_handle(zend_extension *extension)
+{
+	if (last_resource_number<ZEND_MAX_RESERVED_RESOURCES) {
+		extension->resource_number = last_resource_number;
+		return last_resource_number++;
+	} else {
+		return -1;
+	}
+}
+
+
+ZEND_API zend_extension *zend_get_extension(char *extension_name)
+{
+	zend_llist_element *element;
+
+	for (element = zend_extensions.head; element; element = element->next) {
+		zend_extension *extension = (zend_extension *) element->data;
+
+		if (!strcmp(extension->name, extension_name)) {
+			return extension;
+		}
+	}
+	return NULL;
+}

Zend/zend_extensions.h

@@ -0,0 +1,116 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_EXTENSIONS_H
+#define ZEND_EXTENSIONS_H
+
+#include "zend_compile.h"
+
+#define ZEND_EXTENSION_API_NO	20010710
+
+typedef struct _zend_extension_version_info {
+	int zend_extension_api_no;
+	char *required_zend_version;
+	unsigned char thread_safe;
+	unsigned char debug;
+} zend_extension_version_info;
+
+
+typedef struct _zend_extension zend_extension;
+
+/* Typedef's for zend_extension function pointers */
+typedef int (*startup_func_t)(zend_extension *extension);
+typedef void (*shutdown_func_t)(zend_extension *extension);
+typedef void (*activate_func_t)(void);
+typedef void (*deactivate_func_t)(void);
+
+typedef void (*message_handler_func_t)(int message, void *arg);
+
+typedef void (*op_array_handler_func_t)(zend_op_array *op_array);
+
+typedef void (*statement_handler_func_t)(zend_op_array *op_array);
+typedef void (*fcall_begin_handler_func_t)(zend_op_array *op_array);
+typedef void (*fcall_end_handler_func_t)(zend_op_array *op_array);
+
+typedef void (*op_array_ctor_func_t)(zend_op_array *op_array);
+typedef void (*op_array_dtor_func_t)(zend_op_array *op_array);
+
+struct _zend_extension {
+	char *name;
+	char *version;
+	char *author;
+	char *URL;
+	char *copyright;
+
+	startup_func_t startup;
+	shutdown_func_t shutdown;
+	activate_func_t activate;
+	deactivate_func_t deactivate;
+
+	message_handler_func_t message_handler;
+
+	op_array_handler_func_t op_array_handler;
+
+	statement_handler_func_t statement_handler;	
+	fcall_begin_handler_func_t fcall_begin_handler;
+	fcall_end_handler_func_t fcall_end_handler;
+
+	op_array_ctor_func_t op_array_ctor;
+	op_array_dtor_func_t op_array_dtor;
+
+	int (*api_no_check)(int api_no);
+	void *reserved2;
+	void *reserved3;
+	void *reserved4;
+	void *reserved5;
+	void *reserved6;
+	void *reserved7;
+	void *reserved8;
+
+	DL_HANDLE handle;
+	int resource_number;
+};
+
+
+ZEND_API int zend_get_resource_handle(zend_extension *extension);
+ZEND_API void zend_extension_dispatch_message(int message, void *arg);
+
+#define ZEND_EXTMSG_NEW_EXTENSION		1
+
+
+#define ZEND_EXTENSION()	\
+	ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, ZEND_VERSION, ZTS_V, ZEND_DEBUG }
+
+#define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
+#define COMPAT_ZEND_EXTENSION_PROPERTIES   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
+
+
+ZEND_API extern zend_llist zend_extensions;
+
+void zend_extension_dtor(zend_extension *extension);
+ZEND_API int zend_load_extension(char *path);
+ZEND_API int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle);
+void zend_append_version_info(zend_extension *extension);
+int zend_startup_extensions_mechanism(void);
+int zend_startup_extensions(void);
+void zend_shutdown_extensions(TSRMLS_D);
+ZEND_API zend_extension *zend_get_extension(char *extension_name);
+
+#endif /* ZEND_EXTENSIONS_H */

Zend/zend_fast_cache.h

@@ -0,0 +1,140 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_FAST_CACHE_H
+#define ZEND_FAST_CACHE_H
+
+#ifndef ZEND_ENABLE_FAST_CACHE
+# if ZEND_DEBUG
+# define ZEND_ENABLE_FAST_CACHE 0
+# else
+# define ZEND_ENABLE_FAST_CACHE 1
+# endif
+#endif
+
+typedef struct _zend_fast_cache_list_entry {
+	struct _zend_fast_cache_list_entry *next;
+} zend_fast_cache_list_entry;
+
+#define MAX_FAST_CACHE_TYPES	4
+
+
+#define ZVAL_CACHE_LIST			0
+#define HASHTABLE_CACHE_LIST	1
+
+#if ZEND_ENABLE_FAST_CACHE
+
+
+#include "zend_globals.h"
+#include "zend_globals_macros.h"
+#include "zend_alloc.h"
+
+
+#if ZEND_DEBUG
+# define RECORD_ZVAL_CACHE_HIT(fc_type)		AG(fast_cache_stats)[fc_type][1]++;
+# define RECORD_ZVAL_CACHE_MISS(fc_type)	AG(fast_cache_stats)[fc_type][0]++;
+#else
+# define RECORD_ZVAL_CACHE_HIT(fc_type)
+# define RECORD_ZVAL_CACHE_MISS(fc_type)
+#endif
+
+
+#define ZEND_FAST_ALLOC(p, type, fc_type)								\
+	{																\
+		TSRMLS_FETCH();												\
+																	\
+		if (((p) = (type *) AG(fast_cache_list_head)[fc_type])) {	\
+			AG(fast_cache_list_head)[fc_type] = ((zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type])->next;	\
+			RECORD_ZVAL_CACHE_HIT(fc_type);							\
+		} else {													\
+			(p) = (type *) emalloc(sizeof(type));					\
+			RECORD_ZVAL_CACHE_MISS(fc_type);						\
+		}															\
+	}
+
+
+#define ZEND_FAST_FREE(p, fc_type)										\
+	{																\
+		TSRMLS_FETCH();												\
+																	\
+		((zend_fast_cache_list_entry *) (p))->next = (zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type];	\
+		AG(fast_cache_list_head)[fc_type] = (zend_fast_cache_list_entry *) (p);			\
+	}
+
+#define ZEND_FAST_ALLOC_REL(p, type, fc_type)	\
+	ZEND_FAST_ALLOC(p, type, fc_type)
+
+#define ZEND_FAST_FREE_REL(p, fc_type)	\
+	ZEND_FAST_FREE(p, fc_type)
+
+
+#else /* !ZEND_ENABLE_FAST_CACHE */
+
+#define ZEND_FAST_ALLOC(p, type, fc_type)	\
+	(p) = (type *) emalloc(sizeof(type))
+
+#define ZEND_FAST_FREE(p, fc_type)	\
+	efree(p)
+
+#define ZEND_FAST_ALLOC_REL(p, type, fc_type)	\
+	(p) = (type *) emalloc_rel(sizeof(type))
+
+#define ZEND_FAST_FREE_REL(p, fc_type)	\
+	efree_rel(p)
+
+#endif /* ZEND_ENABLE_FAST_CACHE */
+
+
+
+
+/* fast cache for zval's */
+#define ALLOC_ZVAL(z)	\
+	ZEND_FAST_ALLOC(z, zval, ZVAL_CACHE_LIST)
+
+#define FREE_ZVAL(z)	\
+	ZEND_FAST_FREE(z, ZVAL_CACHE_LIST)
+
+#define ALLOC_ZVAL_REL(z)	\
+	ZEND_FAST_ALLOC_REL(z, zval, ZVAL_CACHE_LIST)
+
+#define FREE_ZVAL_REL(z)	\
+	ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST)
+
+/* fast cache for HashTables */
+#define ALLOC_HASHTABLE(ht)	\
+	ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST)
+
+#define FREE_HASHTABLE(ht)	\
+	ZEND_FAST_FREE(ht, HASHTABLE_CACHE_LIST)
+
+#define ALLOC_HASHTABLE_REL(ht)	\
+	ZEND_FAST_ALLOC_REL(ht, HashTable, HASHTABLE_CACHE_LIST)
+
+#define FREE_HASHTABLE_REL(ht)	\
+	ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
+
+#endif /* ZEND_FAST_CACHE_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_globals.h

@@ -0,0 +1,244 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_GLOBALS_H
+#define ZEND_GLOBALS_H
+
+
+#include <setjmp.h>
+
+#include "zend_globals_macros.h"
+
+#include "zend_stack.h"
+#include "zend_ptr_stack.h"
+#include "zend_hash.h"
+#include "zend_llist.h"
+#include "zend_fast_cache.h"
+
+/* Define ZTS if you want a thread-safe Zend */
+/*#undef ZTS*/
+
+#ifdef ZTS
+#ifdef __cplusplus
+class ZendFlexLexer;
+class ZendIniFlexLexer;
+#endif
+
+BEGIN_EXTERN_C()
+ZEND_API extern int compiler_globals_id;
+ZEND_API extern int executor_globals_id;
+ZEND_API extern int alloc_globals_id;
+END_EXTERN_C()
+
+#endif
+
+#define SYMTABLE_CACHE_SIZE 32
+
+
+#include "zend_compile.h"
+
+/* excpt.h on Digital Unix 4.0 defines function_table */
+#undef function_table
+
+
+typedef struct _zend_declarables {
+	zval ticks;
+} zend_declarables;
+
+
+struct _zend_compiler_globals {
+	zend_stack bp_stack;
+	zend_stack switch_cond_stack;
+	zend_stack foreach_copy_stack;
+	zend_stack object_stack;
+	zend_stack declare_stack;
+
+	zend_class_entry class_entry, *active_class_entry;
+	zval active_ce_parent_class_name;
+
+	/* variables for list() compilation */
+	zend_llist list_llist;
+	zend_llist dimension_llist;
+	zend_stack list_stack;
+
+	zend_stack function_call_stack;
+
+	char *compiled_filename;
+
+	int zend_lineno;
+	int comment_start_line;
+	char *heredoc;
+	int heredoc_len;
+
+	zend_op_array *active_op_array;
+
+	HashTable *function_table;	/* function symbol table */
+	HashTable *class_table;		/* class table */
+
+	HashTable filenames_table;
+
+	zend_bool in_compilation;
+	zend_bool short_tags;
+	zend_bool asp_tags;
+	zend_bool allow_call_time_pass_reference;
+
+	zend_declarables declarables;
+
+	/* For extensions support */
+	zend_bool extended_info;	/* generate extension information for debugger/profiler */
+	zend_bool handle_op_arrays;	/* run op_arrays through op_array handlers */
+
+	zend_bool unclean_shutdown;
+
+	zend_bool ini_parser_unbuffered_errors;
+
+	zend_llist open_files;
+
+#if defined(ZTS) && defined(__cplusplus)
+	ZendFlexLexer *ZFL;
+	ZendIniFlexLexer *ini_scanner;
+#else
+	void *ZFL;
+	void *ini_parser;
+#endif
+
+	struct _zend_ini_parser_param *ini_parser_param;
+
+	int interactive;
+
+	zend_bool increment_lineno;
+};
+
+
+struct _zend_executor_globals {
+	zval **return_value_ptr_ptr;
+
+	zval uninitialized_zval;
+	zval *uninitialized_zval_ptr;
+
+	zval error_zval;
+	zval *error_zval_ptr;
+
+	zend_function_state *function_state_ptr;
+	zend_ptr_stack arg_types_stack;
+
+	/* for global return() support */
+	zval *global_return_value_ptr;
+
+	/* symbol table cache */
+	HashTable *symtable_cache[SYMTABLE_CACHE_SIZE];
+	HashTable **symtable_cache_limit;
+	HashTable **symtable_cache_ptr;
+
+	zend_op **opline_ptr;
+
+	HashTable *active_symbol_table;
+	HashTable symbol_table;		/* main symbol table */
+
+	HashTable included_files;	/* files already included */
+
+	jmp_buf bailout;
+
+	int error_reporting;
+	int orig_error_reporting;
+	int exit_status;
+
+	zend_op_array *active_op_array;
+
+	HashTable *function_table;	/* function symbol table */
+	HashTable *class_table;		/* class table */
+	HashTable *zend_constants;	/* constants table */
+
+	long precision;
+
+	int ticks_count;
+
+	zend_bool in_execution;
+	zend_bool bailout_set;
+
+	/* for extended information support */
+	zend_bool no_extensions;
+
+#ifdef ZEND_WIN32
+	zend_bool timed_out;
+#endif
+
+	HashTable regular_list;
+	HashTable persistent_list;
+
+	zend_ptr_stack argument_stack;
+	int free_op1, free_op2;
+	int (*unary_op)(zval *result, zval *op1);
+	int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+
+	zval *garbage[2];
+	int garbage_ptr;
+
+	zval *user_error_handler;
+	zend_ptr_stack user_error_handlers;
+
+	/* timeout support */
+	int timeout_seconds;
+
+	int lambda_count;
+
+	HashTable ini_directives;
+
+	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+};
+
+
+struct _zend_alloc_globals {
+	zend_mem_header *head;		/* standard list */
+	zend_mem_header *phead;		/* persistent list */
+	void *cache[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
+	unsigned int cache_count[MAX_CACHED_MEMORY];
+	void *fast_cache_list_head[MAX_FAST_CACHE_TYPES];
+
+#ifdef ZEND_WIN32
+	HANDLE memory_heap;
+#endif
+
+#if ZEND_DEBUG
+	/* for performance tuning */
+	int cache_stats[MAX_CACHED_MEMORY][2];
+	int fast_cache_stats[MAX_FAST_CACHE_TYPES][2];
+#endif
+#if MEMORY_LIMIT
+	unsigned int memory_limit;
+	unsigned int allocated_memory;
+	unsigned int allocated_memory_peak;
+	unsigned char memory_exhausted;
+#endif
+};
+
+
+struct _zend_scanner_globals {
+	FILE *yyin;
+	FILE *yyout;
+	int yy_leng;
+	char *yy_text;
+	struct yy_buffer_state *current_buffer;
+	char *c_buf_p;
+	int init;
+	int start;
+};
+
+#endif /* ZEND_GLOBALS_H */

Zend/zend_globals_macros.h

@@ -0,0 +1,109 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_GLOBALS_MACROS_H
+#define ZEND_GLOBALS_MACROS_H
+
+typedef struct _zend_compiler_globals zend_compiler_globals;
+typedef struct _zend_executor_globals zend_executor_globals;
+typedef struct _zend_alloc_globals zend_alloc_globals;
+typedef struct _zend_scanner_globals zend_scanner_globals;
+
+/* Compiler */
+#ifdef ZTS
+# define CG(v) TSRMG(compiler_globals_id, zend_compiler_globals *, v)
+BEGIN_EXTERN_C()
+int zendparse(void *compiler_globals);
+END_EXTERN_C()
+#else
+# define CG(v) (compiler_globals.v)
+extern ZEND_API struct _zend_compiler_globals compiler_globals;
+int zendparse(void);
+#endif
+
+
+/* Executor */
+#ifdef ZTS
+# define EG(v) TSRMG(executor_globals_id, zend_executor_globals *, v)
+#else
+# define EG(v) (executor_globals.v)
+extern ZEND_API zend_executor_globals executor_globals;
+#endif
+
+
+/* Memory Manager */
+#ifdef ZTS
+# define AG(v) TSRMG(alloc_globals_id, zend_alloc_globals *, v)
+#else
+# define AG(v) (alloc_globals.v)
+extern ZEND_API zend_alloc_globals alloc_globals;
+#endif
+
+
+/* Language Scanner */
+#ifdef ZTS
+# define LANG_SCNG(v) TSRMG(language_scanner_globals_id, zend_scanner_globals *, v)
+extern ZEND_API ts_rsrc_id language_scanner_globals_id;
+#else
+# define LANG_SCNG(v) (language_scanner_globals.v)
+extern ZEND_API zend_scanner_globals language_scanner_globals;
+#endif
+
+
+/* INI Scanner */
+#ifdef ZTS
+# define INI_SCNG(v) TSRMG(ini_scanner_globals_id, zend_scanner_globals *, v)
+extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
+#else
+# define INI_SCNG(v) (ini_scanner_globals.v)
+extern ZEND_API zend_scanner_globals ini_scanner_globals;
+#endif
+
+
+/* For limited downwards source compatibility */
+#define CLS_FETCH()
+#define ELS_FETCH()
+#define ALS_FETCH()
+#define PLS_FETCH()
+#define SLS_FETCH()
+#define CLS_D
+#define ELS_D
+#define ALS_D
+#define PLS_D
+#define SLS_D
+#define CLS_DC
+#define ELS_DC
+#define ALS_DC
+#define PLS_DC
+#define SLS_DC
+#define CLS_C
+#define ELS_C
+#define ALS_C
+#define PLS_C
+#define SLS_C
+#define CLS_CC
+#define ELS_CC
+#define ALS_CC
+#define PLS_CC
+#define SLS_CC
+
+
+#endif /* ZEND_GLOBALS_MACROS_H */
+

Zend/zend_hash.h

@@ -0,0 +1,219 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_HASH_H
+#define ZEND_HASH_H
+
+#include <sys/types.h>
+
+#define HASH_KEY_IS_STRING 1
+#define HASH_KEY_IS_LONG 2
+#define HASH_KEY_NON_EXISTANT 3
+
+#define HASH_UPDATE 		(1<<0)
+#define HASH_ADD			(1<<1)
+#define HASH_NEXT_INSERT	(1<<2)
+
+#define HASH_DEL_KEY 0
+#define HASH_DEL_INDEX 1
+
+typedef ulong (*hash_func_t)(char *arKey, uint nKeyLength);
+typedef int  (*compare_func_t)(const void *, const void *);
+typedef void (*sort_func_t)(void *, size_t, register size_t, compare_func_t);
+typedef void (*dtor_func_t)(void *pDest);
+typedef void (*copy_ctor_func_t)(void *pElement);
+
+struct _hashtable;
+
+typedef struct bucket {
+	ulong h;						/* Used for numeric indexing */
+	uint nKeyLength;
+	void *pData;
+	void *pDataPtr;
+	struct bucket *pListNext;
+	struct bucket *pListLast;
+	struct bucket *pNext;
+	struct bucket *pLast;
+	char arKey[1]; /* Must be last element */
+} Bucket;
+
+typedef struct _hashtable {
+	uint nTableSize;
+	uint nTableMask;
+	uint nNumOfElements;
+	ulong nNextFreeElement;
+	Bucket *pInternalPointer;	/* Used for element traversal */
+	Bucket *pListHead;
+	Bucket *pListTail;
+	Bucket **arBuckets;
+	dtor_func_t pDestructor;
+	zend_bool persistent;
+	unsigned char nApplyCount;
+	zend_bool bApplyProtection;
+#if ZEND_DEBUG
+	int inconsistent;
+#endif
+} HashTable;
+
+typedef Bucket* HashPosition;
+
+BEGIN_EXTERN_C()
+
+/* startup/shutdown */
+ZEND_API int zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent);
+ZEND_API int zend_hash_init_ex(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent, zend_bool bApplyProtection);
+ZEND_API void zend_hash_destroy(HashTable *ht);
+ZEND_API void zend_hash_clean(HashTable *ht);
+
+/* additions/updates/changes */
+ZEND_API int zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest,int flag);
+#define zend_hash_update(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
+		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,HASH_UPDATE)
+#define zend_hash_add(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
+		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,HASH_ADD)
+
+ZEND_API int zend_hash_quick_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest,int flag);
+#define zend_hash_quick_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
+		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest,HASH_UPDATE)
+#define zend_hash_quick_add(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
+		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest,HASH_ADD)
+
+ZEND_API int zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void *pData, uint nDataSize, void **pDest, int flag);
+#define zend_hash_index_update(ht,h,pData,nDataSize,pDest) \
+		zend_hash_index_update_or_next_insert(ht,h,pData,nDataSize,pDest,HASH_UPDATE)
+#define zend_hash_next_index_insert(ht,pData,nDataSize,pDest) \
+		zend_hash_index_update_or_next_insert(ht,0,pData,nDataSize,pDest,HASH_NEXT_INSERT)
+
+ZEND_API int zend_hash_add_empty_element(HashTable *ht, char *arKey, uint nKeyLength);
+
+
+#define ZEND_HASH_APPLY_KEEP				0
+#define ZEND_HASH_APPLY_REMOVE				1<<0
+#define ZEND_HASH_APPLY_STOP				1<<1
+
+typedef struct _zend_hash_key {
+	char *arKey;
+	uint nKeyLength;
+	ulong h;
+} zend_hash_key;
+
+
+typedef int (*apply_func_t)(void *pDest TSRMLS_DC);
+typedef int (*apply_func_arg_t)(void *pDest, void *argument TSRMLS_DC);
+typedef int (*apply_func_args_t)(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
+
+ZEND_API void zend_hash_graceful_destroy(HashTable *ht);
+ZEND_API void zend_hash_apply(HashTable *ht, apply_func_t apply_func TSRMLS_DC);
+ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void * TSRMLS_DC);
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
+
+/* This function should be used with special care (in other words,
+ * it should usually not be used).  When used with the ZEND_HASH_APPLY_STOP
+ * return value, it assumes things about the order of the elements in the hash.
+ * Also, it does not provide the same kind of reentrancy protection that
+ * the standard apply functions do.
+ */
+ZEND_API void zend_hash_reverse_apply(HashTable *ht, apply_func_t apply_func TSRMLS_DC);
+
+
+/* Deletes */
+ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag);
+#define zend_hash_del(ht,arKey,nKeyLength) \
+		zend_hash_del_key_or_index(ht,arKey,nKeyLength,0,HASH_DEL_KEY)
+#define zend_hash_index_del(ht,h) \
+		zend_hash_del_key_or_index(ht,NULL,0,h,HASH_DEL_INDEX)
+
+ZEND_API ulong zend_get_hash_value(HashTable *ht, char *arKey, uint nKeyLength);
+
+/* Data retreival */
+ZEND_API int zend_hash_find(HashTable *ht, char *arKey, uint nKeyLength, void **pData);
+ZEND_API int zend_hash_quick_find(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void **pData);
+ZEND_API int zend_hash_index_find(HashTable *ht, ulong h, void **pData);
+
+/* Misc */
+ZEND_API int zend_hash_exists(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_hash_index_exists(HashTable *ht, ulong h);
+ZEND_API ulong zend_hash_next_free_element(HashTable *ht);
+
+/* traversing */
+ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos);
+ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos);
+ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos);
+ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos);
+ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos);
+ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos);
+ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos);
+
+#define zend_hash_move_forward(ht) \
+	zend_hash_move_forward_ex(ht, NULL)
+#define zend_hash_move_backwards(ht) \
+	zend_hash_move_backwards_ex(ht, NULL)
+#define zend_hash_get_current_key(ht, str_index, num_index, duplicate) \
+	zend_hash_get_current_key_ex(ht, str_index, NULL, num_index, duplicate, NULL)
+#define zend_hash_get_current_key_type(ht) \
+	zend_hash_get_current_key_type_ex(ht, NULL)
+#define zend_hash_get_current_data(ht, pData) \
+	zend_hash_get_current_data_ex(ht, pData, NULL)
+#define zend_hash_internal_pointer_reset(ht) \
+	zend_hash_internal_pointer_reset_ex(ht, NULL)
+#define zend_hash_internal_pointer_end(ht) \
+	zend_hash_internal_pointer_end_ex(ht, NULL)
+
+/* Copying, merging and sorting */
+ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size);
+ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite);
+ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *p_new));
+ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber);
+ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered TSRMLS_DC);
+ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar)(const void *, const void *), int flag, void **pData);
+
+ZEND_API int zend_hash_num_elements(HashTable *ht);
+
+ZEND_API int zend_hash_rehash(HashTable *ht);
+
+static inline ulong zend_inline_hash_func(char *arKey, uint nKeyLength)
+{
+	ulong h = 5381;
+	char *arEnd = arKey + nKeyLength;
+
+	while (arKey < arEnd) {
+		h += (h << 5);
+		h ^= (ulong) *arKey++;
+	}
+	return h;
+}
+
+ZEND_API ulong zend_hash_func(char *arKey, uint nKeyLength);
+
+#if ZEND_DEBUG
+/* debug */
+void zend_hash_display_pListTail(HashTable *ht);
+void zend_hash_display(HashTable *ht);
+#endif
+
+END_EXTERN_C()
+
+#define ZEND_INIT_SYMTABLE(ht)								\
+	ZEND_INIT_SYMTABLE_EX(ht, 2, 0)
+
+#define ZEND_INIT_SYMTABLE_EX(ht, n, persistent)			\
+	zend_hash_init(ht, n, NULL, ZVAL_PTR_DTOR, persistent)
+
+
+#endif							/* ZEND_HASH_H */

Zend/zend_highlight.c

@@ -0,0 +1,181 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend.h"
+#include "zend_language_parser.h"
+#include "zend_compile.h"
+#include "zend_highlight.h"
+#include "zend_ptr_stack.h"
+#include "zend_globals.h"
+
+ZEND_API void zend_html_putc(char c)
+{
+	switch (c) {
+		case '\n':
+			ZEND_PUTS("<br />");
+			break;
+		case '<':
+			ZEND_PUTS("&lt;");
+			break;
+		case '>':
+			ZEND_PUTS("&gt;");
+			break;
+		case '&':
+			ZEND_PUTS("&amp;");
+			break;
+		case ' ':
+			ZEND_PUTS("&nbsp;");
+			break;
+		case '\t':
+			ZEND_PUTS("&nbsp;&nbsp;&nbsp;&nbsp;");
+			break;
+		default:
+			ZEND_PUTC(c);
+			break;
+	}
+}
+
+
+ZEND_API void zend_html_puts(char *s, uint len)
+{
+	register char *ptr=s, *end=s+len;
+	
+	while (ptr<end) {
+		if (*ptr==' '
+			&& len>1
+			&& !(((ptr+1)>=end) || (*(ptr+1)==' ')) /* next is not a space */
+			&& !((ptr==s) || (*(ptr-1)==' '))) /* last is not a space */ {
+			char c = *ptr++;
+
+			ZEND_PUTC(c);
+			continue;
+		}
+		zend_html_putc(*ptr++);
+	}
+}
+
+
+
+ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC)
+{
+	zval token;
+	int token_type;
+	char *last_color = syntax_highlighter_ini->highlight_html;
+	char *next_color;
+	int in_string=0;
+
+	zend_printf("<code>");
+	zend_printf("<font color=\"%s\">\n", last_color);
+	/* highlight stuff coming back from zendlex() */
+	token.type = 0;
+	while ((token_type=lex_scan(&token TSRMLS_CC))) {
+		switch (token_type) {
+			case T_INLINE_HTML:
+				next_color = syntax_highlighter_ini->highlight_html;
+				break;
+			case T_COMMENT:
+				next_color = syntax_highlighter_ini->highlight_comment;
+				break;
+			case T_OPEN_TAG:
+			case T_OPEN_TAG_WITH_ECHO:
+				next_color = syntax_highlighter_ini->highlight_default;
+				break;
+			case T_CLOSE_TAG:
+				next_color = syntax_highlighter_ini->highlight_default;
+				break;
+			case T_CONSTANT_ENCAPSED_STRING:
+				next_color = syntax_highlighter_ini->highlight_string;
+				break;
+			case '"':
+				next_color = syntax_highlighter_ini->highlight_string;
+				in_string = !in_string;
+				break;				
+			case T_WHITESPACE:
+				zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));  /* no color needed */
+				token.type = 0;
+				continue;
+				break;
+			default:
+				if (token.type==0) {
+					next_color = syntax_highlighter_ini->highlight_keyword;
+				} else {
+					if (in_string) {
+						next_color = syntax_highlighter_ini->highlight_string;
+					} else {
+						next_color = syntax_highlighter_ini->highlight_default;
+					}
+				}
+				break;
+		}
+
+		if (last_color != next_color) {
+			if (last_color != syntax_highlighter_ini->highlight_html) {
+				zend_printf("</font>");
+			}
+			last_color = next_color;
+			if (last_color != syntax_highlighter_ini->highlight_html) {
+				zend_printf("<font color=\"%s\">", last_color);
+			}
+		}
+		switch (token_type) {
+			case T_END_HEREDOC:
+				zend_html_puts(token.value.str.val, token.value.str.len);
+				break;
+			default:
+				zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
+				break;
+		}
+
+		if (token.type == IS_STRING) {
+			switch (token_type) {
+				case T_OPEN_TAG:
+				case T_OPEN_TAG_WITH_ECHO:
+				case T_CLOSE_TAG:
+				case T_WHITESPACE:
+				case T_COMMENT:
+					break;
+				default:
+					efree(token.value.str.val);
+					break;
+			}
+		} else if (token_type == T_END_HEREDOC) {
+			zend_bool has_semicolon=(strchr(token.value.str.val, ';')?1:0);
+
+			efree(token.value.str.val);
+			if (has_semicolon) {
+				/* the following semicolon was unput(), ignore it */
+				lex_scan(&token TSRMLS_CC);
+			}
+		}
+		token.type = 0;
+	}
+	if (last_color != syntax_highlighter_ini->highlight_html) {
+		zend_printf("</font>\n");
+	}
+	zend_printf("</font>\n");
+	zend_printf("</code>");
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_highlight.h

@@ -0,0 +1,51 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_HIGHLIGHT_H
+#define ZEND_HIGHLIGHT_H
+
+#define HL_COMMENT_COLOR     "#FF8000"    /* orange */
+#define HL_DEFAULT_COLOR     "#0000BB"    /* blue */
+#define HL_HTML_COLOR        "#000000"    /* black */
+#define HL_STRING_COLOR      "#DD0000"    /* red */
+#define HL_BG_COLOR          "#FFFFFF"    /* white */
+#define HL_KEYWORD_COLOR     "#007700"    /* green */
+
+
+typedef struct _zend_syntax_highlighter_ini {
+	char *highlight_html;
+	char *highlight_comment;
+	char *highlight_default;
+	char *highlight_string;
+	char *highlight_keyword;
+} zend_syntax_highlighter_ini;
+
+
+BEGIN_EXTERN_C()
+ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC);
+ZEND_API int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC);
+ZEND_API int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name TSRMLS_DC);
+ZEND_API void zend_html_putc(char c);
+ZEND_API void zend_html_puts(char *s, uint len);
+END_EXTERN_C()
+
+extern zend_syntax_highlighter_ini syntax_highlighter_ini;
+
+#endif

Zend/zend_indent.c

@@ -0,0 +1,147 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+/* This indenter doesn't really work, it's here for no particular reason. */
+
+
+#include "zend.h"
+#include "zend_language_parser.h"
+#include "zend_compile.h"
+#include "zend_indent.h"
+
+#define zendtext LANG_SCNG(yy_text)
+#define zendleng LANG_SCNG(yy_leng)
+
+
+static void handle_whitespace(int *emit_whitespace)
+{
+	unsigned char c;
+	int i;
+
+	for (c=0; c<128; c++) {
+		if (emit_whitespace[c]>0) {
+			for (i=0; i<emit_whitespace[c]; i++) {
+				zend_write((char *) &c, 1);
+			}
+		}
+	}
+	memset(emit_whitespace, 0, sizeof(int)*256);
+}
+
+
+ZEND_API void zend_indent()
+{
+	zval token;
+	int token_type;
+	int in_string=0;
+	int nest_level=0;
+	int emit_whitespace[256];
+	int i;
+	TSRMLS_FETCH();
+
+	memset(emit_whitespace, 0, sizeof(int)*256);
+
+	/* highlight stuff coming back from zendlex() */
+	token.type = 0;
+	while ((token_type=lex_scan(&token TSRMLS_CC))) {
+		switch (token_type) {
+			case T_INLINE_HTML:
+				zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
+				break;
+			case T_WHITESPACE: {
+					token.type = 0;
+					/* eat whitespace, emit newlines */
+					for (i=0; i<LANG_SCNG(yy_leng); i++) {
+						emit_whitespace[(unsigned char) LANG_SCNG(yy_text)[i]]++;
+					}
+					continue;
+				}
+				break;
+			case '"':
+				in_string = !in_string;
+				/* break missing intentionally */
+			default:
+				if (token.type==0) {
+					/* keyword */
+					switch(token_type) {
+						case ',':
+							ZEND_PUTS(", ");
+							goto dflt_printout;
+							break;
+						case '{':
+							nest_level++;
+							if (emit_whitespace['\n']>0) {
+								ZEND_PUTS(" {\n");
+								memset(emit_whitespace, 0, sizeof(int)*256);
+							} else {
+								ZEND_PUTS("{");
+							}
+							break;
+						case '}':
+							nest_level--;
+							if (emit_whitespace['\n']==0) {
+								ZEND_PUTS("\n");
+							}
+							for (i=0; i<nest_level; i++) {
+								ZEND_PUTS("    ");
+							}
+							goto dflt_printout;
+							break;
+dflt_printout:
+						default:
+							if (emit_whitespace['\n']>0) {
+								for (i=0; i<emit_whitespace['\n']; i++) {
+									ZEND_PUTS("\n");
+								}
+								memset(emit_whitespace, 0, sizeof(int)*256);
+								for (i=0; i<nest_level; i++) {
+									ZEND_PUTS("    ");
+								}
+							} else {
+								handle_whitespace(emit_whitespace);
+							}
+							zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
+							break;
+					}
+				} else {
+					handle_whitespace(emit_whitespace);
+					if (in_string) {
+						zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
+						/* a part of a string */
+					} else {
+						zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
+					}
+				}
+				break;
+		}
+		if (token.type == IS_STRING) {
+			switch (token_type) {
+			case T_OPEN_TAG:
+			case T_CLOSE_TAG:
+			case T_WHITESPACE:
+				break;
+			default:
+				efree(token.value.str.val);
+				break;
+			}
+		}
+		token.type = 0;
+	}
+}

Zend/zend_indent.h

@@ -0,0 +1,26 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_INDENT_H
+#define ZEND_INDENT_H
+
+ZEND_API void zend_indent(void);
+
+#endif /* ZEND_INDENT_H */

Zend/zend_ini.c

@@ -0,0 +1,486 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Author: Zeev Suraski <zeev@zend.com>                                 |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include <stdlib.h>
+
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_ini.h"
+#include "zend_alloc.h"
+#include "zend_operators.h"
+
+static HashTable *registered_zend_ini_directives; 
+
+
+/*
+ * hash_apply functions
+ */
+static int zend_remove_ini_entries(zend_ini_entry *ini_entry, int *module_number TSRMLS_DC)
+{
+	if (ini_entry->module_number == *module_number) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS_DC)
+{
+	if (ini_entry->modified) {
+		if (ini_entry->on_modify) {
+			ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
+		}
+		efree(ini_entry->value);
+		ini_entry->value = ini_entry->orig_value;
+		ini_entry->value_length = ini_entry->orig_value_length;
+		ini_entry->modified = 0;
+		ini_entry->orig_value = NULL;
+		ini_entry->orig_value_length = 0;
+	}
+	return 0;
+}
+
+/*
+ * Startup / shutdown
+ */
+ZEND_API int zend_ini_startup(TSRMLS_D)
+{
+	registered_zend_ini_directives = &EG(ini_directives);
+	if (zend_hash_init_ex(registered_zend_ini_directives, 100, NULL, NULL, 1, 0)==FAILURE) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_ini_shutdown(TSRMLS_D)
+{
+	zend_hash_destroy(&EG(ini_directives));
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_ini_deactivate(TSRMLS_D)
+{
+	zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) zend_restore_ini_entry_cb, (void *) ZEND_INI_STAGE_DEACTIVATE TSRMLS_CC);
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_copy_ini_directives(TSRMLS_D)
+{
+	zend_ini_entry ini_entry;
+
+	if (zend_hash_init_ex(&EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, NULL, 1, 0)==FAILURE) {
+		return FAILURE;
+	}
+	zend_hash_copy(&EG(ini_directives), registered_zend_ini_directives, NULL, &ini_entry, sizeof(zend_ini_entry));
+	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC);
+	return SUCCESS;
+}
+
+
+static int ini_key_compare(const void *a, const void *b)
+{
+	Bucket *f;
+	Bucket *s;
+ 
+	f = *((Bucket **) a);
+	s = *((Bucket **) b);
+
+	if (f->nKeyLength==0 && s->nKeyLength==0) { /* both numeric */
+		return ZEND_NORMALIZE_BOOL(f->nKeyLength - s->nKeyLength);
+	} else if (f->nKeyLength==0) { /* f is numeric, s is not */
+		return -1;
+	} else if (s->nKeyLength==0) { /* s is numeric, f is not */
+		return 1;
+	} else { /* both strings */
+		return zend_binary_strcasecmp(f->arKey, f->nKeyLength, s->arKey, s->nKeyLength);
+	}
+}
+
+
+ZEND_API void zend_ini_sort_entries(TSRMLS_D)
+{
+	zend_hash_sort(&EG(ini_directives), qsort, ini_key_compare, 0);
+}
+
+/*
+ * Registration / unregistration
+ */
+
+ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_number TSRMLS_DC)
+{
+	zend_ini_entry *p = ini_entry;
+	zend_ini_entry *hashed_ini_entry;
+	zval default_value;
+
+	while (p->name) {
+		p->module_number = module_number;
+		if (zend_hash_add(registered_zend_ini_directives, p->name, p->name_length, p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry)==FAILURE) {
+			zend_unregister_ini_entries(module_number TSRMLS_CC);
+			return FAILURE;
+		}
+		if ((zend_get_configuration_directive(p->name, p->name_length, &default_value))==SUCCESS) {
+			if (!hashed_ini_entry->on_modify
+				|| hashed_ini_entry->on_modify(hashed_ini_entry, default_value.value.str.val, default_value.value.str.len, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC)==SUCCESS) {
+				hashed_ini_entry->value = default_value.value.str.val;
+				hashed_ini_entry->value_length = default_value.value.str.len;
+			}
+		} else {
+			if (hashed_ini_entry->on_modify) {
+				hashed_ini_entry->on_modify(hashed_ini_entry, hashed_ini_entry->value, hashed_ini_entry->value_length, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC);
+			}
+		}
+		p++;
+	}
+	return SUCCESS;
+}
+
+
+ZEND_API void zend_unregister_ini_entries(int module_number TSRMLS_DC)
+{
+	zend_hash_apply_with_argument(registered_zend_ini_directives, (apply_func_arg_t) zend_remove_ini_entries, (void *) &module_number TSRMLS_CC);
+}
+
+
+static int zend_ini_refresh_cache(zend_ini_entry *p, int stage TSRMLS_DC)
+{
+	if (p->on_modify) {
+		p->on_modify(p, p->value, p->value_length, p->mh_arg1, p->mh_arg2, p->mh_arg3, stage TSRMLS_CC);
+	}
+	return 0;
+}
+
+
+ZEND_API void zend_ini_refresh_caches(int stage TSRMLS_DC)
+{
+	zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) zend_ini_refresh_cache, (void *)(long) stage TSRMLS_CC);
+}
+
+
+ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage)
+{
+	zend_ini_entry *ini_entry;
+	char *duplicate;
+	TSRMLS_FETCH();
+
+	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
+		return FAILURE;
+	}
+
+	if (!(ini_entry->modifyable & modify_type)) {
+		return FAILURE;
+	}
+
+	duplicate = estrndup(new_value, new_value_length);
+	
+	if (!ini_entry->on_modify
+		|| ini_entry->on_modify(ini_entry, duplicate, new_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC)==SUCCESS) {
+		if (!ini_entry->modified) {
+			ini_entry->orig_value = ini_entry->value;
+			ini_entry->orig_value_length = ini_entry->value_length;
+		} else { /* we already changed the value, free the changed value */
+			efree(ini_entry->value);
+		}
+		ini_entry->value = duplicate;
+		ini_entry->value_length = new_value_length;
+		ini_entry->modified = 1;
+	} else {
+		efree(duplicate);
+	}
+
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage)
+{
+	zend_ini_entry *ini_entry;
+	TSRMLS_FETCH();
+
+	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
+		return FAILURE;
+	}
+
+	zend_restore_ini_entry_cb(ini_entry, stage TSRMLS_CC);
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_ini_register_displayer(char *name, uint name_length, void (*displayer)(zend_ini_entry *ini_entry, int type))
+{
+	zend_ini_entry *ini_entry;
+
+	if (zend_hash_find(registered_zend_ini_directives, name, name_length, (void **) &ini_entry)==FAILURE) {
+		return FAILURE;
+	}
+
+	ini_entry->displayer = displayer;
+	return SUCCESS;
+}
+
+
+
+/*
+ * Data retrieval
+ */
+
+ZEND_API long zend_ini_long(char *name, uint name_length, int orig)
+{
+	zend_ini_entry *ini_entry;
+	TSRMLS_FETCH();
+
+	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
+		if (orig && ini_entry->modified) {
+			return (ini_entry->orig_value ? strtol(ini_entry->orig_value, NULL, 0) : 0);
+		} else if (ini_entry->value) {
+			return strtol(ini_entry->value, NULL, 0);
+		}
+	}
+
+	return 0;
+}
+
+
+ZEND_API double zend_ini_double(char *name, uint name_length, int orig)
+{
+	zend_ini_entry *ini_entry;
+	TSRMLS_FETCH();
+
+	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
+		if (orig && ini_entry->modified) {
+			return (double) (ini_entry->orig_value ? strtod(ini_entry->orig_value, NULL) : 0.0);
+		} else if (ini_entry->value) {
+			return (double) strtod(ini_entry->value, NULL);
+		}
+	}
+
+	return 0.0;
+}
+
+
+ZEND_API char *zend_ini_string(char *name, uint name_length, int orig)
+{
+	zend_ini_entry *ini_entry;
+	TSRMLS_FETCH();
+
+	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
+		if (orig && ini_entry->modified) {
+			return ini_entry->orig_value;
+		} else {
+			return ini_entry->value;
+		}
+	}
+
+	return "";
+}
+
+
+static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
+{
+	if (ini_entry->displayer) {
+		ini_entry->displayer(ini_entry, type);
+	} else {
+		char *display_string;
+		uint display_string_length;
+
+		if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
+			if (ini_entry->orig_value) {
+				display_string = ini_entry->orig_value;
+				display_string_length = ini_entry->orig_value_length;
+			} else {
+				display_string = "<i>no value</i>";
+				display_string_length = sizeof("<i>no value</i>")-1;
+			}
+		} else if (ini_entry->value && ini_entry->value[0]) {
+			display_string = ini_entry->value;
+			display_string_length = ini_entry->value_length;
+		} else {
+			display_string = "<i>no value</i>";
+			display_string_length = sizeof("<i>no value</i>")-1;
+		}
+		ZEND_WRITE(display_string, display_string_length);
+	}
+}
+
+
+ZEND_INI_DISP(zend_ini_boolean_displayer_cb)
+{
+	int value;
+
+	if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = (ini_entry->orig_value ? atoi(ini_entry->orig_value) : 0);
+	} else if (ini_entry->value) {
+		value = atoi(ini_entry->value);
+	} else {
+		value = 0;
+	}
+	if (value) {
+		ZEND_PUTS("On");
+	} else {
+		ZEND_PUTS("Off");
+	}
+}
+
+
+ZEND_INI_DISP(zend_ini_color_displayer_cb)
+{
+	char *value;
+
+	if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+	if (value) {
+		zend_printf("<font color=\"%s\">%s</font>", value, value);
+	} else {
+		ZEND_PUTS("<i>no value</i>;");
+	}
+}
+
+
+ZEND_INI_DISP(display_link_numbers)
+{
+	char *value;
+
+	if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+
+	if (value) {
+		if (atoi(value)==-1) {
+			ZEND_PUTS("Unlimited");
+		} else {
+			zend_printf("%s", value);
+		}
+	}
+}
+
+
+/* Standard message handlers */
+
+ZEND_API ZEND_INI_MH(OnUpdateBool)
+{
+	zend_bool *p;
+#ifndef ZTS
+	char *base = (char *) mh_arg2;
+#else
+	char *base;
+
+	base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+	p = (zend_bool *) (base+(size_t) mh_arg1);
+
+	*p = (zend_bool) atoi(new_value);
+	return SUCCESS;
+}
+
+
+ZEND_API ZEND_INI_MH(OnUpdateInt)
+{
+	long *p;
+#ifndef ZTS
+	char *base = (char *) mh_arg2;
+#else
+	char *base;
+
+	base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+	p = (long *) (base+(size_t) mh_arg1);
+
+	*p = zend_atoi(new_value, new_value_length);
+	return SUCCESS;
+}
+
+
+ZEND_API ZEND_INI_MH(OnUpdateReal)
+{
+	double *p;
+#ifndef ZTS
+	char *base = (char *) mh_arg2;
+#else
+	char *base;
+
+	base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+	p = (double *) (base+(size_t) mh_arg1);
+
+	*p = strtod(new_value, NULL);
+	return SUCCESS;
+}
+
+
+ZEND_API ZEND_INI_MH(OnUpdateString)
+{
+	char **p;
+#ifndef ZTS
+	char *base = (char *) mh_arg2;
+#else
+	char *base;
+
+	base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+	p = (char **) (base+(size_t) mh_arg1);
+
+	*p = new_value;
+	return SUCCESS;
+}
+
+
+ZEND_API ZEND_INI_MH(OnUpdateStringUnempty)
+{
+	char **p;
+#ifndef ZTS
+	char *base = (char *) mh_arg2;
+#else
+	char *base;
+
+	base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+
+	if (new_value && !new_value[0]) {
+		return FAILURE;
+	}
+
+	p = (char **) (base+(size_t) mh_arg1);
+
+	*p = new_value;
+	return SUCCESS;
+}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_ini.h

@@ -0,0 +1,199 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Author: Zeev Suraski <zeev@zend.com>                                 |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_INI_H
+#define ZEND_INI_H
+
+#define ZEND_INI_USER	(1<<0)
+#define ZEND_INI_PERDIR	(1<<1)
+#define ZEND_INI_SYSTEM	(1<<2)
+
+#define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
+
+#ifndef XtOffsetOf
+# if defined(CRAY) || (defined(__arm) && !defined(LINUX))
+# ifdef __STDC__
+# define XtOffset(p_type,field) _Offsetof(p_type,field)
+# else
+# ifdef CRAY2
+# define XtOffset(p_type,field) \
+    (sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
+
+# else /* !CRAY2 */
+
+# define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
+
+# endif /* !CRAY2 */
+# endif /* __STDC__ */
+# else /* ! (CRAY || __arm) */
+
+# define XtOffset(p_type,field) \
+    ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
+
+# endif /* !CRAY */
+
+# ifdef offsetof
+# define XtOffsetOf(s_type,field) offsetof(s_type,field)
+# else
+# define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
+# endif
+
+#endif
+
+typedef struct _zend_ini_entry zend_ini_entry;
+
+#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, char *new_value, uint new_value_length, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage TSRMLS_DC)
+#define ZEND_INI_DISP(name) void name(zend_ini_entry *ini_entry, int type)
+
+struct _zend_ini_entry {
+	int module_number;
+	int modifyable;
+	char *name;
+	uint name_length;
+	ZEND_INI_MH((*on_modify));
+	void *mh_arg1;
+	void *mh_arg2;
+	void *mh_arg3;
+
+	char *value;
+	uint value_length;
+
+	char *orig_value;
+	uint orig_value_length;
+	int modified;
+
+	void (*displayer)(zend_ini_entry *ini_entry, int type);
+};
+
+
+ZEND_API int zend_ini_startup(TSRMLS_D);
+ZEND_API int zend_ini_shutdown(TSRMLS_D);
+ZEND_API int zend_ini_deactivate(TSRMLS_D);
+
+ZEND_API int zend_copy_ini_directives(TSRMLS_D);
+
+ZEND_API void zend_ini_sort_entries(TSRMLS_D);
+
+ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_number TSRMLS_DC);
+ZEND_API void zend_unregister_ini_entries(int module_number TSRMLS_DC);
+ZEND_API void zend_ini_refresh_caches(int stage TSRMLS_DC);
+ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage);
+ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage);
+ZEND_API void display_ini_entries(zend_module_entry *module);
+
+ZEND_API long zend_ini_long(char *name, uint name_length, int orig);
+ZEND_API double zend_ini_double(char *name, uint name_length, int orig);
+ZEND_API char *zend_ini_string(char *name, uint name_length, int orig);
+
+ZEND_API int zend_ini_register_displayer(char *name, uint name_length, void (*displayer)(zend_ini_entry *ini_entry, int type));
+
+ZEND_API ZEND_INI_DISP(zend_ini_boolean_displayer_cb);
+ZEND_API ZEND_INI_DISP(zend_ini_color_displayer_cb);
+ZEND_API ZEND_INI_DISP(display_link_numbers);
+
+#define ZEND_INI_BEGIN()		static zend_ini_entry ini_entries[] = {
+#define ZEND_INI_END()		{ 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } };
+
+#define ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, arg3, displayer) \
+	{ 0, modifyable, name, sizeof(name), on_modify, arg1, arg2, arg3, default_value, sizeof(default_value)-1, NULL, 0, 0, displayer },
+
+#define ZEND_INI_ENTRY3(name, default_value, modifyable, on_modify, arg1, arg2, arg3) \
+	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, arg3, NULL)
+
+#define ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, arg1, arg2, displayer) \
+	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, NULL, displayer)
+
+#define ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, arg1, arg2) \
+	ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, arg1, arg2, NULL)
+
+#define ZEND_INI_ENTRY1_EX(name, default_value, modifyable, on_modify, arg1, displayer) \
+	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, NULL, NULL, displayer)
+
+#define ZEND_INI_ENTRY1(name, default_value, modifyable, on_modify, arg1) \
+	ZEND_INI_ENTRY1_EX(name, default_value, modifyable, on_modify, arg1, NULL)
+	
+#define ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, displayer) \
+	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, NULL, NULL, NULL, displayer)
+
+#define ZEND_INI_ENTRY(name, default_value, modifyable, on_modify) \
+	ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, NULL)
+
+#ifdef ZTS
+#define STD_ZEND_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
+	ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id)
+#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \
+	ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, displayer)
+#define STD_ZEND_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
+	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, NULL, zend_ini_boolean_displayer_cb)
+#else
+#define STD_ZEND_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
+	ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr)
+#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \
+	ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, displayer)
+#define STD_ZEND_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
+	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, zend_ini_boolean_displayer_cb)
+#endif
+
+#define INI_INT(name) zend_ini_long((name), sizeof(name), 0)
+#define INI_FLT(name) zend_ini_double((name), sizeof(name), 0)
+#define INI_STR(name) zend_ini_string((name), sizeof(name), 0)
+#define INI_BOOL(name) ((zend_bool) INI_INT(name))
+
+#define INI_ORIG_INT(name)	zend_ini_long((name), sizeof(name), 1)
+#define INI_ORIG_FLT(name)	zend_ini_double((name), sizeof(name), 1)
+#define INI_ORIG_STR(name)	zend_ini_string((name), sizeof(name), 1)
+#define INI_ORIG_BOOL(name) ((zend_bool) INI_ORIG_INT(name))
+
+
+#define REGISTER_INI_ENTRIES() zend_register_ini_entries(ini_entries, module_number TSRMLS_CC)
+#define UNREGISTER_INI_ENTRIES() zend_unregister_ini_entries(module_number TSRMLS_CC)
+#define DISPLAY_INI_ENTRIES() display_ini_entries(zend_module)
+
+#define REGISTER_INI_DISPLAYER(name, displayer) zend_ini_register_displayer((name), sizeof(name), displayer)
+#define REGISTER_INI_BOOLEAN(name) REGISTER_INI_DISPLAYER(name, zend_ini_boolean_displayer_cb)
+
+/* Standard message handlers */
+ZEND_API ZEND_INI_MH(OnUpdateBool);
+ZEND_API ZEND_INI_MH(OnUpdateInt);
+ZEND_API ZEND_INI_MH(OnUpdateReal);
+ZEND_API ZEND_INI_MH(OnUpdateString);
+ZEND_API ZEND_INI_MH(OnUpdateStringUnempty);
+
+
+#define ZEND_INI_DISPLAY_ORIG	1
+#define ZEND_INI_DISPLAY_ACTIVE	2
+
+#define ZEND_INI_STAGE_STARTUP		(1<<0)
+#define ZEND_INI_STAGE_SHUTDOWN		(1<<1)
+#define ZEND_INI_STAGE_ACTIVATE		(1<<2)
+#define ZEND_INI_STAGE_DEACTIVATE	(1<<3)
+#define ZEND_INI_STAGE_RUNTIME		(1<<4)
+
+/* INI parsing engine */
+typedef void (*zend_ini_parser_cb_t)(zval *arg1, zval *arg2, int callback_type, void *arg);
+int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg);
+#define ZEND_INI_PARSER_ENTRY	1
+#define ZEND_INI_PARSER_SECTION	2
+
+typedef struct _zend_ini_parser_param {
+	zend_ini_parser_cb_t ini_parser_cb;
+	void *arg;
+} zend_ini_parser_param;
+
+#endif /* ZEND_INI_H */

Zend/zend_ini_parser.y

@@ -0,0 +1,236 @@
+%{
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Author: Zeev Suraski <zeev@zend.com>                                 |
+   +----------------------------------------------------------------------+
+*/
+
+
+/* $Id$ */
+
+#define DEBUG_CFG_PARSER 0
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_ini.h"
+#include "zend_constants.h"
+#include "zend_ini_scanner.h"
+#include "zend_extensions.h"
+
+
+#if WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <winbase.h>
+#endif
+
+#define YYSTYPE zval
+
+#ifdef ZTS
+#define YYPARSE_PARAM tsrm_ls
+#define YYLEX_PARAM tsrm_ls
+#endif
+
+#define ZEND_INI_PARSER_CB	(CG(ini_parser_param))->ini_parser_cb
+#define ZEND_INI_PARSER_ARG	(CG(ini_parser_param))->arg
+
+int ini_lex(zval *ini_lval TSRMLS_DC);
+#ifdef ZTS
+int ini_parse(void *arg);
+#else
+int ini_parse(void);
+#endif
+
+zval yylval;
+
+#ifndef ZTS
+extern int ini_lex(zval *ini_lval TSRMLS_DC);
+extern FILE *ini_in;
+extern int ini_lineno;
+extern void init_cfg_scanner(void);
+#endif
+
+void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
+{
+	int i_result;
+	int i_op1, i_op2;
+	char str_result[MAX_LENGTH_OF_LONG];
+
+	i_op1 = atoi(op1->value.str.val);
+	free(op1->value.str.val);
+	if (op2) {
+		i_op2 = atoi(op2->value.str.val);
+		free(op2->value.str.val);
+	} else {
+		i_op2 = 0;
+	}
+
+	switch (type) {
+		case '|':
+			i_result = i_op1 | i_op2;
+			break;
+		case '&':
+			i_result = i_op1 & i_op2;
+			break;
+		case '~':
+			i_result = ~i_op1;
+			break;
+		case '!':
+			i_result = !i_op1;
+			break;
+		default:
+			i_result = 0;
+			break;
+	}
+
+	result->value.str.len = zend_sprintf(str_result, "%d", i_result);
+	result->value.str.val = (char *) malloc(result->value.str.len+1);
+	memcpy(result->value.str.val, str_result, result->value.str.len);
+	result->value.str.val[result->value.str.len] = 0;
+	result->type = IS_STRING;
+}
+
+
+void zend_ini_get_constant(zval *result, zval *name)
+{
+	zval z_constant;
+	TSRMLS_FETCH();
+
+	if (zend_get_constant(name->value.str.val, name->value.str.len, &z_constant TSRMLS_CC)) {
+		/* z_constant is emalloc()'d */
+		convert_to_string(&z_constant);
+		result->value.str.val = zend_strndup(z_constant.value.str.val, z_constant.value.str.len);
+		result->value.str.len = z_constant.value.str.len;
+		result->type = z_constant.type;
+		zval_dtor(&z_constant);
+		free(name->value.str.val);	
+	} else {
+		*result = *name;
+	}
+}
+
+
+static void ini_error(char *str)
+{
+	char *error_buf;
+	int error_buf_len;
+	char *currently_parsed_filename;
+	TSRMLS_FETCH();
+
+	currently_parsed_filename = zend_ini_scanner_get_filename(TSRMLS_C);
+	error_buf_len = 128+strlen(currently_parsed_filename); /* should be more than enough */
+	error_buf = (char *) emalloc(error_buf_len);
+
+	sprintf(error_buf, "Error parsing %s on line %d\n", currently_parsed_filename, zend_ini_scanner_get_lineno(TSRMLS_C));
+
+	if (CG(ini_parser_unbuffered_errors)) {
+#ifdef PHP_WIN32
+		MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
+#else
+		fprintf(stderr, "PHP:  %s", error_buf);
+#endif
+	} else {
+		zend_error(E_CORE_WARNING, error_buf);
+	}
+	efree(error_buf);
+}
+
+
+int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg)
+{
+	int retval;
+	zend_ini_parser_param ini_parser_param;
+	TSRMLS_FETCH();
+
+	ini_parser_param.ini_parser_cb = ini_parser_cb;
+	ini_parser_param.arg = arg;
+
+	CG(ini_parser_param) = &ini_parser_param;
+	if (zend_ini_open_file_for_scanning(fh TSRMLS_CC)==FAILURE) {
+		return FAILURE;
+	}
+
+	CG(ini_parser_unbuffered_errors) = unbuffered_errors;
+	retval = ini_parse(TSRMLS_C);
+
+	zend_ini_close_file(fh TSRMLS_CC);
+
+	if (retval==0) {
+		return SUCCESS;
+	} else {
+		return FAILURE;
+	}
+}
+
+
+%}
+
+%pure_parser
+%token TC_STRING
+%token TC_ENCAPSULATED_STRING
+%token SECTION
+%token CFG_TRUE
+%token CFG_FALSE
+%left '|' '&'
+%right '~' '!'
+
+%%
+
+statement_list:
+		statement_list statement
+	|	/* empty */
+;
+
+statement:
+		TC_STRING '=' string_or_value {
+#if DEBUG_CFG_PARSER
+			printf("'%s' = '%s'\n", $1.value.str.val, $3.value.str.val);
+#endif
+			ZEND_INI_PARSER_CB(&$1, &$3, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG);
+			free($1.value.str.val);
+			free($3.value.str.val);
+		}
+	|	TC_STRING { ZEND_INI_PARSER_CB(&$1, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG); free($1.value.str.val); }
+	|	SECTION { ZEND_INI_PARSER_CB(&$1, NULL, ZEND_INI_PARSER_SECTION, ZEND_INI_PARSER_ARG); free($1.value.str.val); }
+	|	'\n'
+;
+
+
+string_or_value:
+		expr { $$ = $1; }
+	|	TC_ENCAPSULATED_STRING { $$ = $1; }
+	|	CFG_TRUE { $$ = $1; }
+	|	CFG_FALSE { $$ = $1; }
+	|	'\n' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
+	|	'\0' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
+;
+
+expr:
+		constant_string			{ $$ = $1; }
+	|	expr '|' expr			{ zend_ini_do_op('|', &$$, &$1, &$3); }
+	|	expr '&' expr			{ zend_ini_do_op('&', &$$, &$1, &$3); }
+	|	'~' expr				{ zend_ini_do_op('~', &$$, &$2, NULL); }
+	|	'!'	expr				{ zend_ini_do_op('!', &$$, &$2, NULL); }
+	|	'(' expr ')'			{ $$ = $2; }
+;
+
+constant_string:
+		TC_STRING { zend_ini_get_constant(&$$, &$1); }
+;
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_ini_scanner.h

@@ -0,0 +1,24 @@
+#ifndef _ZEND_INI_SCANNER_H
+#define _ZEND_INI_SCANNER_H
+
+#if defined(ZTS) && defined(__cplusplus)
+class ZendIniFlexLexer : public yyFlexLexer
+{
+public:
+	virtual ~ZendIniFlexLexer();
+	int lex_scan(zval *zendlval);
+	void BeginState(int state);
+
+	char *filename;
+};
+#endif	/* ZTS && __cplusplus */
+
+BEGIN_EXTERN_C()
+int zend_ini_scanner_get_lineno(TSRMLS_D);
+char *zend_ini_scanner_get_filename(TSRMLS_D);
+int zend_ini_open_file_for_scanning(zend_file_handle *fh TSRMLS_DC);
+void zend_ini_close_file(zend_file_handle *fh TSRMLS_DC);
+int ini_lex(zval *ini_lval TSRMLS_DC);
+END_EXTERN_C()
+
+#endif /* _ZEND_INI_SCANNER_H */

Zend/zend_ini_scanner.l

@@ -0,0 +1,289 @@
+%{
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Author: Zeev Suraski <zeev@zend.com>                                 |
+   +----------------------------------------------------------------------+
+*/
+
+#include "zend.h"
+#include "zend_globals.h"
+#include "zend_ini_parser.h"
+#include "zend_ini_scanner.h"
+
+#ifdef __cplusplus
+# ifdef HAVE_STDIOSTR_H
+#  include <stdiostr.h>
+# endif
+# ifdef HAVE_STDIOSTREAM_H
+#  include <stdiostream.h>
+# endif
+# ifdef ZEND_WIN32
+#  include <strstrea.h>
+# else
+#  include <strstream.h>
+# endif
+#endif
+
+#undef YYSTYPE
+#define YYSTYPE zval
+
+#ifdef __cplusplus
+#define YY_DECL int ZendIniFlexLexer::lex_scan(zval *ini_lval TSRMLS_DC)
+#else
+#define YY_DECL int ini_lex(zval *ini_lval TSRMLS_DC)
+#endif
+
+/* Globals Macros */
+#define SCNG	INI_SCNG
+#ifdef ZTS
+ZEND_API ts_rsrc_id ini_scanner_globals_id;
+#else
+ZEND_API zend_scanner_globals ini_scanner_globals;
+#endif
+
+
+#ifndef __cplusplus
+static char *ini_filename;
+
+void init_ini_scanner()
+{
+	ini_lineno=1;
+}
+
+
+int zend_ini_scanner_get_lineno(TSRMLS_D)
+{
+	return ini_lineno;
+}
+
+
+char *zend_ini_scanner_get_filename(TSRMLS_D)
+{
+	return ini_filename;
+}
+
+#else /* ZTS */
+
+int zend_ini_scanner_get_lineno(TSRMLS_D)
+{
+	return CG(ini_scanner)->lineno();
+}
+
+char *zend_ini_scanner_get_filename(TSRMLS_D)
+{
+	return CG(ini_scanner)->filename;
+}
+
+int ini_lex(zval *ini_lval)
+{
+	TSRMLS_FETCH();
+
+	return CG(ini_scanner)->lex_scan(ini_lval);
+}
+
+ZendIniFlexLexer::~ZendIniFlexLexer()
+{
+	if (yy_start_stack) {
+		yy_flex_free(yy_start_stack);
+	}
+}
+
+int yyFlexLexer::yylex()
+{
+	fprintf(stderr, "Error:  yyFlexLexer::yylex() called\n");
+	return -1;
+}
+
+#endif
+
+
+int zend_ini_open_file_for_scanning(zend_file_handle *fh TSRMLS_DC)
+{
+	FILE *fp;
+
+	switch (fh->type) {
+		case ZEND_HANDLE_FP:
+			fp = fh->handle.fp;
+			break;
+		case ZEND_HANDLE_FILENAME:
+			fp = zend_fopen(fh->filename, NULL);
+			fh->type = ZEND_HANDLE_FP;
+			break;
+		default:
+			return FAILURE;
+	}
+
+#ifdef __cplusplus
+	if (!fp) {
+		return FAILURE;
+	}
+	fh->handle.is = new istdiostream(fp);
+	fh->type = ZEND_HANDLE_STDIOSTREAM;
+
+	CG(ini_scanner) = new ZendIniFlexLexer;
+	CG(ini_scanner)->switch_streams(fh->handle.is, &cout);
+	CG(ini_scanner)->filename = fh->filename;
+#else
+	init_ini_scanner();
+	yyin = fp;
+	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE TSRMLS_CC) TSRMLS_CC);
+	ini_filename = fh->filename;
+#endif
+	return SUCCESS;
+}
+
+
+void zend_ini_close_file(zend_file_handle *fh TSRMLS_DC)
+{
+	switch (fh->type) {
+		case ZEND_HANDLE_FP:
+			fclose(fh->handle.fp);
+			break;
+#ifdef __cplusplus
+		case ZEND_HANDLE_STDIOSTREAM: {
+				TSRMLS_FETCH();
+				delete CG(ini_scanner);
+			}
+			break;
+#endif
+	}
+}
+
+%}
+
+NEWLINE ("\r"|"\n"|"\r\n")
+
+%option noyywrap
+%option yylineno
+
+%%
+
+
+<INITIAL>[ ]*("true"|"on"|"yes")[ ]* {
+	ini_lval->value.str.val = zend_strndup("1",1);
+	ini_lval->value.str.len = 1;
+	ini_lval->type = IS_STRING;
+	return CFG_TRUE;
+}
+
+
+<INITIAL>[ ]*("false"|"off"|"no"|"none")[ ]* {
+	ini_lval->value.str.val = zend_strndup("",0);
+	ini_lval->value.str.len = 0;
+	ini_lval->type = IS_STRING;
+	return CFG_FALSE;
+}
+
+<INITIAL>[[][^[]+[\]]{NEWLINE}? {
+	/* SECTION */
+
+	/* eat trailng ] */
+	while (yyleng>0 && (yytext[yyleng-1]=='\n' || yytext[yyleng-1]=='\r' || yytext[yyleng-1]==']')) {
+		yyleng--;
+		yytext[yyleng]=0;
+	}
+
+	/* eat leading [ */
+	yytext++;
+	yyleng--;
+
+	ini_lval->value.str.val = zend_strndup(yytext,yyleng);
+	ini_lval->value.str.len = yyleng;
+	ini_lval->type = IS_STRING;
+	return SECTION;
+}
+
+
+<INITIAL>["][^\n\r"]*["] {
+	/* ENCAPSULATED TC_STRING */
+
+	/* eat trailing " */
+	yytext[yyleng-1]=0;
+	
+	/* eat leading " */
+	yytext++;
+
+	ini_lval->value.str.val = zend_strndup(yytext, yyleng - 2);
+	ini_lval->value.str.len = yyleng - 2;
+	ini_lval->type = IS_STRING;
+	return TC_ENCAPSULATED_STRING;
+}
+
+<INITIAL>[&|~()!] {
+	return yytext[0];
+}
+
+
+<INITIAL>[^=\n\r\t;|&~()!"]+ {
+	/* STRING */
+	register int i;
+
+	/* eat trailing whitespace */
+	for (i=yyleng-1; i>=0; i--) {
+		if (yytext[i]==' ' || yytext[i]=='\t') {
+			yytext[i]=0;
+			yyleng--;
+		} else {
+			break;
+		}
+	}
+	/* eat leading whitespace */
+	while (yytext[0]) {
+		if (yytext[0]==' ' || yytext[0]=='\t') {
+			yytext++;
+			yyleng--;
+		} else {
+			break;
+		}
+	}
+	if (yyleng!=0) {
+		ini_lval->value.str.val = zend_strndup(yytext,yyleng);
+		ini_lval->value.str.len = yyleng;
+		ini_lval->type = IS_STRING;
+		return TC_STRING;
+	} else {
+		/* whitespace */
+	}
+}
+
+
+
+<INITIAL>[=\n] {
+	return yytext[0];
+}
+
+<INITIAL>{NEWLINE} {
+	return '\n';
+}
+
+<INITIAL>[;][^\r\n]*{NEWLINE}? {
+	/* comment */
+	return '\n';
+}
+
+<INITIAL>[ \t] {
+	/* eat whitespace */
+}
+
+<INITIAL>. {
+#if DEBUG
+	php_error(E_NOTICE,"Unexpected character on line %d:  '%s' (ASCII %d)\n",yylineno,yytext,yytext[0]);
+#endif
+}
+
+<<EOF>> {
+	yy_delete_buffer(YY_CURRENT_BUFFER TSRMLS_CC);
+	yyterminate();
+}

Zend/zend_istdiostream.h

@@ -0,0 +1,15 @@
+#ifndef _ZEND_STDIOSTREAM
+#define _ZEND_STDIOSTREAM
+
+#if defined(ZTS) && !defined(HAVE_CLASS_ISTDIOSTREAM)
+class istdiostream : public istream
+{
+private:
+	stdiobuf _file;
+public:
+	istdiostream (FILE* __f) : istream(), _file(__f) { init(&_file); }
+	stdiobuf* rdbuf()/* const */ { return &_file; }
+};
+#endif
+
+#endif

Zend/zend_language_parser.y

@@ -0,0 +1,722 @@
+%{
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* 
+ * LALR shift/reduce conflicts and how they are resolved:
+ *
+ * - 2 shift/reduce conflicts due to the dangeling elseif/else ambiguity.  Solved by shift.
+ * - 1 shift/reduce conflict due to arrays within encapsulated strings. Solved by shift. 
+ * - 1 shift/reduce conflict due to objects within encapsulated strings.  Solved by shift.
+ * 
+ */
+
+
+#include "zend_compile.h"
+#include "zend.h"
+#include "zend_list.h"
+#include "zend_globals.h"
+#include "zend_API.h"
+
+#define YYERROR_VERBOSE
+#define YYSTYPE znode
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+
+
+%}
+
+%pure_parser
+%expect 4
+
+%left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
+%left ','
+%left T_LOGICAL_OR
+%left T_LOGICAL_XOR
+%left T_LOGICAL_AND
+%right T_PRINT
+%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL
+%left '?' ':'
+%left T_BOOLEAN_OR
+%left T_BOOLEAN_AND
+%left '|'
+%left '^'
+%left '&'
+%nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL
+%nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
+%left T_SL T_SR
+%left '+' '-' '.'
+%left '*' '/' '%'
+%right '!' '~' T_INC T_DEC T_INT_CAST T_DOUBLE_CAST T_STRING_CAST T_ARRAY_CAST T_OBJECT_CAST T_BOOL_CAST T_UNSET_CAST '@'
+%right '['
+%nonassoc T_NEW
+%token T_EXIT
+%token T_IF
+%left T_ELSEIF
+%left T_ELSE
+%left T_ENDIF
+%token T_LNUMBER
+%token T_DNUMBER
+%token T_STRING
+%token T_STRING_VARNAME
+%token T_VARIABLE
+%token T_NUM_STRING
+%token T_INLINE_HTML
+%token T_CHARACTER
+%token T_BAD_CHARACTER
+%token T_ENCAPSED_AND_WHITESPACE
+%token T_CONSTANT_ENCAPSED_STRING
+%token T_ECHO
+%token T_DO
+%token T_WHILE
+%token T_ENDWHILE
+%token T_FOR
+%token T_ENDFOR
+%token T_FOREACH
+%token T_ENDFOREACH
+%token T_DECLARE
+%token T_ENDDECLARE
+%token T_AS
+%token T_SWITCH
+%token T_ENDSWITCH
+%token T_CASE
+%token T_DEFAULT
+%token T_BREAK
+%token T_CONTINUE
+%token T_OLD_FUNCTION
+%token T_FUNCTION
+%token T_CONST
+%token T_RETURN
+%token T_USE
+%token T_GLOBAL
+%token T_STATIC
+%token T_VAR
+%token T_UNSET
+%token T_ISSET
+%token T_EMPTY
+%token T_CLASS
+%token T_EXTENDS
+%token T_OBJECT_OPERATOR
+%token T_DOUBLE_ARROW
+%token T_LIST
+%token T_ARRAY
+%token T_LINE
+%token T_FILE
+%token T_COMMENT
+%token T_ML_COMMENT
+%token T_OPEN_TAG
+%token T_OPEN_TAG_WITH_ECHO
+%token T_CLOSE_TAG
+%token T_WHITESPACE
+%token T_START_HEREDOC
+%token T_END_HEREDOC
+%token T_DOLLAR_OPEN_CURLY_BRACES
+%token T_CURLY_OPEN
+%token T_PAAMAYIM_NEKUDOTAYIM
+
+%% /* Rules */
+
+start:
+	top_statement_list
+;
+
+top_statement_list:
+		top_statement_list  { zend_do_extended_info(TSRMLS_C); } top_statement { HANDLE_INTERACTIVE(); }
+	|	/* empty */
+;
+
+
+top_statement:
+		statement
+	|	declaration_statement	{ zend_do_early_binding(TSRMLS_C); }
+;
+
+
+inner_statement_list:
+		inner_statement_list  { zend_do_extended_info(TSRMLS_C); } inner_statement { HANDLE_INTERACTIVE(); }
+	|	/* empty */
+;
+
+
+inner_statement:
+		statement
+	|	declaration_statement
+;
+
+
+statement:
+		unticked_statement { zend_do_ticks(TSRMLS_C); }
+;
+
+
+unticked_statement:
+		'{' inner_statement_list '}'
+	|	T_IF '(' expr ')' { zend_do_if_cond(&$3, &$4 TSRMLS_CC); } statement { zend_do_if_after_statement(&$4, 1 TSRMLS_CC); } elseif_list else_single { zend_do_if_end(TSRMLS_C); }
+	|	T_IF '(' expr ')' ':' { zend_do_if_cond(&$3, &$4 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$4, 1 TSRMLS_CC); } new_elseif_list new_else_single T_ENDIF ';' { zend_do_if_end(TSRMLS_C); }
+	|	T_WHILE '(' { $1.u.opline_num = get_next_op_number(CG(active_op_array));  } expr  ')' { zend_do_while_cond(&$4, &$5 TSRMLS_CC); } while_statement { zend_do_while_end(&$1, &$5 TSRMLS_CC); }
+	|	T_DO { $1.u.opline_num = get_next_op_number(CG(active_op_array));  zend_do_do_while_begin(TSRMLS_C); } statement T_WHILE '(' { $5.u.opline_num = get_next_op_number(CG(active_op_array)); } expr ')' ';' { zend_do_do_while_end(&$1, &$5, &$7 TSRMLS_CC); }
+	|	T_FOR 
+			'('
+				for_expr
+			';' { zend_do_free(&$3 TSRMLS_CC); $4.u.opline_num = get_next_op_number(CG(active_op_array)); }
+				for_expr
+			';' { zend_do_extended_info(TSRMLS_C); zend_do_for_cond(&$6, &$7 TSRMLS_CC); }
+				for_expr
+			')' { zend_do_free(&$9 TSRMLS_CC); zend_do_for_before_statement(&$4, &$7 TSRMLS_CC); }
+			for_statement { zend_do_for_end(&$7 TSRMLS_CC); }
+	|	T_SWITCH '(' expr ')'	{ zend_do_switch_cond(&$3 TSRMLS_CC); } switch_case_list { zend_do_switch_end(&$6 TSRMLS_CC); }
+	|	T_BREAK ';'				{ zend_do_brk_cont(ZEND_BRK, NULL TSRMLS_CC); }
+	|	T_BREAK expr ';'		{ zend_do_brk_cont(ZEND_BRK, &$2 TSRMLS_CC); }
+	|	T_CONTINUE ';'			{ zend_do_brk_cont(ZEND_CONT, NULL TSRMLS_CC); }
+	|	T_CONTINUE expr ';'		{ zend_do_brk_cont(ZEND_CONT, &$2 TSRMLS_CC); }
+	|	T_RETURN ';'						{ zend_do_return(NULL, 0 TSRMLS_CC); }
+	|	T_RETURN expr_without_variable ';'	{ zend_do_return(&$2, 0 TSRMLS_CC); }
+	|	T_RETURN cvar ';'					{ zend_do_return(&$2, 1 TSRMLS_CC); }
+	|	T_GLOBAL global_var_list ';'
+	|	T_STATIC static_var_list ';'
+	|	T_ECHO echo_expr_list ';'
+	|	T_INLINE_HTML			{ zend_do_echo(&$1 TSRMLS_CC); }
+	|	expr ';'				{ zend_do_free(&$1 TSRMLS_CC); }
+	|	T_USE use_filename ';'		{ zend_error(E_COMPILE_ERROR,"use: Not yet supported. Please use include_once() or require_once()");  zval_dtor(&$2.u.constant); }
+	|	T_UNSET '(' unset_variables ')' ';'
+	|	T_FOREACH '(' w_cvar T_AS { zend_do_foreach_begin(&$1, &$3, &$2, &$4, 1 TSRMLS_CC); } w_cvar foreach_optional_arg ')' { zend_do_foreach_cont(&$6, &$7, &$4 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$2 TSRMLS_CC); }
+	|	T_FOREACH '(' expr_without_variable T_AS { zend_do_foreach_begin(&$1, &$3, &$2, &$4, 0 TSRMLS_CC); } w_cvar foreach_optional_arg ')' { zend_do_foreach_cont(&$6, &$7, &$4 TSRMLS_CC); } foreach_statement { zend_do_foreach_end(&$1, &$2 TSRMLS_CC); }
+	|	T_DECLARE { zend_do_declare_begin(TSRMLS_C); } '(' declare_list ')' declare_statement { zend_do_declare_end(TSRMLS_C); }
+	|	';'		/* empty statement */
+;
+
+unset_variables:
+		unset_variable
+	|	unset_variables ',' unset_variable
+;
+
+unset_variable:
+		cvar	{ zend_do_end_variable_parse(BP_VAR_UNSET, 0 TSRMLS_CC); zend_do_unset(&$1 TSRMLS_CC); }
+;
+
+use_filename:
+		T_CONSTANT_ENCAPSED_STRING			{ $$ = $1; }
+	|	'(' T_CONSTANT_ENCAPSED_STRING ')'	{ $$ = $2; }
+;
+
+
+declaration_statement:
+		unticked_declaration_statement	{ zend_do_ticks(TSRMLS_C); }
+;
+
+
+unticked_declaration_statement:
+		T_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$4, 0, $3.op_type TSRMLS_CC); }
+			'(' parameter_list ')' '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
+	|	T_OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING  { zend_do_begin_function_declaration(&$1, &$4, 0, $3.op_type TSRMLS_CC); }
+			parameter_list '(' inner_statement_list ')' ';' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
+	|	T_CLASS T_STRING { zend_do_begin_class_declaration(&$2, NULL TSRMLS_CC); } '{' class_statement_list '}' { zend_do_end_class_declaration(TSRMLS_C); }
+	|	T_CLASS T_STRING T_EXTENDS T_STRING { zend_do_begin_class_declaration(&$2, &$4 TSRMLS_CC); } '{' class_statement_list '}' { zend_do_end_class_declaration(TSRMLS_C); }
+;
+
+
+foreach_optional_arg:
+		/* empty */				{ $$.op_type = IS_UNUSED; }
+	|	T_DOUBLE_ARROW w_cvar	{ $$ = $2; }
+;
+
+
+for_statement:
+		statement
+	|	':' inner_statement_list T_ENDFOR ';'
+;
+
+
+foreach_statement:
+		statement
+	|	':' inner_statement_list T_ENDFOREACH ';'
+;
+
+
+declare_statement:
+		statement
+	|	':' inner_statement_list T_ENDDECLARE ';'
+;
+
+
+declare_list:
+		T_STRING '=' static_scalar					{ zend_do_declare_stmt(&$1, &$3 TSRMLS_CC); }
+	|	declare_list ',' T_STRING '=' static_scalar	{ zend_do_declare_stmt(&$3, &$5 TSRMLS_CC); }
+;
+
+
+switch_case_list:
+		'{' case_list '}'					{ $$ = $2; }
+	|	'{' ';' case_list '}'				{ $$ = $3; }
+	|	':' case_list T_ENDSWITCH ';'		{ $$ = $2; }
+	|	':' ';' case_list T_ENDSWITCH ';'	{ $$ = $3; }
+;
+
+
+case_list:
+		/* empty */	{ $$.op_type = IS_UNUSED; }
+	|	case_list T_CASE expr case_separator { zend_do_extended_info(TSRMLS_C);  zend_do_case_before_statement(&$1, &$2, &$3 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST }
+	|	case_list T_DEFAULT case_separator { zend_do_extended_info(TSRMLS_C);  zend_do_default_before_statement(&$1, &$2 TSRMLS_CC); } inner_statement_list { zend_do_case_after_statement(&$$, &$2 TSRMLS_CC); $$.op_type = IS_CONST; }
+;
+
+
+case_separator:
+		':'
+	|	';'
+;
+
+
+while_statement:
+		statement
+	|	':' inner_statement_list T_ENDWHILE ';'
+;
+
+
+
+elseif_list:
+		/* empty */
+	|	elseif_list T_ELSEIF '(' expr ')' { zend_do_if_cond(&$4, &$5 TSRMLS_CC); } statement { zend_do_if_after_statement(&$5, 0 TSRMLS_CC); }
+;
+
+
+new_elseif_list:
+		/* empty */
+	|	new_elseif_list T_ELSEIF '(' expr ')' ':' { zend_do_if_cond(&$4, &$5 TSRMLS_CC); } inner_statement_list { zend_do_if_after_statement(&$5, 0 TSRMLS_CC); }
+;
+
+
+else_single:
+		/* empty */
+	|	T_ELSE statement
+;
+
+
+new_else_single:
+		/* empty */
+	|	T_ELSE ':' inner_statement_list
+;
+
+
+parameter_list: 
+		non_empty_parameter_list
+	|	/* empty */
+;
+
+
+non_empty_parameter_list:
+		T_VARIABLE				{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 TSRMLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); zend_do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE TSRMLS_CC); }
+	|	'&' T_VARIABLE			{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 TSRMLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); zend_do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE TSRMLS_CC); }
+	|	T_CONST T_VARIABLE 		{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 TSRMLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); zend_do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE TSRMLS_CC); }
+	|	T_VARIABLE '=' static_scalar				{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 TSRMLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=1; $$.u.constant.type=IS_LONG; INIT_PZVAL(&$$.u.constant); zend_do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$3, BYREF_NONE TSRMLS_CC); }
+	|	non_empty_parameter_list ',' T_VARIABLE 	{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 TSRMLS_CC); $$=$1; $$.u.constant.value.lval++; zend_do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE TSRMLS_CC); }
+	|	non_empty_parameter_list ',' '&' T_VARIABLE	{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 TSRMLS_CC); $$=$1; $$.u.constant.value.lval++; zend_do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE TSRMLS_CC); }
+	|	non_empty_parameter_list ',' T_CONST T_VARIABLE				{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 TSRMLS_CC); $$=$1; $$.u.constant.value.lval++; zend_do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE TSRMLS_CC); }
+	|	non_empty_parameter_list ',' T_VARIABLE '=' static_scalar 	{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 TSRMLS_CC); $$=$1; $$.u.constant.value.lval++; zend_do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$5, BYREF_NONE TSRMLS_CC); }
+;
+
+
+function_call_parameter_list:
+		non_empty_function_call_parameter_list	{ $$ = $1; }
+	|	/* empty */				{ $$.u.constant.value.lval = 0; }
+;
+
+
+non_empty_function_call_parameter_list:
+		expr_without_variable	{ $$.u.constant.value.lval = 1;  zend_do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval TSRMLS_CC); }
+	|	cvar					{ $$.u.constant.value.lval = 1;  zend_do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval TSRMLS_CC); }
+	|	'&' w_cvar 				{ $$.u.constant.value.lval = 1;  zend_do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval TSRMLS_CC); }
+	|	non_empty_function_call_parameter_list ',' expr_without_variable	{ $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval TSRMLS_CC); }
+	|	non_empty_function_call_parameter_list ',' cvar						{ $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval TSRMLS_CC); }
+	|	non_empty_function_call_parameter_list ',' '&' w_cvar				{ $$.u.constant.value.lval=$1.u.constant.value.lval+1;  zend_do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval TSRMLS_CC); }
+;
+
+global_var_list:
+		global_var_list ',' global_var	{ zend_do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_GLOBAL TSRMLS_CC); }
+	|	global_var						{ zend_do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_GLOBAL TSRMLS_CC); }
+;
+
+
+global_var:
+		T_VARIABLE			{ $$ = $1; }
+	|	'$' r_cvar			{ $$ = $2; }
+	|	'$' '{' expr '}'	{ $$ = $3; }
+;
+
+
+static_var_list:
+		static_var_list ',' T_VARIABLE { zend_do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_STATIC TSRMLS_CC); }
+	|	static_var_list ',' T_VARIABLE '=' static_scalar { zend_do_fetch_global_or_static_variable(&$3, &$5, ZEND_FETCH_STATIC TSRMLS_CC); }
+	|	T_VARIABLE  { zend_do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_STATIC TSRMLS_CC); }
+	|	T_VARIABLE '=' static_scalar { zend_do_fetch_global_or_static_variable(&$1, &$3, ZEND_FETCH_STATIC TSRMLS_CC); }
+
+;
+
+
+class_statement_list:
+		class_statement_list class_statement
+	|	/* empty */
+;
+
+
+class_statement:
+		T_VAR class_variable_decleration ';'
+	|	T_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$4, 1, $3.op_type TSRMLS_CC); } '(' 
+			parameter_list ')' '{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
+	|	T_OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING { zend_do_begin_function_declaration(&$1, &$4, 1, $3.op_type TSRMLS_CC); }
+			parameter_list '(' inner_statement_list ')' ';' { zend_do_end_function_declaration(&$1 TSRMLS_CC); }
+
+;
+
+is_reference:
+		/* empty */	{ $$.op_type = ZEND_RETURN_VAL; }
+	|	'&'			{ $$.op_type = ZEND_RETURN_REF; }
+
+class_variable_decleration:
+		class_variable_decleration ',' T_VARIABLE					{ zend_do_declare_property(&$3, NULL TSRMLS_CC); }
+	|	class_variable_decleration ',' T_VARIABLE '=' static_scalar	{ zend_do_declare_property(&$3, &$5 TSRMLS_CC); }
+	|	T_VARIABLE						{ zend_do_declare_property(&$1, NULL TSRMLS_CC); }
+	|	T_VARIABLE '=' static_scalar	{ zend_do_declare_property(&$1, &$3 TSRMLS_CC); }
+;
+
+
+echo_expr_list:	
+	|	echo_expr_list ',' expr { zend_do_echo(&$3 TSRMLS_CC); }
+	|	expr					{ zend_do_echo(&$1 TSRMLS_CC); }
+;
+
+
+for_expr:
+		/* empty */			{ $$.op_type = IS_CONST;  $$.u.constant.type = IS_BOOL;  $$.u.constant.value.lval = 1; }
+	|	non_empty_for_expr	{ $$ = $1; }
+;
+
+non_empty_for_expr:
+		non_empty_for_expr ','	{ zend_do_free(&$1 TSRMLS_CC); } expr { $$ = $4; }
+	|	expr					{ $$ = $1; }
+;
+
+
+expr_without_variable:	
+		T_LIST '(' { zend_do_list_init(TSRMLS_C); } assignment_list ')' '=' expr { zend_do_list_end(&$$, &$7 TSRMLS_CC); }
+	|	cvar '=' expr		{ zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign(&$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar '=' '&' w_cvar	{ zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$4 TSRMLS_CC); }
+	|	cvar '=' '&' function_call { zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$4 TSRMLS_CC); }
+	|	cvar '=' '&' T_NEW static_or_variable_string { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$4, &$5 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$3, &$5, &$4, &$7 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); zend_do_assign_ref(&$$, &$1, &$3 TSRMLS_CC); }
+	|	T_NEW static_or_variable_string { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_new_object(&$1, &$2 TSRMLS_CC); } ctor_arguments { zend_do_end_new_object(&$$, &$2, &$1, &$4 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+	|	cvar T_PLUS_EQUAL expr 	{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_ADD, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_MINUS_EQUAL expr	{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SUB, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_MUL_EQUAL expr		{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_MUL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_DIV_EQUAL expr		{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_DIV, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_CONCAT_EQUAL expr	{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_CONCAT, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_MOD_EQUAL expr		{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_MOD, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_AND_EQUAL expr		{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_AND, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_OR_EQUAL expr 		{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_OR, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_XOR_EQUAL expr 		{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 TSRMLS_CC); }
+	|	cvar T_SL_EQUAL expr	{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SL, &$$, &$1, &$3 TSRMLS_CC); } 
+	|	cvar T_SR_EQUAL expr	{ zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); zend_do_binary_assign_op(ZEND_ASSIGN_SR, &$$, &$1, &$3 TSRMLS_CC); } 
+	|	rw_cvar T_INC { zend_do_post_incdec(&$$, &$1, ZEND_POST_INC TSRMLS_CC); }
+	|	T_INC rw_cvar { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_INC TSRMLS_CC); }
+	|	rw_cvar T_DEC { zend_do_post_incdec(&$$, &$1, ZEND_POST_DEC TSRMLS_CC); }
+	|	T_DEC rw_cvar { zend_do_pre_incdec(&$$, &$2, ZEND_PRE_DEC TSRMLS_CC); }
+	|	expr T_BOOLEAN_OR { zend_do_boolean_or_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_or_end(&$$, &$1, &$4, &$2 TSRMLS_CC); }
+	|	expr T_BOOLEAN_AND { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); }  
+	|	expr T_LOGICAL_OR { zend_do_boolean_or_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_or_end(&$$, &$1, &$4, &$2 TSRMLS_CC); }
+	|	expr T_LOGICAL_AND { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } expr { zend_do_boolean_and_end(&$$, &$1, &$4, &$2 TSRMLS_CC); }
+	|	expr T_LOGICAL_XOR expr { zend_do_binary_op(ZEND_BOOL_XOR, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr '|' expr	{ zend_do_binary_op(ZEND_BW_OR, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr '&' expr	{ zend_do_binary_op(ZEND_BW_AND, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr '^' expr	{ zend_do_binary_op(ZEND_BW_XOR, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr '.' expr 	{ zend_do_binary_op(ZEND_CONCAT,&$$,&$1,&$3 TSRMLS_CC); }
+	|	expr '+' expr 	{ zend_do_binary_op(ZEND_ADD,&$$,&$1,&$3 TSRMLS_CC); }
+	|	expr '-' expr 	{ zend_do_binary_op(ZEND_SUB,&$$,&$1,&$3 TSRMLS_CC); }
+	|	expr '*' expr	{ zend_do_binary_op(ZEND_MUL,&$$,&$1,&$3 TSRMLS_CC); }
+	|	expr '/' expr	{ zend_do_binary_op(ZEND_DIV,&$$,&$1,&$3 TSRMLS_CC); }
+	|	expr '%' expr 	{ zend_do_binary_op(ZEND_MOD,&$$,&$1,&$3 TSRMLS_CC); }
+	| 	expr T_SL expr	{ zend_do_binary_op(ZEND_SL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr T_SR expr	{ zend_do_binary_op(ZEND_SR, &$$, &$1, &$3 TSRMLS_CC); }
+	|	'+' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); zend_do_binary_op(ZEND_ADD, &$$, &$1, &$2 TSRMLS_CC); }
+	|	'-' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; INIT_PZVAL(&$1.u.constant); zend_do_binary_op(ZEND_SUB, &$$, &$1, &$2 TSRMLS_CC); }
+	|	'!' expr { zend_do_unary_op(ZEND_BOOL_NOT, &$$, &$2 TSRMLS_CC); }
+	|	'~' expr { zend_do_unary_op(ZEND_BW_NOT, &$$, &$2 TSRMLS_CC); }
+	|	expr T_IS_IDENTICAL expr		{ zend_do_binary_op(ZEND_IS_IDENTICAL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr T_IS_NOT_IDENTICAL expr	{ zend_do_binary_op(ZEND_IS_NOT_IDENTICAL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr T_IS_EQUAL expr			{ zend_do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr T_IS_NOT_EQUAL expr 		{ zend_do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr '<' expr 					{ zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr T_IS_SMALLER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 TSRMLS_CC); }
+	|	expr '>' expr 					{ zend_do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 TSRMLS_CC); }
+	|	expr T_IS_GREATER_OR_EQUAL expr { zend_do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 TSRMLS_CC); }
+	|	'(' expr ')' 	{ $$ = $2; }
+	|	expr '?' { zend_do_begin_qm_op(&$1, &$2 TSRMLS_CC); }
+		expr ':' { zend_do_qm_true(&$4, &$2, &$5 TSRMLS_CC); }
+		expr	 { zend_do_qm_false(&$$, &$7, &$2, &$5 TSRMLS_CC); }
+	|	function_call { $$ = $1; }
+	|	internal_functions_in_yacc { $$ = $1; }
+	|	T_INT_CAST expr 	{ zend_do_cast(&$$, &$2, IS_LONG TSRMLS_CC); }
+	|	T_DOUBLE_CAST expr 	{ zend_do_cast(&$$, &$2, IS_DOUBLE TSRMLS_CC); }
+	|	T_STRING_CAST expr	{ zend_do_cast(&$$, &$2, IS_STRING TSRMLS_CC); } 
+	|	T_ARRAY_CAST expr 	{ zend_do_cast(&$$, &$2, IS_ARRAY TSRMLS_CC); }
+	|	T_OBJECT_CAST expr 	{ zend_do_cast(&$$, &$2, IS_OBJECT TSRMLS_CC); }
+	|	T_BOOL_CAST expr	{ zend_do_cast(&$$, &$2, IS_BOOL TSRMLS_CC); }
+	|	T_UNSET_CAST expr	{ zend_do_cast(&$$, &$2, IS_NULL TSRMLS_CC); }
+	|	T_EXIT exit_expr	{ zend_do_exit(&$$, &$2 TSRMLS_CC); }
+	|	'@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr { zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; }
+	|	scalar				{ $$ = $1; }
+	|	T_ARRAY '(' array_pair_list ')' { $$ = $3; }
+	|	'`' encaps_list '`'		{ zend_do_shell_exec(&$$, &$2 TSRMLS_CC); }
+	|	T_PRINT expr  { zend_do_print(&$$, &$2 TSRMLS_CC); }
+;
+
+function_call:
+		T_STRING	'(' { $2.u.opline_num = zend_do_begin_function_call(&$1 TSRMLS_CC); }
+				function_call_parameter_list
+				')' { zend_do_end_function_call(&$1, &$$, &$4, 0, $2.u.opline_num TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C); }
+	|	cvar '(' { zend_do_begin_dynamic_function_call(&$1 TSRMLS_CC); } 
+				function_call_parameter_list 
+				')' { zend_do_end_function_call(&$1, &$$, &$4, 0, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+	|	T_STRING T_PAAMAYIM_NEKUDOTAYIM static_or_variable_string '(' { zend_do_extended_fcall_begin(TSRMLS_C); zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); } 
+											function_call_parameter_list 
+											')' { zend_do_end_function_call(&$3, &$$, &$6, 1, 1 TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);}
+;
+
+
+static_or_variable_string:
+		T_STRING	{ $$ = $1; }
+	|	r_cvar		{ $$ = $1; }
+;
+
+
+exit_expr:
+		/* empty */	{ memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }	
+	|	'(' ')'		{ memset(&$$, 0, sizeof(znode)); $$.op_type = IS_UNUSED; }	
+	|	'(' expr ')'	{ $$ = $2; }
+;
+
+
+ctor_arguments:
+		/* empty */	{ $$.u.constant.value.lval=0; }
+	|	'(' function_call_parameter_list ')'	{ $$ = $2; }
+;
+
+
+common_scalar:
+		T_LNUMBER 					{ $$ = $1; }
+	|	T_DNUMBER 					{ $$ = $1; }
+	|	T_CONSTANT_ENCAPSED_STRING	{ $$ = $1; }
+	|	T_LINE 						{ $$ = $1; }
+	|	T_FILE 						{ $$ = $1; }
+;
+
+
+static_scalar: /* compile-time evaluated scalars */
+		common_scalar		{ $$ = $1; }
+	|	T_STRING 		{ zend_do_fetch_constant(&$$, &$1, ZEND_CT TSRMLS_CC); }
+	|	'+' static_scalar	{ $$ = $1; }
+	|	'-' static_scalar	{ zval minus_one;  minus_one.type = IS_LONG; minus_one.value.lval = -1;  mul_function(&$2.u.constant, &$2.u.constant, &minus_one TSRMLS_CC);  $$ = $2; }
+	|	T_ARRAY '(' static_array_pair_list ')' { $$ = $3; $$.u.constant.type = IS_CONSTANT_ARRAY; }
+;
+
+
+scalar:
+		T_STRING 				{ zend_do_fetch_constant(&$$, &$1, ZEND_RT TSRMLS_CC); }
+	|	T_STRING_VARNAME		{ $$ = $1; }
+	|	common_scalar			{ $$ = $1; }
+	|	'"' encaps_list '"' 	{ $$ = $2; }
+	|	'\'' encaps_list '\''	{ $$ = $2; }
+	|	T_START_HEREDOC encaps_list T_END_HEREDOC { $$ = $2; zend_do_end_heredoc(TSRMLS_C); }
+;
+
+
+static_array_pair_list:
+		/* empty */ { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); }
+	|	non_empty_static_array_pair_list possible_comma	{ $$ = $1; }
+;
+
+possible_comma:
+		/* empty */
+	|	','
+;
+
+non_empty_static_array_pair_list:
+		non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW static_scalar	{ zend_do_add_static_array_element(&$$, &$3, &$5); }
+	|	non_empty_static_array_pair_list ',' static_scalar { zend_do_add_static_array_element(&$$, NULL, &$3); }
+	|	static_scalar T_DOUBLE_ARROW static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); zend_do_add_static_array_element(&$$, &$1, &$3); }
+	|	static_scalar { $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); zend_do_add_static_array_element(&$$, NULL, &$1); }
+;
+
+expr:
+		r_cvar					{ $$ = $1; }
+	|	expr_without_variable	{ $$ = $1; }
+;
+
+
+r_cvar:
+	cvar { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); $$ = $1; }
+;
+
+
+w_cvar:
+	cvar { zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); $$ = $1; }
+;
+
+
+rw_cvar:
+	cvar { zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); $$ = $1; }
+;
+
+
+cvar:
+		cvar_without_objects { $$ = $1; }
+	|	cvar_without_objects T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } ref_list { $$ = $4; }
+;
+
+
+cvar_without_objects:
+		reference_variable { $$ = $1; }
+	|	simple_indirect_reference reference_variable { zend_do_indirect_references(&$$, &$1, &$2 TSRMLS_CC); }
+;
+
+
+reference_variable:
+		reference_variable '[' dim_offset ']'	{ fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
+	|	reference_variable '{' expr '}'		{ fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); }
+	|	compound_variable			{ zend_do_fetch_globals(&$1 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); }
+;
+	
+
+compound_variable:
+		T_VARIABLE			{ $$ = $1; }
+	|	'$' '{' expr '}'	{ $$ = $3; }
+;
+
+dim_offset:
+		/* empty */		{ $$.op_type = IS_UNUSED; }
+	|	expr			{ $$ = $1; }
+;
+
+ref_list:
+		object_property  { $$ = $1; }
+	|	ref_list T_OBJECT_OPERATOR { zend_do_push_object(&$1 TSRMLS_CC); } object_property { $$ = $4; }
+;
+
+object_property:
+		object_dim_list { $$ = $1; }
+	|	cvar_without_objects { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); } { znode tmp_znode;  zend_do_pop_object(&tmp_znode TSRMLS_CC);  zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);}
+;
+
+object_dim_list:
+		object_dim_list '[' dim_offset ']'	{ fetch_array_dim(&$$, &$1, &$3 TSRMLS_CC); }
+	|	object_dim_list '{' expr '}'		{ fetch_string_offset(&$$, &$1, &$3 TSRMLS_CC); }
+	|	variable_name { znode tmp_znode;  zend_do_pop_object(&tmp_znode TSRMLS_CC);  zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);}
+;
+
+variable_name:
+		T_STRING		{ $$ = $1; }
+	|	'{' expr '}'	{ $$ = $2; }
+;
+
+
+simple_indirect_reference:
+		'$' { $$.u.constant.value.lval = 1; }
+	|	simple_indirect_reference '$' { $$.u.constant.value.lval++; }
+;
+
+assignment_list:
+		assignment_list ',' assignment_list_element
+	|	assignment_list_element
+;
+
+
+assignment_list_element:
+		cvar								{ zend_do_add_list_element(&$1 TSRMLS_CC); }
+	|	T_LIST '(' { zend_do_new_list_begin(TSRMLS_C); } assignment_list ')'	{ zend_do_new_list_end(TSRMLS_C); }
+	|	/* empty */							{ zend_do_add_list_element(NULL TSRMLS_CC); }
+;
+
+
+array_pair_list:
+		/* empty */ { zend_do_init_array(&$$, NULL, NULL, 0 TSRMLS_CC); }
+	|	non_empty_array_pair_list possible_comma	{ $$ = $1; }
+;
+
+non_empty_array_pair_list:
+		non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr	{ zend_do_add_array_element(&$$, &$5, &$3, 0 TSRMLS_CC); }
+	|	non_empty_array_pair_list ',' expr			{ zend_do_add_array_element(&$$, &$3, NULL, 0 TSRMLS_CC); }
+	|	expr T_DOUBLE_ARROW expr	{ zend_do_init_array(&$$, &$3, &$1, 0 TSRMLS_CC); }
+	|	expr 				{ zend_do_init_array(&$$, &$1, NULL, 0 TSRMLS_CC); }
+	|	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_cvar { zend_do_add_array_element(&$$, &$6, &$3, 1 TSRMLS_CC); }
+	|	non_empty_array_pair_list ',' '&' w_cvar { zend_do_add_array_element(&$$, &$4, NULL, 1 TSRMLS_CC); }
+	|	expr T_DOUBLE_ARROW '&' w_cvar	{ zend_do_init_array(&$$, &$4, &$1, 1 TSRMLS_CC); }
+	|	'&' w_cvar 			{ zend_do_init_array(&$$, &$2, NULL, 1 TSRMLS_CC); }
+;
+
+encaps_list:
+		encaps_list encaps_var { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC);  zend_do_add_variable(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list T_STRING			{ zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list T_NUM_STRING		{ zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list T_ENCAPSED_AND_WHITESPACE	{ zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list T_CHARACTER 		{ zend_do_add_char(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list T_BAD_CHARACTER		{ zend_do_add_string(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list '['		{ $2.u.constant.value.lval = (long) '['; zend_do_add_char(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list ']'		{ $2.u.constant.value.lval = (long) ']'; zend_do_add_char(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list '{'		{ $2.u.constant.value.lval = (long) '{'; zend_do_add_char(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list '}'		{ $2.u.constant.value.lval = (long) '}'; zend_do_add_char(&$$, &$1, &$2 TSRMLS_CC); }
+	|	encaps_list T_OBJECT_OPERATOR  { znode tmp;  $2.u.constant.value.lval = (long) '-';  zend_do_add_char(&tmp, &$1, &$2 TSRMLS_CC);  $2.u.constant.value.lval = (long) '>'; zend_do_add_char(&$$, &tmp, &$2 TSRMLS_CC); }
+	|	/* empty */			{ zend_do_init_string(&$$ TSRMLS_CC); }
+
+;
+
+
+
+encaps_var:
+		T_VARIABLE { zend_do_fetch_globals(&$1 TSRMLS_CC); zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); }
+	|	T_VARIABLE '[' { zend_do_begin_variable_parse(TSRMLS_C); } encaps_var_offset ']'	{ zend_do_fetch_globals(&$1 TSRMLS_CC);  fetch_array_begin(&$$, &$1, &$4 TSRMLS_CC); }
+	|	T_VARIABLE T_OBJECT_OPERATOR T_STRING { zend_do_begin_variable_parse(TSRMLS_C); fetch_simple_variable(&$2, &$1, 1 TSRMLS_CC); zend_do_fetch_property(&$$, &$2, &$3 TSRMLS_CC); }
+	|	T_DOLLAR_OPEN_CURLY_BRACES expr '}' { zend_do_begin_variable_parse(TSRMLS_C);  fetch_simple_variable(&$$, &$2, 1 TSRMLS_CC); }
+	|	T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}' { zend_do_begin_variable_parse(TSRMLS_C);  fetch_array_begin(&$$, &$2, &$4 TSRMLS_CC); }
+	|	T_CURLY_OPEN cvar '}' { $$ = $2; }
+;
+
+
+encaps_var_offset:
+		T_STRING		{ $$ = $1; }
+	|	T_NUM_STRING	{ $$ = $1; }
+	|	T_VARIABLE		{ fetch_simple_variable(&$$, &$1, 1 TSRMLS_CC); }
+;
+
+
+internal_functions_in_yacc:
+		T_ISSET '(' isset_variables ')' { $$ = $3; }
+	|	T_EMPTY '(' cvar ')'	{ zend_do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 TSRMLS_CC); }
+	|	T_INCLUDE expr 			{ zend_do_include_or_eval(ZEND_INCLUDE, &$$, &$2 TSRMLS_CC); }
+	|	T_INCLUDE_ONCE expr 	{ zend_do_include_or_eval(ZEND_INCLUDE_ONCE, &$$, &$2 TSRMLS_CC); }
+	|	T_EVAL '(' expr ')' 	{ zend_do_include_or_eval(ZEND_EVAL, &$$, &$3 TSRMLS_CC); }
+	|	T_REQUIRE expr			{ zend_do_include_or_eval(ZEND_REQUIRE, &$$, &$2 TSRMLS_CC); }
+	|	T_REQUIRE_ONCE expr		{ zend_do_include_or_eval(ZEND_REQUIRE_ONCE, &$$, &$2 TSRMLS_CC); }
+;
+
+isset_variables:
+		cvar 				{ zend_do_isset_or_isempty(ZEND_ISSET, &$$, &$1 TSRMLS_CC); }
+	|	isset_variables ',' { zend_do_boolean_and_begin(&$1, &$2 TSRMLS_CC); } cvar { znode tmp; zend_do_isset_or_isempty(ZEND_ISSET, &tmp, &$4 TSRMLS_CC); zend_do_boolean_and_end(&$$, &$1, &tmp, &$2 TSRMLS_CC); }
+;	
+
+%%
+

Zend/zend_language_scanner.h

@@ -0,0 +1,55 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_SCANNER_H
+#define ZEND_SCANNER_H
+
+#ifdef __cplusplus
+class ZendFlexLexer : public yyFlexLexer
+{
+public:
+	virtual ~ZendFlexLexer();
+	int lex_scan(zval *zendlval TSRMLS_DC);
+	void BeginState(int state);
+};
+
+#endif	/* ZTS */
+
+
+typedef struct _zend_lex_state {
+#ifndef __cplusplus
+	YY_BUFFER_STATE buffer_state;
+	int state;
+	FILE *in;
+#else
+	ZendFlexLexer *ZFL;
+	istream *input_file;
+#endif
+	uint lineno;
+	char *filename;
+} zend_lex_state;
+
+
+void zend_fatal_scanner_error(char *);
+BEGIN_EXTERN_C()
+int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *fh2);
+END_EXTERN_C()
+
+#endif

Zend/zend_list.c

@@ -0,0 +1,391 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+/* resource lists */
+
+#include "zend.h"
+#include "zend_list.h"
+#include "zend_API.h"
+#include "zend_globals.h"
+
+ZEND_API int le_index_ptr;
+
+/* true global */
+static HashTable list_destructors;
+
+
+ZEND_API int zend_list_insert(void *ptr, int type)
+{
+	int index;
+	zend_rsrc_list_entry le;
+	TSRMLS_FETCH();
+
+	le.ptr=ptr;
+	le.type=type;
+	le.refcount=1;
+
+	index = zend_hash_next_free_element(&EG(regular_list));
+	zend_hash_index_update(&EG(regular_list), index, (void *) &le, sizeof(zend_rsrc_list_entry), NULL);
+	return index;
+}
+
+ZEND_API int _zend_list_delete(int id TSRMLS_DC)
+{
+	zend_rsrc_list_entry *le;
+	
+	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
+/*		printf("del(%d): %d->%d\n", id, le->refcount, le->refcount-1); */
+		if (--le->refcount<=0) {
+			return zend_hash_index_del(&EG(regular_list), id);
+		} else {
+			return SUCCESS;
+		}
+	} else {
+		return FAILURE;
+	}
+}
+
+
+ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC)
+{
+	zend_rsrc_list_entry *le;
+
+	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
+		*type = le->type;
+		return le->ptr;
+	} else {
+		*type = -1;
+		return NULL;
+	}
+}
+
+
+ZEND_API int _zend_list_addref(int id TSRMLS_DC)
+{
+	zend_rsrc_list_entry *le;
+	
+	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
+/*		printf("add(%d): %d->%d\n", id, le->refcount, le->refcount+1); */
+		le->refcount++;
+		return SUCCESS;
+	} else {
+		return FAILURE;
+	}
+}
+
+
+ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type)
+{
+	int rsrc_id;
+
+	rsrc_id = zend_list_insert(rsrc_pointer, rsrc_type);
+	
+	if (rsrc_result) {
+		rsrc_result->value.lval = rsrc_id;
+		rsrc_result->type = IS_RESOURCE;
+	}
+
+	return rsrc_id;
+}
+
+
+ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...)
+{
+	int id;
+	int actual_resource_type;
+	void *resource;
+	va_list resource_types;
+	int i;
+
+	if (default_id==-1) { /* use id */
+		if (!passed_id) {
+			if (resource_type_name) {
+				zend_error(E_WARNING, "No %s resource supplied", resource_type_name);
+			}
+			return NULL;
+		} else if ((*passed_id)->type != IS_RESOURCE) {
+			if (resource_type_name) {
+				zend_error(E_WARNING, "Supplied argument is not a valid %s resource", resource_type_name);
+			}
+			return NULL;
+		}
+		id = (*passed_id)->value.lval;
+	} else {
+		id = default_id;
+	}
+
+	resource = zend_list_find(id, &actual_resource_type);
+	if (!resource) {
+		if (resource_type_name) {
+			zend_error(E_WARNING, "%d is not a valid %s resource", id, resource_type_name);
+		}
+		return NULL;
+	}
+
+	va_start(resource_types, num_resource_types);
+	for (i=0; i<num_resource_types; i++) {
+		if (actual_resource_type == va_arg(resource_types, int)) {
+			va_end(resource_types);
+			if (found_resource_type) {
+				*found_resource_type = actual_resource_type;
+			}
+			return resource;
+		}
+	}
+	va_end(resource_types);
+
+	if (resource_type_name) {
+		zend_error(E_WARNING, "Supplied resource is not a valid %s resource", resource_type_name);
+	}
+
+	return NULL;
+}
+
+
+void list_entry_destructor(void *ptr)
+{
+	zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
+	zend_rsrc_list_dtors_entry *ld;
+	TSRMLS_FETCH();
+	
+	if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
+		switch (ld->type) {
+			case ZEND_RESOURCE_LIST_TYPE_STD:
+				if (ld->list_dtor) {
+					(ld->list_dtor)(le->ptr);
+				}
+				break;
+			case ZEND_RESOURCE_LIST_TYPE_EX:
+				if (ld->list_dtor_ex) {
+					ld->list_dtor_ex(le TSRMLS_CC);
+				}
+				break;
+			EMPTY_SWITCH_DEFAULT_CASE()
+		}
+	} else {
+		zend_error(E_WARNING,"Unknown list entry type in request shutdown (%d)",le->type);
+	}
+}
+
+
+void plist_entry_destructor(void *ptr)
+{
+	zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
+	zend_rsrc_list_dtors_entry *ld;
+	TSRMLS_FETCH();
+
+	if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
+		switch (ld->type) {
+			case ZEND_RESOURCE_LIST_TYPE_STD:
+				if (ld->plist_dtor) {
+					(ld->plist_dtor)(le->ptr);
+				}
+				break;
+			case ZEND_RESOURCE_LIST_TYPE_EX:
+				if (ld->plist_dtor_ex) {
+					ld->plist_dtor_ex(le TSRMLS_CC);
+				}
+				break;
+				EMPTY_SWITCH_DEFAULT_CASE()
+		}
+	} else {
+		zend_error(E_WARNING,"Unknown persistent list entry type in module shutdown (%d)",le->type);
+	}
+}
+
+
+int zend_init_rsrc_list(TSRMLS_D)
+{
+	if (zend_hash_init(&EG(regular_list), 0, NULL, list_entry_destructor, 0)==SUCCESS) {
+		EG(regular_list).nNextFreeElement=1;	/* we don't want resource id 0 */
+		return SUCCESS;
+	} else {
+		return FAILURE;
+	}
+}
+
+
+int zend_init_rsrc_plist(TSRMLS_D)
+{
+	return zend_hash_init_ex(&EG(persistent_list), 0, NULL, plist_entry_destructor, 1, 0);
+}
+
+
+void zend_destroy_rsrc_list(HashTable *ht TSRMLS_DC)
+{
+	Bucket *p, *q;
+
+	while (1) {
+		p = ht->pListTail;
+		if (!p) {
+			break;
+		}
+		q = p->pListLast;
+		if (q) {
+			q->pListNext = NULL;
+		}
+		ht->pListTail = q;
+
+		if (ht->pDestructor) {
+			zend_try {
+				ht->pDestructor(p->pData);
+			} zend_end_try();
+		}
+		if (!p->pDataPtr && p->pData) {
+			pefree(p->pData, ht->persistent);
+		}
+		pefree(p, ht->persistent);
+	}
+	pefree(ht->arBuckets, ht->persistent);
+}
+
+
+static int clean_module_resource(zend_rsrc_list_entry *le, int *resource_id TSRMLS_DC)
+{
+	if (le->type == *resource_id) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry *ld, int *module_number TSRMLS_DC)
+{
+	if (ld->module_number == *module_number) {
+		zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) clean_module_resource, (void *) &(ld->resource_id) TSRMLS_CC);
+		zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) clean_module_resource, (void *) &(ld->resource_id) TSRMLS_CC);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+void zend_clean_module_rsrc_dtors(int module_number TSRMLS_DC)
+{
+	zend_hash_apply_with_argument(&list_destructors, (apply_func_arg_t) zend_clean_module_rsrc_dtors_cb, (void *) &module_number TSRMLS_CC);
+}
+
+
+ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number)
+{
+	zend_rsrc_list_dtors_entry lde;
+	
+#if 0
+	printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
+#endif
+	
+	lde.list_dtor=(void (*)(void *)) ld;
+	lde.plist_dtor=(void (*)(void *)) pld;
+	lde.list_dtor_ex = lde.plist_dtor_ex = NULL;
+	lde.module_number = module_number;
+	lde.resource_id = list_destructors.nNextFreeElement;
+	lde.type = ZEND_RESOURCE_LIST_TYPE_STD;
+	lde.type_name = NULL;
+	
+	if (zend_hash_next_index_insert(&list_destructors, (void *) &lde, sizeof(zend_rsrc_list_dtors_entry), NULL)==FAILURE) {
+		return FAILURE;
+	}
+	return list_destructors.nNextFreeElement-1;
+}
+
+
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, char *type_name, int module_number)
+{
+	zend_rsrc_list_dtors_entry lde;
+	
+#if 0
+	printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
+#endif
+
+	lde.list_dtor = NULL;
+	lde.plist_dtor = NULL;
+	lde.list_dtor_ex = ld;
+	lde.plist_dtor_ex = pld;
+	lde.module_number = module_number;
+	lde.resource_id = list_destructors.nNextFreeElement;
+	lde.type = ZEND_RESOURCE_LIST_TYPE_EX;
+	lde.type_name = type_name;
+	
+	if (zend_hash_next_index_insert(&list_destructors,(void *) &lde, sizeof(zend_rsrc_list_dtors_entry),NULL)==FAILURE) {
+		return FAILURE;
+	}
+	return list_destructors.nNextFreeElement-1;
+}
+
+ZEND_API int zend_fetch_list_dtor_id(char *type_name)
+{
+	zend_rsrc_list_dtors_entry *lde;
+	HashPosition pos;
+
+	zend_hash_internal_pointer_reset_ex(&list_destructors, &pos);
+	while(zend_hash_get_current_data_ex(&list_destructors, (void **)&lde, &pos) == SUCCESS) {
+		if(strcmp(type_name, lde->type_name) == 0) {
+#if 0
+			printf("Found resource id %d for resource type %s\n",(*lde).resource_id,type_name);
+#endif
+			return lde->resource_id;
+		}
+		zend_hash_move_forward_ex(&list_destructors, &pos);
+	}
+
+	return 0;
+}
+
+int zend_init_rsrc_list_dtors(void)
+{
+	int retval;
+
+	retval = zend_hash_init(&list_destructors, 50, NULL, NULL, 1);
+	list_destructors.nNextFreeElement=1;	/* we don't want resource type 0 */
+
+	return retval;
+}
+
+
+void zend_destroy_rsrc_list_dtors(void)
+{
+	zend_hash_destroy(&list_destructors);
+}
+
+
+char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC)
+{
+	zend_rsrc_list_dtors_entry *lde;
+	int rsrc_type;
+
+	if (!zend_list_find(resource, &rsrc_type))
+		return NULL;
+
+	if (zend_hash_index_find(&list_destructors, rsrc_type, (void **) &lde)==SUCCESS) {
+		return lde->type_name;
+	} else {
+		return NULL;
+	}
+}
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_list.h

@@ -0,0 +1,113 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_LIST_H
+#define ZEND_LIST_H
+
+#include "zend_hash.h"
+#include "zend_globals.h"
+
+
+#define ZEND_RESOURCE_LIST_TYPE_STD	1
+#define ZEND_RESOURCE_LIST_TYPE_EX	2
+
+typedef struct _zend_rsrc_list_entry {
+	void *ptr;
+	int type;
+	int refcount;
+} zend_rsrc_list_entry;
+
+typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+#define ZEND_RSRC_DTOR_FUNC(name)		void name(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+
+typedef struct _zend_rsrc_list_dtors_entry {
+	/* old style destructors */
+	void (*list_dtor)(void *);
+	void (*plist_dtor)(void *);
+
+	/* new style destructors */
+	rsrc_dtor_func_t list_dtor_ex;
+	rsrc_dtor_func_t plist_dtor_ex;
+
+	char *type_name;
+
+	int module_number;
+	int resource_id;
+	unsigned char type;
+} zend_rsrc_list_dtors_entry;
+
+
+#define register_list_destructors(ld, pld) zend_register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
+ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, char *type_name, int module_number);
+
+enum list_entry_type {
+	LE_DB=1000
+};
+
+void list_entry_destructor(void *ptr);
+void plist_entry_destructor(void *ptr);
+
+void zend_clean_module_rsrc_dtors(int module_number TSRMLS_DC);
+int zend_init_rsrc_list(TSRMLS_D);
+int zend_init_rsrc_plist(TSRMLS_D);
+void zend_destroy_rsrc_list(HashTable *ht TSRMLS_DC);
+int zend_init_rsrc_list_dtors(void);
+void zend_destroy_rsrc_list_dtors(void);
+
+ZEND_API int zend_list_insert(void *ptr, int type);
+ZEND_API int _zend_list_addref(int id TSRMLS_DC);
+ZEND_API int _zend_list_delete(int id TSRMLS_DC);
+ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC);
+
+#define zend_list_addref(id)		_zend_list_addref(id TSRMLS_CC)
+#define zend_list_delete(id)		_zend_list_delete(id TSRMLS_CC)
+#define zend_list_find(id, type)	_zend_list_find(id, type TSRMLS_CC)
+
+ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
+ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
+
+ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC);
+ZEND_API int zend_fetch_list_dtor_id(char *type_name);
+
+extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
+
+#define ZEND_VERIFY_RESOURCE(rsrc)		\
+	if (!rsrc) {						\
+		RETURN_NULL();					\
+	}
+
+#define ZEND_FETCH_RESOURCE(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type)	\
+	rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 1, resource_type);	\
+	ZEND_VERIFY_RESOURCE(rsrc);
+
+#define ZEND_FETCH_RESOURCE2(rsrc, rsrc_type, passed_id, default_id, resource_type_name, resource_type1,resource_type2)	\
+	rsrc = (rsrc_type) zend_fetch_resource(passed_id TSRMLS_CC, default_id, resource_type_name, NULL, 2, resource_type1, resource_type2);	\
+	ZEND_VERIFY_RESOURCE(rsrc);
+
+#define ZEND_REGISTER_RESOURCE(rsrc_result, rsrc_pointer, rsrc_type)  \
+    zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type);
+
+#define ZEND_GET_RESOURCE_TYPE_ID(le_id, le_type_name) \
+    if (le_id == 0) {                                  \
+        le_id = zend_fetch_list_dtor_id(le_type_name); \
+	}
+
+#endif

Zend/zend_llist.c

@@ -0,0 +1,294 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend.h"
+#include "zend_llist.h"
+
+ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
+{
+	l->head = NULL;
+	l->tail = NULL;
+	l->size = size;
+	l->dtor = dtor;
+	l->persistent = persistent;
+}
+
+
+ZEND_API void zend_llist_add_element(zend_llist *l, void *element)
+{
+	zend_llist_element *tmp = pemalloc(sizeof(zend_llist_element)+l->size-1, l->persistent);
+
+	tmp->prev = l->tail;
+	tmp->next = NULL;
+	if (l->tail) {
+		l->tail->next = tmp;
+	} else {
+		l->head = tmp;
+	}
+	l->tail = tmp;
+	memcpy(tmp->data, element, l->size);
+}
+
+
+ZEND_API void zend_llist_prepend_element(zend_llist *l, void *element)
+{
+	zend_llist_element *tmp = pemalloc(sizeof(zend_llist_element)+l->size-1, l->persistent);
+
+	tmp->next = l->head;
+	tmp->prev = NULL;
+	if (l->head) {
+		l->head->prev = tmp;
+	} else {
+		l->tail = tmp;
+	}
+	l->head = tmp;
+	memcpy(tmp->data, element, l->size);
+}
+
+
+#define DEL_LLIST_ELEMENT(current,l) \
+			if (current->prev) {\
+				current->prev->next = current->next;\
+			} else {\
+				l->head = current->next;\
+			}\
+			if (current->next) {\
+				current->next->prev = current->prev;\
+			} else {\
+				l->tail = current->prev;\
+			}\
+			if (l->dtor) {\
+				l->dtor(current->data);\
+				pefree(current, l->persistent);\
+			}
+
+
+ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare)(void *element1, void *element2))
+{
+	zend_llist_element *current=l->head;
+
+	while (current) {
+		if (compare(current->data, element)) {
+			DEL_LLIST_ELEMENT(current,l);
+			break;
+		}
+		current = current->next;
+	}
+}
+
+
+ZEND_API void zend_llist_destroy(zend_llist *l)
+{
+	zend_llist_element *current=l->head, *next;
+	
+	while (current) {
+		next = current->next;
+		if (l->dtor) {
+			l->dtor(current->data);
+		}
+		pefree(current, l->persistent);
+		current = next;
+	}
+}
+
+
+ZEND_API void zend_llist_clean(zend_llist *l)
+{
+	zend_llist_destroy(l);
+	l->head = l->tail = NULL;
+}
+
+
+ZEND_API void zend_llist_remove_tail(zend_llist *l)
+{
+	zend_llist_element *old_tail;
+
+	if ((old_tail = l->tail)) {
+		if (l->tail->prev) {
+			l->tail->prev->next = NULL;
+		}
+		l->tail = l->tail->prev;
+		pefree(old_tail, l->persistent);
+	}
+}
+
+
+ZEND_API void zend_llist_copy(zend_llist *dst, zend_llist *src)
+{
+	zend_llist_element *ptr;
+
+	zend_llist_init(dst, src->size, src->dtor, src->persistent);
+	ptr = src->head;
+	while (ptr) {
+		zend_llist_add_element(dst, ptr->data);
+		ptr = ptr->next;
+	}
+}
+
+
+ZEND_API void zend_llist_apply_with_del(zend_llist *l, int (*func)(void *data))
+{
+	zend_llist_element *element, *next;
+
+	element=l->head;
+	while (element) {
+		next = element->next;
+		if (func(element->data)) {
+			DEL_LLIST_ELEMENT(element,l);
+		}
+		element = next;
+	}
+}
+
+
+ZEND_API void zend_llist_apply(zend_llist *l, llist_apply_func_t func TSRMLS_DC)
+{
+	zend_llist_element *element;
+
+	for (element=l->head; element; element=element->next) {
+		func(element->data TSRMLS_CC);
+	}
+}
+
+ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func)
+{
+	int list_size=0, i;
+
+	zend_llist_element **elements;
+	zend_llist_element *element, **ptr;
+
+	for (element=l->head; element; element=element->next) {
+		list_size++;
+	}
+
+	if (list_size == 0) {
+		return;
+	}
+
+	elements = (zend_llist_element **) emalloc(list_size*sizeof(zend_llist_element *));
+
+	ptr = &elements[0];
+
+	for (element=l->head; element; element=element->next) {
+		*ptr++ = element;
+	}
+
+	qsort(elements, list_size, sizeof(zend_llist_element *), (int (*)(const void *, const void *)) comp_func);
+
+	l->head = elements[0];
+	elements[0]->prev = NULL;
+
+	for (i=1; i<list_size; i++) {
+		elements[i]->prev = elements[i-1];
+		elements[i-1]->next = elements[i];
+	}
+	elements[i-1]->next = NULL;
+	l->tail = elements[i-1];
+	efree(elements);
+}
+
+
+ZEND_API void zend_llist_apply_with_argument(zend_llist *l, llist_apply_with_arg_func_t func, void *arg TSRMLS_DC)
+{
+	zend_llist_element *element;
+
+	for (element=l->head; element; element=element->next) {
+		func(element->data, arg TSRMLS_CC);
+	}
+}
+
+
+ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func TSRMLS_DC, int num_args, ...)
+{
+	zend_llist_element *element;
+	va_list args;
+
+	va_start(args, num_args);
+	for (element=l->head; element; element=element->next) {
+		func(element->data, num_args, args TSRMLS_CC);
+	}
+	va_end(args);
+}
+
+
+ZEND_API int zend_llist_count(zend_llist *l)
+{
+	zend_llist_element *element;
+	int element_count=0;
+
+	for (element=l->head; element; element=element->next) {
+		element_count++;
+	}
+	return element_count;
+}
+
+
+ZEND_API void *zend_llist_get_first_ex(zend_llist *l, zend_llist_position *pos)
+{
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	*current = l->head;
+	if (*current) {
+		return (*current)->data;
+	} else {
+		return NULL;
+	}
+}
+
+
+ZEND_API void *zend_llist_get_last_ex(zend_llist *l, zend_llist_position *pos)
+{
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	*current = l->tail;
+	if (*current) {
+		return (*current)->data;
+	} else {
+		return NULL;
+	}
+}
+
+
+ZEND_API void *zend_llist_get_next_ex(zend_llist *l, zend_llist_position *pos)
+{
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	if (*current) {
+		*current = (*current)->next;
+		if (*current) {
+			return (*current)->data;
+		}
+	}
+	return NULL;
+}
+
+
+ZEND_API void *zend_llist_get_prev_ex(zend_llist *l, zend_llist_position *pos)
+{
+	zend_llist_position *current = pos ? pos : &l->traverse_ptr;
+
+	if (*current) {
+		*current = (*current)->prev;
+		if (*current) {
+			return (*current)->data;
+		}
+	}
+	return NULL;
+}

Zend/zend_llist.h

@@ -0,0 +1,78 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_LLIST_H
+#define ZEND_LLIST_H
+
+#include <stdlib.h>
+
+typedef struct _zend_llist_element {
+	struct _zend_llist_element *next;
+	struct _zend_llist_element *prev;
+	char data[1]; /* Needs to always be last in the struct */
+} zend_llist_element;
+
+typedef void (*llist_dtor_func_t)(void *);
+typedef int (*llist_compare_func_t)(const zend_llist_element *, const zend_llist_element *);
+typedef void (*llist_apply_with_args_func_t)(void *data, int num_args, va_list args TSRMLS_DC);
+typedef void (*llist_apply_with_arg_func_t)(void *data, void *arg TSRMLS_DC);
+typedef void (*llist_apply_func_t)(void * TSRMLS_DC);
+
+typedef struct _zend_llist {
+	zend_llist_element *head;
+	zend_llist_element *tail;
+	size_t size;
+	llist_dtor_func_t dtor;
+	unsigned char persistent;
+	zend_llist_element *traverse_ptr;
+} zend_llist;
+
+typedef zend_llist_element* zend_llist_position;
+
+BEGIN_EXTERN_C()
+ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent);
+ZEND_API void zend_llist_add_element(zend_llist *l, void *element);
+ZEND_API void zend_llist_prepend_element(zend_llist *l, void *element);
+ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare)(void *element1, void *element2));
+ZEND_API void zend_llist_destroy(zend_llist *l);
+ZEND_API void zend_llist_clean(zend_llist *l);
+ZEND_API void zend_llist_remove_tail(zend_llist *l);
+ZEND_API void zend_llist_copy(zend_llist *dst, zend_llist *src);
+ZEND_API void zend_llist_apply(zend_llist *l, llist_apply_func_t func TSRMLS_DC);
+ZEND_API void zend_llist_apply_with_del(zend_llist *l, int (*func)(void *data));
+ZEND_API void zend_llist_apply_with_argument(zend_llist *l, llist_apply_with_arg_func_t func, void *arg TSRMLS_DC);
+ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func TSRMLS_DC, int num_args, ...);
+ZEND_API int zend_llist_count(zend_llist *l);
+ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func);
+
+/* traversal */
+ZEND_API void *zend_llist_get_first_ex(zend_llist *l, zend_llist_position *pos);
+ZEND_API void *zend_llist_get_last_ex(zend_llist *l, zend_llist_position *pos);
+ZEND_API void *zend_llist_get_next_ex(zend_llist *l, zend_llist_position *pos);
+ZEND_API void *zend_llist_get_prev_ex(zend_llist *l, zend_llist_position *pos);
+
+#define zend_llist_get_first(l) zend_llist_get_first_ex(l, NULL)
+#define zend_llist_get_last(l) zend_llist_get_last_ex(l, NULL)
+#define zend_llist_get_next(l) zend_llist_get_next_ex(l, NULL)
+#define zend_llist_get_prev(l) zend_llist_get_prev_ex(l, NULL)
+
+END_EXTERN_C()
+
+#endif /* ZEND_LLIST_H */

Zend/zend_modules.h

@@ -0,0 +1,84 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef MODULES_H
+#define MODULES_H
+
+#include "zend.h"
+
+#define INIT_FUNC_ARGS		int type, int module_number TSRMLS_DC
+#define INIT_FUNC_ARGS_PASSTHRU	type, module_number TSRMLS_CC
+#define SHUTDOWN_FUNC_ARGS	int type, int module_number TSRMLS_DC
+#define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC
+#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
+#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
+#define GINIT_FUNC_ARGS		void
+#define GINIT_FUNC_ARGS_PASSTHRU
+
+ZEND_API extern unsigned char first_arg_force_ref[];
+ZEND_API extern unsigned char second_arg_force_ref[];
+ZEND_API extern unsigned char third_arg_force_ref[];
+
+#define ZEND_MODULE_API_NO 20001222
+#ifdef ZTS
+#define USING_ZTS 1
+#else
+#define USING_ZTS 0
+#endif
+
+#define STANDARD_MODULE_PROPERTIES_EX 0, 0, 0, NULL, 0, ZEND_DEBUG, USING_ZTS, ZEND_MODULE_API_NO
+
+#define STANDARD_MODULE_PROPERTIES \
+	NULL, NULL, STANDARD_MODULE_PROPERTIES_EX
+
+#define MODULE_PERSISTENT 1
+#define MODULE_TEMPORARY 2
+
+typedef struct _zend_module_entry zend_module_entry;
+
+struct _zend_module_entry {
+	char *name;
+	zend_function_entry *functions;
+	int (*module_startup_func)(INIT_FUNC_ARGS);
+	int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS);
+	int (*request_startup_func)(INIT_FUNC_ARGS);
+	int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS);
+	void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS);
+	int (*global_startup_func)(void);
+	int (*global_shutdown_func)(void);
+	int globals_id;
+	int module_started;
+	unsigned char type;
+	void *handle;
+	int module_number;
+	unsigned char zend_debug;
+	unsigned char zts;
+	unsigned int zend_api;
+};
+
+
+extern ZEND_API HashTable module_registry;
+
+void module_destructor(zend_module_entry *module);
+int module_registry_cleanup(zend_module_entry *module TSRMLS_DC);
+int module_registry_request_startup(zend_module_entry *module TSRMLS_DC);
+
+#define ZEND_MODULE_DTOR (void (*)(void *)) module_destructor
+#endif

Zend/zend_opcode.c

@@ -0,0 +1,395 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include <stdio.h>
+
+#include "zend.h"
+#include "zend_alloc.h"
+#include "zend_compile.h"
+#include "zend_extensions.h"
+#include "zend_API.h"
+
+
+static void zend_extension_op_array_ctor_handler(zend_extension *extension, zend_op_array *op_array TSRMLS_DC)
+{
+	if (extension->op_array_ctor) {
+		extension->op_array_ctor(op_array);
+	}
+}
+
+
+static void zend_extension_op_array_dtor_handler(zend_extension *extension, zend_op_array *op_array TSRMLS_DC)
+{
+	if (extension->op_array_dtor) {
+		extension->op_array_dtor(op_array);
+	}
+}
+
+
+static void op_array_alloc_ops(zend_op_array *op_array)
+{
+	op_array->opcodes = erealloc(op_array->opcodes, (op_array->size)*sizeof(zend_op));
+}
+
+
+
+void init_op_array(zend_op_array *op_array, int type, int initial_ops_size TSRMLS_DC)
+{
+	op_array->type = type;
+
+	op_array->backpatch_count = 0;
+	if (CG(interactive)) {
+		/* We must avoid a realloc() on the op_array in interactive mode, since pointers to constants
+		 * will become invalid
+		 */
+		initial_ops_size = 8192;
+	}
+
+	op_array->refcount = (zend_uint *) emalloc(sizeof(zend_uint));
+	*op_array->refcount = 1;
+	op_array->size = initial_ops_size;
+	op_array->last = 0;
+	op_array->opcodes = NULL;
+	op_array_alloc_ops(op_array);
+
+	op_array->T = 0;
+
+	op_array->function_name = NULL;
+	op_array->filename = zend_get_compiled_filename(TSRMLS_C);
+
+	op_array->arg_types = NULL;
+
+	op_array->brk_cont_array = NULL;
+	op_array->last_brk_cont = 0;
+	op_array->current_brk_cont = -1;
+
+	op_array->static_variables = NULL;
+
+	op_array->uses_globals = 0;
+
+	op_array->return_reference = 0;
+	op_array->done_pass_two = 0;
+
+	op_array->start_op = NULL;
+
+	zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_ctor_handler, op_array TSRMLS_CC);
+}
+
+
+ZEND_API void destroy_zend_function(zend_function *function)
+{
+	switch (function->type) {
+		case ZEND_USER_FUNCTION:
+			destroy_op_array((zend_op_array *) function);
+			break;
+		case ZEND_INTERNAL_FUNCTION:
+			/* do nothing */
+			break;
+	}
+}
+
+
+ZEND_API void destroy_zend_class(zend_class_entry *ce)
+{
+	if (--(*ce->refcount)>0) {
+		return;
+	}
+	switch (ce->type) {
+		case ZEND_USER_CLASS:
+			efree(ce->name);
+			efree(ce->refcount);
+			zend_hash_destroy(&ce->function_table);
+			zend_hash_destroy(&ce->default_properties);
+			break;
+		case ZEND_INTERNAL_CLASS:
+			free(ce->name);
+			free(ce->refcount);
+			zend_hash_destroy(&ce->function_table);
+			zend_hash_destroy(&ce->default_properties);
+			break;
+	}
+}
+
+
+void zend_class_add_ref(zend_class_entry *ce)
+{
+	(*ce->refcount)++;
+}
+
+
+ZEND_API void destroy_op_array(zend_op_array *op_array)
+{
+	zend_op *opline = op_array->opcodes;
+	zend_op *end = op_array->opcodes+op_array->last;
+	TSRMLS_FETCH();
+
+	if (op_array->static_variables) {
+		zend_hash_destroy(op_array->static_variables);
+		FREE_HASHTABLE(op_array->static_variables);
+	}
+
+	if (--(*op_array->refcount)>0) {
+		return;
+	}
+
+	efree(op_array->refcount);
+
+	while (opline<end) {
+		if (opline->op1.op_type==IS_CONST) {
+#if DEBUG_ZEND>2
+			printf("Reducing refcount for %x 1=>0 (destroying)\n", &opline->op1.u.constant);
+#endif
+			zval_dtor(&opline->op1.u.constant);
+		}
+		if (opline->op2.op_type==IS_CONST) {
+#if DEBUG_ZEND>2
+			printf("Reducing refcount for %x 1=>0 (destroying)\n", &opline->op2.u.constant);
+#endif
+			zval_dtor(&opline->op2.u.constant);
+		}
+		opline++;
+	}
+	efree(op_array->opcodes);
+	if (op_array->function_name) {
+		efree(op_array->function_name);
+	}
+	if (op_array->arg_types) {
+		efree(op_array->arg_types);
+	}
+	if (op_array->brk_cont_array) {
+		efree(op_array->brk_cont_array);
+	}
+	if (op_array->done_pass_two) {
+		zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_dtor_handler, op_array TSRMLS_CC);
+	}
+}
+
+
+void init_op(zend_op *op TSRMLS_DC)
+{
+	memset(&op->result, 0, sizeof(znode));
+	op->lineno = CG(zend_lineno);
+	SET_UNUSED(op->result);
+	op->extended_value = 0;
+	memset(&op->op1, 0, sizeof(znode));
+	memset(&op->op2, 0, sizeof(znode));
+}
+
+zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC)
+{
+	zend_uint next_op_num = op_array->last++;
+	zend_op *next_op;
+
+	if (next_op_num >= op_array->size) {
+		if (CG(interactive)) {
+			/* we messed up */
+			zend_printf("Ran out of opcode space!\n"
+						"You should probably consider writing this huge script into a file!\n");
+			zend_bailout();
+		}
+		op_array->size *= 4;
+		op_array_alloc_ops(op_array);
+	}
+	
+	next_op = &(op_array->opcodes[next_op_num]);
+	
+	init_op(next_op TSRMLS_CC);
+
+	return next_op;
+}
+
+
+int get_next_op_number(zend_op_array *op_array)
+{
+	return op_array->last;
+}
+
+
+
+
+zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array)
+{
+	op_array->last_brk_cont++;
+	op_array->brk_cont_array = erealloc(op_array->brk_cont_array, sizeof(zend_brk_cont_element)*op_array->last_brk_cont);
+	return &op_array->brk_cont_array[op_array->last_brk_cont-1];
+}
+
+
+static void zend_update_extended_info(zend_op_array *op_array TSRMLS_DC)
+{
+	zend_op *opline = op_array->opcodes, *end=opline+op_array->last;
+
+	while (opline<end) {
+		if (opline->opcode == ZEND_EXT_STMT) {
+			if (opline+1<end) {
+				if ((opline+1)->opcode == ZEND_EXT_STMT) {
+					opline->opcode = ZEND_NOP;
+					opline++;
+					continue;
+				}
+				if (opline+1<end) {
+					opline->lineno = (opline+1)->lineno;
+				}
+			} else {
+				opline->opcode = ZEND_NOP;
+			}
+		}
+		opline++;
+	}
+}
+
+
+
+static void zend_extension_op_array_handler(zend_extension *extension, zend_op_array *op_array TSRMLS_DC)
+{
+	if (extension->op_array_handler) {
+		extension->op_array_handler(op_array);
+	}
+}
+
+
+int pass_two(zend_op_array *op_array TSRMLS_DC)
+{
+	zend_op *opline, *end;
+
+	if (op_array->type!=ZEND_USER_FUNCTION && op_array->type!=ZEND_EVAL_CODE) {
+		return 0;
+	}
+	if (CG(extended_info)) {
+		zend_update_extended_info(op_array TSRMLS_CC);
+	}
+	if (CG(handle_op_arrays)) {
+		zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_handler, op_array TSRMLS_CC);
+	}
+
+	opline = op_array->opcodes;
+	end = opline + op_array->last;
+	while (opline < end) {
+		if (opline->op1.op_type == IS_CONST) {
+			opline->op1.u.constant.is_ref = 1;
+			opline->op1.u.constant.refcount = 2; /* Make sure is_ref won't be reset */
+		}
+		if (opline->op2.op_type == IS_CONST) {
+			opline->op2.u.constant.is_ref = 1;
+			opline->op2.u.constant.refcount = 2;
+		}
+		opline++;
+	}
+	op_array->opcodes = (zend_op *) erealloc(op_array->opcodes, sizeof(zend_op)*op_array->last);
+	op_array->size = op_array->last;
+	op_array->done_pass_two = 1;
+	return 0;
+}
+
+
+int print_class(zend_class_entry *class_entry TSRMLS_DC)
+{
+	printf("Class %s:\n", class_entry->name);
+	zend_hash_apply(&class_entry->function_table, (apply_func_t) pass_two TSRMLS_CC);
+	printf("End of class %s.\n\n", class_entry->name);
+	return 0;
+}
+
+ZEND_API unary_op_type get_unary_op(int opcode)
+{
+	switch(opcode) {
+		case ZEND_BW_NOT:
+			return (unary_op_type) bitwise_not_function;
+			break;
+		case ZEND_BOOL_NOT:
+			return (unary_op_type) boolean_not_function;
+			break;
+		default:
+			return (unary_op_type) NULL;
+			break;
+	}
+}
+
+
+ZEND_API void *get_binary_op(int opcode)
+{
+	switch (opcode) {
+		case ZEND_ADD:
+		case ZEND_ASSIGN_ADD:
+			return (void *) add_function;
+			break;
+		case ZEND_SUB:
+		case ZEND_ASSIGN_SUB:
+			return (void *) sub_function;
+			break;
+		case ZEND_MUL:
+		case ZEND_ASSIGN_MUL:
+			return (void *) mul_function;
+			break;
+		case ZEND_DIV:
+		case ZEND_ASSIGN_DIV:
+			return (void *) div_function;
+			break;
+		case ZEND_MOD:
+		case ZEND_ASSIGN_MOD:
+			return (void *) mod_function;
+			break;
+		case ZEND_SL:
+		case ZEND_ASSIGN_SL:
+			return (void *) shift_left_function;
+			break;
+		case ZEND_SR:
+		case ZEND_ASSIGN_SR:
+			return (void *) shift_right_function;
+			break;
+		case ZEND_CONCAT:
+		case ZEND_ASSIGN_CONCAT:
+			return (void *) concat_function;
+			break;
+		case ZEND_IS_IDENTICAL:
+			return (void *) is_identical_function;
+			break;
+		case ZEND_IS_NOT_IDENTICAL:
+			return (void *) is_not_identical_function;
+			break;
+		case ZEND_IS_EQUAL:
+			return (void *) is_equal_function;
+			break;
+		case ZEND_IS_NOT_EQUAL:
+			return (void *) is_not_equal_function;
+			break;
+		case ZEND_IS_SMALLER:
+			return (void *) is_smaller_function;
+			break;
+		case ZEND_IS_SMALLER_OR_EQUAL:
+			return (void *) is_smaller_or_equal_function;
+			break;
+		case ZEND_BW_OR:
+		case ZEND_ASSIGN_BW_OR:
+			return (void *) bitwise_or_function;
+			break;
+		case ZEND_BW_AND:
+		case ZEND_ASSIGN_BW_AND:
+			return (void *) bitwise_and_function;
+			break;
+		case ZEND_BW_XOR:
+		case ZEND_ASSIGN_BW_XOR:
+			return (void *) bitwise_xor_function;
+			break;
+		default:
+			return (void *) NULL;
+			break;
+	}
+}

Zend/zend_operators.h

@@ -0,0 +1,251 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_OPERATORS_H
+#define ZEND_OPERATORS_H
+
+#include <errno.h>
+#include <math.h>
+
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
+
+#if 0&&WITH_BCMATH
+#include "ext/bcmath/libbcmath/src/bcmath.h"
+#endif
+
+#define MAX_LENGTH_OF_LONG 18
+#define MAX_LENGTH_OF_DOUBLE 32
+
+ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int mod_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int boolean_not_function(zval *result, zval *op1 TSRMLS_DC);
+ZEND_API int bitwise_not_function(zval *result, zval *op1 TSRMLS_DC);
+ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int bitwise_and_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int bitwise_xor_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+
+ZEND_API int is_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int is_not_identical_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int is_smaller_or_equal_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+
+static inline int is_numeric_string(char *str, int length, long *lval, double *dval)
+{
+	long local_lval;
+	double local_dval;
+	char *end_ptr;
+	int conv_base=10;
+
+	if (!length) {
+		return 0;
+	}
+	
+	/* handle hex numbers */
+	if (length>=2 && str[0]=='0' && (str[1]=='x' || str[1]=='X')) {
+		conv_base=16;
+	}
+	errno=0;
+	local_lval = strtol(str, &end_ptr, conv_base);
+	if (errno!=ERANGE && end_ptr == str+length) { /* integer string */
+		if (lval) {
+			*lval = local_lval;
+		}
+		return IS_LONG;
+	}
+
+	if (conv_base==16) { /* hex string, under UNIX strtod() messes it up */
+		return 0;
+	}
+
+	errno=0;
+	local_dval = strtod(str, &end_ptr);
+	if (errno!=ERANGE && end_ptr == str+length) { /* floating point string */
+		if (! zend_finite(local_dval)) {
+			/* "inf","nan" and maybe other weird ones */
+			return 0;
+		}
+
+		if (dval) {
+			*dval = local_dval;
+		}
+#if 0&&WITH_BCMATH
+		if (length>16) {
+			register char *ptr=str, *end=str+length;
+			
+			while (ptr<end) {
+				switch(*ptr++) {
+					case 'e':
+					case 'E':
+						/* scientific notation, not handled by the BC library */
+						return IS_DOUBLE;
+						break;
+					default:
+						break;
+				}
+			}
+			return FLAG_IS_BC;
+		} else {
+			return IS_DOUBLE;
+		}
+#else
+		return IS_DOUBLE;
+#endif
+	}
+	
+	return 0;
+}
+
+ZEND_API int increment_function(zval *op1);
+ZEND_API int decrement_function(zval *op2);
+
+BEGIN_EXTERN_C()
+ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC);
+ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC);
+ZEND_API void convert_to_long(zval *op);
+ZEND_API void convert_to_double(zval *op);
+ZEND_API void convert_to_long_base(zval *op, int base);
+ZEND_API void convert_to_null(zval *op);
+ZEND_API void convert_to_boolean(zval *op);
+ZEND_API void convert_to_array(zval *op);
+ZEND_API void convert_to_object(zval *op);
+ZEND_API void multi_convert_to_long_ex(int argc, ...);
+ZEND_API void multi_convert_to_double_ex(int argc, ...);
+ZEND_API void multi_convert_to_string_ex(int argc, ...);
+ZEND_API int add_char_to_string(zval *result, zval *op1, zval *op2);
+ZEND_API int add_string_to_string(zval *result, zval *op1, zval *op2);
+#define convert_to_string(op)			_convert_to_string((op) ZEND_FILE_LINE_CC)
+
+ZEND_API double zend_string_to_double(const char *number, zend_uint length);
+END_EXTERN_C()
+
+ZEND_API int zval_is_true(zval *op);
+ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+ZEND_API int string_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC);
+
+ZEND_API void zend_str_tolower(char *str, unsigned int length);
+ZEND_API int zend_binary_zval_strcmp(zval *s1, zval *s2);
+ZEND_API int zend_binary_zval_strncmp(zval *s1, zval *s2, zval *s3);
+ZEND_API int zend_binary_zval_strcasecmp(zval *s1, zval *s2);
+ZEND_API int zend_binary_zval_strncasecmp(zval *s1, zval *s2, zval *s3);
+ZEND_API int zend_binary_strcmp(char *s1, uint len1, char *s2, uint len2);
+ZEND_API int zend_binary_strncmp(char *s1, uint len1, char *s2, uint len2, uint length);
+ZEND_API int zend_binary_strcasecmp(char *s1, uint len1, char *s2, uint len2);
+ZEND_API int zend_binary_strncasecmp(char *s1, uint len1, char *s2, uint len2, uint length);
+
+ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2);
+ZEND_API void zend_compare_symbol_tables(zval *result, HashTable *ht1, HashTable *ht2 TSRMLS_DC);
+ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2 TSRMLS_DC);
+ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC);
+
+ZEND_API int zend_atoi(const char *str, int str_len);
+
+#define convert_to_ex_master(ppzv, lower_type, upper_type)	\
+	if ((*ppzv)->type!=IS_##upper_type) {					\
+		if (!(*ppzv)->is_ref) {								\
+			SEPARATE_ZVAL(ppzv);							\
+		}													\
+		convert_to_##lower_type(*ppzv);						\
+	}
+
+#define convert_to_writable_ex_master(ppzv, lower_type, upper_type)	\
+	if ((*ppzv)->type!=IS_##upper_type) {							\
+		SEPARATE_ZVAL(ppzv);										\
+		convert_to_##lower_type(*ppzv);								\
+	}
+
+
+#define convert_to_boolean_ex(ppzv)	convert_to_ex_master(ppzv, boolean, BOOL)
+#define convert_to_long_ex(ppzv)	convert_to_ex_master(ppzv, long, LONG)
+#define convert_to_double_ex(ppzv)	convert_to_ex_master(ppzv, double, DOUBLE)
+#define convert_to_string_ex(ppzv)	convert_to_ex_master(ppzv, string, STRING)
+#define convert_to_array_ex(ppzv)	convert_to_ex_master(ppzv, array, ARRAY)
+#define convert_to_object_ex(ppzv)	convert_to_ex_master(ppzv, object, OBJECT)
+#define convert_to_null_ex(ppzv)	convert_to_ex_master(ppzv, null, NULL)
+
+#define convert_to_writable_boolean_ex(ppzv)	convert_to_writable_ex_master(ppzv, boolean, BOOL)
+#define convert_to_writable_long_ex(ppzv)		convert_to_writable_ex_master(ppzv, long, LONG)
+#define convert_to_writable_double_ex(ppzv)		convert_to_writable_ex_master(ppzv, double, DOUBLE)
+#define convert_to_writable_string_ex(ppzv)		convert_to_writable_ex_master(ppzv, string, STRING)
+#define convert_to_writable_array_ex(ppzv)		convert_to_writable_ex_master(ppzv, array, ARRAY)
+#define convert_to_writable_object_ex(ppzv)		convert_to_writable_ex_master(ppzv, object, OBJECT)
+#define convert_to_writable_null_ex(ppzv)		convert_to_writable_ex_master(ppzv, null, NULL)
+
+
+#define convert_scalar_to_number_ex(ppzv)							\
+	if ((*ppzv)->type!=IS_LONG && (*ppzv)->type!=IS_DOUBLE) {		\
+		if (!(*ppzv)->is_ref) {										\
+			SEPARATE_ZVAL(ppzv);									\
+		}															\
+		convert_scalar_to_number(*ppzv TSRMLS_CC);					\
+	}
+
+
+
+#define Z_LVAL(zval)		(zval).value.lval
+#define Z_BVAL(zval)		((zend_bool)(zval).value.lval)
+#define Z_DVAL(zval)		(zval).value.dval
+#define Z_STRVAL(zval)		(zval).value.str.val
+#define Z_STRLEN(zval)		(zval).value.str.len
+#define Z_ARRVAL(zval)		(zval).value.ht
+#define Z_OBJ(zval)			&(zval).value.obj
+#define Z_OBJPROP(zval)		(zval).value.obj.properties
+#define Z_OBJCE(zval)		(zval).value.obj.ce
+#define Z_RESVAL(zval)		(zval).value.lval
+
+#define Z_LVAL_P(zval_p)		Z_LVAL(*zval_p)
+#define Z_BVAL_P(zval_p)		Z_BVAL(*zval_p)
+#define Z_DVAL_P(zval_p)		Z_DVAL(*zval_p)
+#define Z_STRVAL_P(zval_p)		Z_STRVAL(*zval_p)
+#define Z_STRLEN_P(zval_p)		Z_STRLEN(*zval_p)
+#define Z_ARRVAL_P(zval_p)		Z_ARRVAL(*zval_p)
+#define Z_OBJ_P(zval_p)			Z_OBJ(*zval_p)
+#define Z_OBJPROP_P(zval_p)		Z_OBJPROP(*zval_p)
+#define Z_OBJCE_P(zval_p)		Z_OBJCE(*zval_p)
+#define Z_RESVAL_P(zval_p)		Z_RESVAL(*zval_p)
+
+#define Z_LVAL_PP(zval_pp)		Z_LVAL(**zval_pp)
+#define Z_BVAL_PP(zval_pp)		Z_BVAL(**zval_pp)
+#define Z_DVAL_PP(zval_pp)		Z_DVAL(**zval_pp)
+#define Z_STRVAL_PP(zval_pp)	Z_STRVAL(**zval_pp)
+#define Z_STRLEN_PP(zval_pp)	Z_STRLEN(**zval_pp)
+#define Z_ARRVAL_PP(zval_pp)	Z_ARRVAL(**zval_pp)
+#define Z_OBJ_PP(zval_pp)		Z_OBJ(**zval_pp)
+#define Z_OBJPROP_PP(zval_pp)	Z_OBJPROP(**zval_pp)
+#define Z_OBJCE_PP(zval_pp)		Z_OBJCE(**zval_pp)
+#define Z_RESVAL_PP(zval_pp)	Z_RESVAL(**zval_pp)
+
+#define Z_TYPE(zval)		(zval).type
+#define Z_TYPE_P(zval_p)	Z_TYPE(*zval_p)
+#define Z_TYPE_PP(zval_pp)	Z_TYPE(**zval_pp)
+
+#endif

Zend/zend_ptr_stack.c

@@ -0,0 +1,110 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend.h"
+#include "zend_ptr_stack.h"
+#ifdef HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+
+ZEND_API void zend_ptr_stack_init(zend_ptr_stack *stack)
+{
+	stack->top_element = stack->elements = (void **) emalloc(sizeof(void *)*PTR_STACK_BLOCK_SIZE);
+	stack->max = PTR_STACK_BLOCK_SIZE;
+	stack->top = 0;
+}
+
+
+ZEND_API void zend_ptr_stack_n_push(zend_ptr_stack *stack, int count, ...)
+{
+	va_list ptr;
+	void *elem;
+	
+	if (stack->top+count > stack->max) {		/* we need to allocate more memory */
+		stack->max *= 2;
+		stack->max += count; 
+		stack->elements = (void **) erealloc(stack->elements, (sizeof(void *) * (stack->max)));
+		stack->top_element = stack->elements+stack->top;
+	}
+	va_start(ptr, count);
+	while (count>0) {
+		elem = va_arg(ptr, void *);
+		stack->top++;
+		*(stack->top_element++) = elem;
+		count--;
+	}
+	va_end(ptr);
+}
+
+
+ZEND_API void zend_ptr_stack_n_pop(zend_ptr_stack *stack, int count, ...)
+{
+	va_list ptr;
+	void **elem;
+	
+	va_start(ptr, count);
+	while (count>0) {
+		elem = va_arg(ptr, void **);
+		*elem = *(--stack->top_element);
+		stack->top--;
+		count--;
+	}
+	va_end(ptr);
+}
+
+
+
+ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack)
+{
+	if (stack->elements) {
+		efree(stack->elements);
+	}
+}
+
+
+ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *))
+{
+	int i = stack->top;
+
+	while (--i >= 0) {
+		func(stack->elements[i]);
+	}
+}
+
+
+ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements)
+{
+	zend_ptr_stack_apply(stack, func);
+	if (free_elements) {
+		int i = stack->top;
+
+		while (--i >= 0) {
+			efree(stack->elements[i]);
+		}
+	}
+	stack->top = 0;
+	stack->top_element = stack->elements;
+}
+
+
+ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack)
+{
+	return stack->top;
+}

Zend/zend_ptr_stack.h

@@ -0,0 +1,58 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_PTR_STACK_H
+#define ZEND_PTR_STACK_H
+
+typedef struct _zend_ptr_stack {
+	int top, max;
+	void **elements;
+	void **top_element;
+} zend_ptr_stack;
+
+
+#define PTR_STACK_BLOCK_SIZE 64
+
+ZEND_API void zend_ptr_stack_init(zend_ptr_stack *stack);
+ZEND_API void zend_ptr_stack_n_push(zend_ptr_stack *stack, int count, ...);
+ZEND_API void zend_ptr_stack_n_pop(zend_ptr_stack *stack, int count, ...);
+ZEND_API void zend_ptr_stack_destroy(zend_ptr_stack *stack);
+ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *));
+ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements);
+ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack);
+
+static inline void zend_ptr_stack_push(zend_ptr_stack *stack, void *ptr)
+{
+	if (stack->top >= stack->max) {		/* we need to allocate more memory */
+		stack->elements = (void **) erealloc(stack->elements, (sizeof(void *) * (stack->max *= 2 )));
+		stack->top_element = stack->elements+stack->top;
+	}
+	stack->top++;
+	*(stack->top_element++) = ptr;
+}
+
+static inline void *zend_ptr_stack_pop(zend_ptr_stack *stack)
+{
+	stack->top--;
+	return *(--stack->top_element);
+}
+
+
+#endif /* ZEND_PTR_STACK_H */

Zend/zend_sprintf.c

@@ -0,0 +1,40 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include <stdio.h>
+
+#include "zend.h"
+
+#ifdef HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+
+#if ZEND_BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...)
+{
+	va_list args;
+
+	va_start(args, format);
+	vsprintf(buffer, format, args);
+	va_end(args);
+
+	return strlen(buffer);
+}
+#endif

Zend/zend_stack.c

@@ -0,0 +1,164 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include "zend.h"
+#include "zend_stack.h"
+
+ZEND_API int zend_stack_init(zend_stack *stack)
+{
+	stack->top = 0;
+	stack->elements = (void **) emalloc(sizeof(void **) * STACK_BLOCK_SIZE);
+	if (!stack->elements) {
+		return FAILURE;
+	} else {
+		stack->max = STACK_BLOCK_SIZE;
+		return SUCCESS;
+	}
+}
+
+ZEND_API int zend_stack_push(zend_stack *stack, void *element, int size)
+{
+	if (stack->top >= stack->max) {		/* we need to allocate more memory */
+		stack->elements = (void **) erealloc(stack->elements,
+				   (sizeof(void **) * (stack->max += STACK_BLOCK_SIZE)));
+		if (!stack->elements) {
+			return FAILURE;
+		}
+	}
+	stack->elements[stack->top] = (void *) emalloc(size);
+	memcpy(stack->elements[stack->top], element, size);
+	return stack->top++;
+}
+
+
+ZEND_API int zend_stack_top(zend_stack *stack, void **element)
+{
+	if (stack->top > 0) {
+		*element = stack->elements[stack->top - 1];
+		return SUCCESS;
+	} else {
+		*element = NULL;
+		return FAILURE;
+	}
+}
+
+
+ZEND_API int zend_stack_del_top(zend_stack *stack)
+{
+	if (stack->top > 0) {
+		efree(stack->elements[--stack->top]);
+	}
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_stack_int_top(zend_stack *stack)
+{
+	int *e;
+
+	if (zend_stack_top(stack, (void **) &e) == FAILURE) {
+		return FAILURE;			/* this must be a negative number, since negative numbers can't be address numbers */
+	} else {
+		return *e;
+	}
+}
+
+
+ZEND_API int zend_stack_is_empty(zend_stack *stack)
+{
+	if (stack->top == 0) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+ZEND_API int zend_stack_destroy(zend_stack *stack)
+{
+	register int i;
+
+	for (i = 0; i < stack->top; i++) {
+		efree(stack->elements[i]);
+	}
+
+	if (stack->elements) {
+		efree(stack->elements);
+	}
+	return SUCCESS;
+}
+
+
+ZEND_API void **zend_stack_base(zend_stack *stack)
+{
+	return stack->elements;
+}
+
+
+ZEND_API int zend_stack_count(zend_stack *stack)
+{
+	return stack->top;
+}
+
+
+ZEND_API void zend_stack_apply(zend_stack *stack, int type, int (*apply_function)(void *element))
+{
+	int i;
+
+	switch (type) {
+		case ZEND_STACK_APPLY_TOPDOWN:
+			for (i=stack->top-1; i>=0; i--) {
+				if (apply_function(stack->elements[i])) {
+					break;
+				}
+			}
+			break;
+		case ZEND_STACK_APPLY_BOTTOMUP:
+			for (i=0; i<stack->top; i++) {
+				if (apply_function(stack->elements[i])) {
+					break;
+				}
+			}
+			break;
+	}
+}
+
+
+ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg)
+{
+	int i;
+
+	switch (type) {
+		case ZEND_STACK_APPLY_TOPDOWN:
+			for (i=stack->top-1; i>=0; i--) {
+				if (apply_function(stack->elements[i], arg)) {
+					break;
+				}
+			}
+			break;
+		case ZEND_STACK_APPLY_BOTTOMUP:
+			for (i=0; i<stack->top; i++) {
+				if (apply_function(stack->elements[i], arg)) {
+					break;
+				}
+			}
+			break;
+	}
+}

Zend/zend_stack.h

@@ -0,0 +1,47 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_STACK_H
+#define ZEND_STACK_H
+
+typedef struct _zend_stack {
+	int top, max;
+	void **elements;
+} zend_stack;
+
+
+#define STACK_BLOCK_SIZE 64
+
+ZEND_API int zend_stack_init(zend_stack *stack);
+ZEND_API int zend_stack_push(zend_stack *stack, void *element, int size);
+ZEND_API int zend_stack_top(zend_stack *stack, void **element);
+ZEND_API int zend_stack_del_top(zend_stack *stack);
+ZEND_API int zend_stack_int_top(zend_stack *stack);
+ZEND_API int zend_stack_is_empty(zend_stack *stack);
+ZEND_API int zend_stack_destroy(zend_stack *stack);
+ZEND_API void **zend_stack_base(zend_stack *stack);
+ZEND_API int zend_stack_count(zend_stack *stack);
+ZEND_API void zend_stack_apply(zend_stack *stack, int type, int (*apply_function)(void *element));
+ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int type, int (*apply_function)(void *element, void *arg), void *arg);
+
+#define ZEND_STACK_APPLY_TOPDOWN	1
+#define ZEND_STACK_APPLY_BOTTOMUP	2
+
+#endif /* ZEND_STACK_H */

Zend/zend_static_allocator.c

@@ -0,0 +1,76 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#include <stdlib.h>
+
+#include "zend_static_allocator.h"
+
+/* Not checking emalloc() and erealloc() return values as they are supposed to bailout */
+
+inline static void block_init(Block *block, zend_uint block_size)
+{
+	block->pos = block->bp = (char *) emalloc(block_size);
+	block->end = block->bp + block_size;
+}
+
+inline static char *block_allocate(Block *block, zend_uint size)
+{
+	char *retval = block->pos;
+	if ((block->pos += size) >= block->end) {
+		return (char *)NULL;
+	}
+	return retval;
+}
+
+inline static void block_destroy(Block *block)
+{
+	efree(block->bp);
+}
+
+void static_allocator_init(StaticAllocator *sa)
+{
+	sa->Blocks = (Block *) emalloc(sizeof(Block));
+	block_init(sa->Blocks, ALLOCATOR_BLOCK_SIZE);
+	sa->num_blocks = 1;
+	sa->current_block = 0;
+}
+
+char *static_allocator_allocate(StaticAllocator *sa, zend_uint size)
+{
+	char *retval;
+
+	retval = block_allocate(&sa->Blocks[sa->current_block], size);
+	if (retval) {
+		return retval;
+	}
+	sa->Blocks = (Block *) erealloc(sa->Blocks, ++sa->num_blocks);
+	sa->current_block++;
+	block_init(&sa->Blocks[sa->current_block], (size > ALLOCATOR_BLOCK_SIZE) ? size : ALLOCATOR_BLOCK_SIZE);
+	retval = block_allocate(&sa->Blocks[sa->current_block], size);
+	return retval;
+}
+
+void static_allocator_destroy(StaticAllocator *sa)
+{
+	zend_uint i;
+
+	for (i=0; i<sa->num_blocks; i++) {
+		block_free(&sa->Blocks[i]);
+	}
+	efree(sa->Blocks);
+}

Zend/zend_static_allocator.h

@@ -0,0 +1,45 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_STATIC_ALLOCATOR_H
+#define ZEND_STATIC_ALLOCATOR_H
+
+#define ALLOCATOR_BLOCK_SIZE 400000
+
+/* Temporary */
+typedef unsigned int zend_uint;
+#define emalloc(s) malloc(s)
+#define efree(p) free(p)
+
+typedef struct _Block {
+	char *bp;
+	char *pos;
+	char *end;
+} Block;
+
+typedef struct _StaticAllocator {
+	Block *Blocks;
+	zend_uint num_blocks;
+	zend_uint current_block;
+} StaticAllocator;
+
+void static_allocator_init(StaticAllocator *sa);
+char *static_allocator_allocate(StaticAllocator *sa, zend_uint size);
+void static_allocator_destroy(StaticAllocator *sa);
+
+#endif /* ZEND_STATIC_ALLOCATOR_H */

Zend/zend_variables.c

@@ -0,0 +1,168 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#include <stdio.h>
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_globals.h"
+#include "zend_constants.h"
+#include "zend_list.h"
+
+ZEND_API char *empty_string = "";	/* in order to save emalloc() and efree() time for
+									 * empty strings (usually used to denote empty
+									 * return values in failed functions).
+									 * The macro STR_FREE() will not efree() it.
+									 */
+
+
+ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC)
+{
+	if (zvalue->type==IS_LONG) {
+		return;
+	}
+	switch(zvalue->type) {
+		case IS_STRING:
+		case IS_CONSTANT:
+			CHECK_ZVAL_STRING_REL(zvalue);
+			STR_FREE_REL(zvalue->value.str.val);
+			break;
+		case IS_ARRAY:
+		case IS_CONSTANT_ARRAY: {
+				TSRMLS_FETCH();
+
+				if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {
+					zend_hash_destroy(zvalue->value.ht);
+					FREE_HASHTABLE(zvalue->value.ht);
+				}
+			}
+			break;
+		case IS_OBJECT:
+			zend_hash_destroy(zvalue->value.obj.properties);
+			FREE_HASHTABLE(zvalue->value.obj.properties);
+			break;
+		case IS_RESOURCE:	{
+				TSRMLS_FETCH();
+
+				/* destroy resource */
+				zend_list_delete(zvalue->value.lval);
+			}
+			break;
+		case IS_LONG:
+		case IS_DOUBLE:
+		case IS_BOOL:
+		case IS_NULL:
+		default:
+			return;
+			break;
+	}
+}
+
+
+ZEND_API void zval_add_ref(zval **p)
+{
+	(*p)->refcount++;
+}
+
+
+ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
+{
+	switch (zvalue->type) {
+		case IS_RESOURCE: {
+				TSRMLS_FETCH();
+
+				zend_list_addref(zvalue->value.lval);
+			}
+			break;
+		case IS_BOOL:
+		case IS_LONG:
+		case IS_NULL:
+			break;
+		case IS_CONSTANT:
+		case IS_STRING:
+			if (zvalue->value.str.val) {
+				if (zvalue->value.str.len==0) {
+					zvalue->value.str.val = empty_string;
+					return SUCCESS;
+				}
+			}
+			CHECK_ZVAL_STRING_REL(zvalue);
+			zvalue->value.str.val = (char *) estrndup_rel(zvalue->value.str.val, zvalue->value.str.len);
+			break;
+		case IS_ARRAY:
+		case IS_CONSTANT_ARRAY: {
+				zval *tmp;
+				HashTable *original_ht = zvalue->value.ht;
+				TSRMLS_FETCH();
+
+				if (zvalue->value.ht == &EG(symbol_table)) {
+					return SUCCESS; /* do nothing */
+				}
+				ALLOC_HASHTABLE_REL(zvalue->value.ht);
+				zend_hash_init(zvalue->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0);
+				zend_hash_copy(zvalue->value.ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+			}
+			break;
+		case IS_OBJECT: {
+				zval *tmp;
+				HashTable *original_ht = zvalue->value.obj.properties;
+
+				ALLOC_HASHTABLE_REL(zvalue->value.obj.properties);
+				zend_hash_init(zvalue->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+				zend_hash_copy(zvalue->value.obj.properties, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+			}
+			break;
+	}
+	return SUCCESS;
+}
+
+
+ZEND_API int zend_print_variable(zval *var) 
+{
+	return zend_print_zval(var, 0);
+}
+
+
+#if ZEND_DEBUG
+ZEND_API int _zval_copy_ctor_wrapper(zval *zvalue)
+{
+	return zval_copy_ctor(zvalue);
+}
+
+
+ZEND_API void _zval_dtor_wrapper(zval *zvalue)
+{
+	zval_dtor(zvalue);
+}
+
+
+
+ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr)
+{
+	zval_ptr_dtor(zval_ptr);
+}
+#endif
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

Zend/zend_variables.h

@@ -0,0 +1,57 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 0.92 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        | 
+   | available at through the world-wide-web at                           |
+   | http://www.zend.com/license/0_92.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+
+#ifndef ZEND_VARIABLES_H
+#define ZEND_VARIABLES_H
+
+
+ZEND_API int zend_print_variable(zval *var);
+
+BEGIN_EXTERN_C()
+ZEND_API int _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC);
+ZEND_API void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC);
+ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC);
+#define zval_copy_ctor(zvalue) _zval_copy_ctor((zvalue) ZEND_FILE_LINE_CC)
+#define zval_dtor(zvalue) _zval_dtor((zvalue) ZEND_FILE_LINE_CC)
+#define zval_ptr_dtor(zval_ptr) _zval_ptr_dtor((zval_ptr) ZEND_FILE_LINE_CC)
+
+#if ZEND_DEBUG
+ZEND_API int _zval_copy_ctor_wrapper(zval *zvalue);
+ZEND_API void _zval_dtor_wrapper(zval *zvalue);
+ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr);
+#define zval_copy_ctor_wrapper _zval_copy_ctor_wrapper
+#define zval_dtor_wrapper _zval_dtor_wrapper
+#define zval_ptr_dtor_wrapper _zval_ptr_dtor_wrapper
+#else
+#define zval_copy_ctor_wrapper _zval_copy_ctor
+#define zval_dtor_wrapper _zval_dtor
+#define zval_ptr_dtor_wrapper _zval_ptr_dtor
+#endif
+
+END_EXTERN_C()
+
+
+ZEND_API void zval_add_ref(zval **p);
+
+#define ZVAL_DESTRUCTOR (void (*)(void *)) zval_dtor_wrapper
+#define ZVAL_PTR_DTOR (void (*)(void *)) zval_ptr_dtor_wrapper
+#define ZVAL_COPY_CTOR (void (*)(void *)) zval_copy_ctor_wrapper
+
+#endif

ext/sqlite/CREDITS

@@ -1,2 +0,0 @@
-sqlite
-Wez Furlong, Tal Peer, Marcus Börger

ext/sqlite/Makefile.frag

@@ -1,28 +0,0 @@
-
-LEMON="@LEMON@"
-
-# sqlite has some generated source files; this specifies how to
-# build them
-
-# We avoid building these last three by bundling the generated versions
-# in our release packages
-
-$(srcdir)/libsqlite/src/opcodes.c: $(srcdir)/libsqlite/src/vdbe.c
-	echo '/* Automatically generated file.  Do not edit */' >$@
-	echo 'char *sqliteOpcodeNames[] = { "???", ' >>$@
-	grep '^case OP_' $< | \
-	  sed -e 's/^.*OP_/  "/' -e 's/:.*$$/", /' >>$@
-	echo '};' >>$@
-	
-$(srcdir)/libsqlite/src/opcodes.h: $(srcdir)/libsqlite/src/vdbe.c
-	echo '/* Automatically generated file.  Do not edit */' >$@
-	grep '^case OP_' $< | \
-	  sed -e 's/://' | \
-	  awk '{printf "#define %-30s %3d\n", $$2, ++cnt}' >>$@
-
-$(srcdir)/libsqlite/src/sqlite.c: $(srcdir)/libsqlite/src/sqlite.h
-
-$(srcdir)/libsqlite/src/parse.c:	$(srcdir)/libsqlite/src/parse.y
-	$(LEMON) $(srcdir)/libsqlite/src/parse.y
-
-

ext/sqlite/README

@@ -1,14 +0,0 @@
-This is an extension for the SQLite Embeddable SQL Database Engine.
-http://www.sqlite.org/
-
-SQLite is a C library that implements an embeddable SQL database engine.
-Programs that link with the SQLite library can have SQL database access
-without running a separate RDBMS process.
-
-SQLite is not a client library used to connect to a big database server.
-SQLite is the server. The SQLite library reads and writes directly to and from
-the database files on disk
-
-
-
-vim:tw=78:et

ext/sqlite/TODO

@@ -1,22 +0,0 @@
-- Transparent binary encoding of return values from PHP callback functions.
-
-- Add user-space callback for the authorizer function (this is potentially
-  very slow, so it needs to be implemented carefully).
-
-- Add user-space callback to handle busy databases.
-
-- Test-suite
-
-  o Test how robust we are when a user-space function is registered as
-    a callback for a persistent connection in script A, then script B is
-	called that doesn't register the callback but does make use of the
-	function in an SQL query.
-	--> Our test suite doesn't allow us to test persistent connections
-	    at this time :/
-
-- If building a ZTS build, -DTHREADSAFE while compiling libsqlite
-
-- If building a non-debug build, -DNDEBUG will disable the expensive
-  asserts in the inner loop. (and double performance)
-
-vim:tw=78

ext/sqlite/config.m4

@@ -1,107 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension sqlite
-
-PHP_ARG_WITH(sqlite, for sqlite support,
-[  --with-sqlite           Include sqlite support])
-
-if test "$PHP_SQLITE" != "no"; then
-
-  if test "$PHP_SQLITE" != "yes"; then
-	SEARCH_PATH="/usr/local /usr"
-	SEARCH_FOR="/include/sqlite.h"
-	if test -r $PHP_SQLITE/; then # path given as parameter
-		SQLITE_DIR=$PHP_SQLITE
-	else # search default path list
-		AC_MSG_CHECKING([for sqlite files in default path])
-		for i in $SEARCH_PATH ; do
-		if test -r $i/$SEARCH_FOR; then
-			SQLITE_DIR=$i
-			AC_MSG_RESULT(found in $i)
-		fi
-		done
-	fi
-  
-	if test -z "$SQLITE_DIR"; then
-		AC_MSG_RESULT([not found])
-		AC_MSG_ERROR([Please reinstall the sqlite distribution from http://www.sqlite.org])
-	fi
-
-	PHP_ADD_INCLUDE($SQLITE_DIR/include)
-
-	LIBNAME=sqlite
-	LIBSYMBOL=sqlite_open
-
-	PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-	[
-		PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/lib, SQLITE_SHARED_LIBADD)
-		AC_DEFINE(HAVE_SQLITELIB,1,[ ])
-	],[
-		AC_MSG_ERROR([wrong sqlite lib version or lib not found])
-	],[
-		-L$SQLITE_DIR/lib -lm -ldl
-	])
- 
-	PHP_SUBST(SQLITE_SHARED_LIBADD)
-	PHP_NEW_EXTENSION(sqlite, sqlite.c libsqlite/src/encode.c, $ext_shared)
-  else
-	# use bundled library
-
-	PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src"
-
-
-	sources="libsqlite/src/opcodes.c
-		libsqlite/src/parse.c libsqlite/src/encode.c \
-		libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
-		libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
-		libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
-		libsqlite/src/os.c libsqlite/src/pager.c \
-		libsqlite/src/printf.c libsqlite/src/random.c \
-		libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
-		libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
-		libsqlite/src/where.c libsqlite/src/trigger.c"
-	
-  	PHP_NEW_EXTENSION(sqlite, sqlite.c $sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
-	PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
-	PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
-	AC_CHECK_SIZEOF(char *,4)
-	AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
-	AC_DEFINE(OS_UNIX, 1, [if this is unix])
-	AC_DEFINE(OS_WIN, 0, [if this is windows])
-	dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
-	dnl which is a bit silly and something we want to avoid
-	SQLITE_ENCODING="iso8859"
-	dnl SQLITE_ENCODING="UTF-8"
-	dnl AC_DEFINE(SQLITE_UTF8,1,[if SQLite should use utf-8 encoding])
-	AC_SUBST(SQLITE_ENCODING)
-
-	AC_PATH_PROG(LEMON,lemon,no)
-	AC_SUBST(LEMON)
-
-	SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
-	AC_SUBST(SQLITE_VERSION)
-
-	if test "$ext_shared" = "no"; then
-	  echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
-	else
-	  echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
-	fi
-	
-	cat >> $ext_srcdir/libsqlite/src/config.h <<EOF
-#if ZTS
-# define THREADSAFE 1
-#endif
-#if !ZEND_DEBUG
-# define NDEBUG
-#endif
-EOF
-
-	sed -e s/--VERS--/`cat $ext_srcdir/libsqlite/VERSION`/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in >$ext_srcdir/libsqlite/src/sqlite.h
-
-	PHP_ADD_MAKEFILE_FRAGMENT
-
-  fi
-
-  AC_CHECK_FUNCS(usleep nanosleep)
-
-  AC_CHECK_HEADERS(time.h)
-fi

ext/sqlite/libsqlite/README

@@ -1,37 +0,0 @@
-This directory contains source code to 
-
-    SQLite: An Embeddable SQL Database Engine
-
-To compile the project, first create a directory in which to place
-the build products.  It is recommended, but not required, that the
-build directory be separate from the source directory.  Cd into the
-build directory and then from the build directory run the configure
-script found at the root of the source tree.  Then run "make".
-
-For example:
-
-    tar xzf sqlite.tar.gz    ;#  Unpack the source tree into "sqlite"
-    mkdir bld                ;#  Build will occur in a sibling directory
-    cd bld                   ;#  Change to the build directory
-    ../sqlite/configure      ;#  Run the configure script
-    make                     ;#  Run the makefile.
-
-The configure script uses autoconf 2.50 and libtool.  If the configure
-script does not work out for you, there is a generic makefile named
-"Makefile.linux-gcc" in the top directory of the source tree that you
-can copy and edit to suite your needs.  Comments on the generic makefile
-show what changes are needed.
-
-The linux binaries on the website are created using the generic makefile,
-not the configure script.  The configure script is unmaintained.  (You
-can volunteer to take over maintenance of the configure script, if you want!)
-The windows binaries on the website are created using MinGW32 configured
-as a cross-compiler running under Linux.  For details, see the ./publish.sh
-script at the top-level of the source tree.
-
-Contacts:
-
-   http://www.sqlite.org/
-   http://www.hwaci.com/sw/sqlite/
-   http://groups.yahoo.com/group/sqlite/
-   drh@hwaci.com

ext/sqlite/libsqlite/VERSION

@@ -1 +0,0 @@
-2.8.0

ext/sqlite/libsqlite/src/auth.c

@@ -1,152 +0,0 @@
-/*
-** 2003 January 11
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file contains code used to implement the sqlite_set_authorizer()
-** API.  This facility is an optional feature of the library.  Embedded
-** systems that do not need this facility may omit it by recompiling
-** the library with -DSQLITE_OMIT_AUTHORIZATION=1
-**
-** $Id$
-*/
-#include "sqliteInt.h"
-
-/*
-** All of the code in this file may be omitted by defining a single
-** macro.
-*/
-#ifndef SQLITE_OMIT_AUTHORIZATION
-
-/*
-** Set or clear the access authorization function.
-**
-** The access authorization function is be called during the compilation
-** phase to verify that the user has read and/or write access permission
-** various fields of the database.  The first argument to the auth function
-** is a copy of the 3rd argument to this routine.  The second argument
-** to the auth function is one of these constants:
-**
-**        SQLITE_READ_COLUMN
-**        SQLITE_WRITE_COLUMN
-**        SQLITE_DELETE_ROW
-**        SQLITE_INSERT_ROW
-**
-** The third and fourth arguments to the auth function are the name of
-** the table and the column that are being accessed.  The auth function
-** should return either SQLITE_OK, SQLITE_DENY, or SQLITE_IGNORE.  If
-** SQLITE_OK is returned, it means that access is allowed.  SQLITE_DENY
-** means that the SQL statement will never-run - the sqlite_exec() call
-** will return with an error.  SQLITE_IGNORE means that the SQL statement
-** should run but attempts to read the specified column will return NULL
-** and attempts to write the column will be ignored.
-**
-** Setting the auth function to NULL disables this hook.  The default
-** setting of the auth function is NULL.
-*/
-int sqlite_set_authorizer(
-  sqlite *db,
-  int (*xAuth)(void*,int,const char*,const char*),
-  void *pArg
-){
-  db->xAuth = xAuth;
-  db->pAuthArg = pArg;
-  return SQLITE_OK;
-}
-
-/*
-** Write an error message into pParse->zErrMsg that explains that the
-** user-supplied authorization function returned an illegal value.
-*/
-static void sqliteAuthBadReturnCode(Parse *pParse, int rc){
-  char zBuf[20];
-  sprintf(zBuf, "(%d)", rc);
-  sqliteSetString(&pParse->zErrMsg, "illegal return value ", zBuf,
-    " from the authorization function - should be SQLITE_OK, "
-    "SQLITE_IGNORE, or SQLITE_DENY", 0);
-  pParse->nErr++;
-  pParse->rc = SQLITE_MISUSE;
-}
-
-/*
-** The pExpr should be a TK_COLUMN expression.  The table referred to
-** is in pTabList with an offset of base.  Check to see if it is OK to read
-** this particular column.
-**
-** If the auth function returns SQLITE_IGNORE, change the TK_COLUMN 
-** instruction into a TK_NULL.  If the auth function returns SQLITE_DENY,
-** then generate an error.
-*/
-void sqliteAuthRead(
-  Parse *pParse,        /* The parser context */
-  Expr *pExpr,          /* The expression to check authorization on */
-  SrcList *pTabList,    /* All table that pExpr might refer to */
-  int base              /* Offset of pTabList relative to pExpr */
-){
-  sqlite *db = pParse->db;
-  int rc;
-  Table *pTab;
-  const char *zCol;
-  if( db->xAuth==0 ) return;
-  assert( pExpr->op==TK_COLUMN );
-  assert( pExpr->iTable>=base && pExpr->iTable<base+pTabList->nSrc );
-  pTab = pTabList->a[pExpr->iTable-base].pTab;
-  if( pTab==0 ) return;
-  if( pExpr->iColumn>=0 ){
-    assert( pExpr->iColumn<pTab->nCol );
-    zCol = pTab->aCol[pExpr->iColumn].zName;
-  }else if( pTab->iPKey>=0 ){
-    assert( pTab->iPKey<pTab->nCol );
-    zCol = pTab->aCol[pTab->iPKey].zName;
-  }else{
-    zCol = "ROWID";
-  }
-  rc = db->xAuth(db->pAuthArg, SQLITE_READ, pTab->zName, zCol);
-  if( rc==SQLITE_IGNORE ){
-    pExpr->op = TK_NULL;
-  }else if( rc==SQLITE_DENY ){
-    sqliteSetString(&pParse->zErrMsg,"access to ",
-        pTab->zName, ".", zCol, " is prohibited", 0);
-    pParse->nErr++;
-    pParse->rc = SQLITE_AUTH;
-  }else if( rc!=SQLITE_OK ){
-    sqliteAuthBadReturnCode(pParse, rc);
-  }
-}
-
-/*
-** Do an authorization check using the code and arguments given.  Return
-** either SQLITE_OK (zero) or SQLITE_IGNORE or SQLITE_DENY.  If SQLITE_DENY
-** is returned, then the error count and error message in pParse are
-** modified appropriately.
-*/
-int sqliteAuthCheck(
-  Parse *pParse,
-  int code,
-  const char *zArg1,
-  const char *zArg2
-){
-  sqlite *db = pParse->db;
-  int rc;
-  if( db->xAuth==0 ){
-    return SQLITE_OK;
-  }
-  rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2);
-  if( rc==SQLITE_DENY ){
-    sqliteSetString(&pParse->zErrMsg, "not authorized", 0);
-    pParse->rc = SQLITE_AUTH;
-    pParse->nErr++;
-  }else if( rc!=SQLITE_OK && rc!=SQLITE_IGNORE ){
-    rc = SQLITE_DENY;
-    sqliteAuthBadReturnCode(pParse, rc);
-  }
-  return rc;
-}
-
-#endif /* SQLITE_OMIT_AUTHORIZATION */

ext/sqlite/libsqlite/src/btree.h

@@ -1,71 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This header file defines the interface that the sqlite B-Tree file
-** subsystem.  See comments in the source code for a detailed description
-** of what each interface routine does.
-**
-** @(#) $Id$
-*/
-#ifndef _BTREE_H_
-#define _BTREE_H_
-
-typedef struct Btree Btree;
-typedef struct BtCursor BtCursor;
-
-int sqliteBtreeOpen(const char *zFilename, int mode, int nPg, Btree **ppBtree);
-int sqliteBtreeClose(Btree*);
-int sqliteBtreeSetCacheSize(Btree*, int);
-int sqliteBtreeSetSafetyLevel(Btree*, int);
-
-int sqliteBtreeBeginTrans(Btree*);
-int sqliteBtreeCommit(Btree*);
-int sqliteBtreeRollback(Btree*);
-int sqliteBtreeBeginCkpt(Btree*);
-int sqliteBtreeCommitCkpt(Btree*);
-int sqliteBtreeRollbackCkpt(Btree*);
-
-int sqliteBtreeCreateTable(Btree*, int*);
-int sqliteBtreeCreateIndex(Btree*, int*);
-int sqliteBtreeDropTable(Btree*, int);
-int sqliteBtreeClearTable(Btree*, int);
-
-int sqliteBtreeCursor(Btree*, int iTable, int wrFlag, BtCursor **ppCur);
-int sqliteBtreeMoveto(BtCursor*, const void *pKey, int nKey, int *pRes);
-int sqliteBtreeDelete(BtCursor*);
-int sqliteBtreeInsert(BtCursor*, const void *pKey, int nKey,
-                                 const void *pData, int nData);
-int sqliteBtreeFirst(BtCursor*, int *pRes);
-int sqliteBtreeLast(BtCursor*, int *pRes);
-int sqliteBtreeNext(BtCursor*, int *pRes);
-int sqliteBtreePrevious(BtCursor*, int *pRes);
-int sqliteBtreeKeySize(BtCursor*, int *pSize);
-int sqliteBtreeKey(BtCursor*, int offset, int amt, char *zBuf);
-int sqliteBtreeKeyCompare(BtCursor*, const void *pKey, int nKey,
-                          int nIgnore, int *pRes);
-int sqliteBtreeDataSize(BtCursor*, int *pSize);
-int sqliteBtreeData(BtCursor*, int offset, int amt, char *zBuf);
-int sqliteBtreeCloseCursor(BtCursor*);
-
-#define SQLITE_N_BTREE_META 10
-int sqliteBtreeGetMeta(Btree*, int*);
-int sqliteBtreeUpdateMeta(Btree*, int*);
-
-char *sqliteBtreeIntegrityCheck(Btree*, int*, int);
-
-#ifdef SQLITE_TEST
-int sqliteBtreePageDump(Btree*, int, int);
-int sqliteBtreeCursorDump(BtCursor*, int*);
-struct Pager *sqliteBtreePager(Btree*);
-int btree_native_byte_order;
-#endif
-
-#endif /* _BTREE_H_ */

ext/sqlite/libsqlite/src/delete.c

@@ -1,389 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file contains C code routines that are called by the parser
-** to handle DELETE FROM statements.
-**
-** $Id$
-*/
-#include "sqliteInt.h"
-
-
-/*
-** Given a table name, find the corresponding table and make sure the
-** table is writeable.  Generate an error and return NULL if not.  If
-** everything checks out, return a pointer to the Table structure.
-*/
-Table *sqliteTableNameToTable(Parse *pParse, const char *zTab){
-  Table *pTab;
-  pTab = sqliteFindTable(pParse->db, zTab);
-  if( pTab==0 ){
-    sqliteSetString(&pParse->zErrMsg, "no such table: ", zTab, 0);
-    pParse->nErr++;
-    return 0;
-  }
-  if( pTab->readOnly || pTab->pSelect ){
-    sqliteSetString(&pParse->zErrMsg, 
-      pTab->pSelect ? "view " : "table ",
-      zTab,
-      " may not be modified", 0);
-    pParse->nErr++;
-    return 0;      
-  }
-  return pTab;
-}
-
-/*
-** Given a table name, check to make sure the table exists, is writable
-** and is not a view.  If everything is OK, construct an SrcList holding
-** the table and return a pointer to the SrcList.  The calling function
-** is responsible for freeing the SrcList when it has finished with it.
-** If there is an error, leave a message on pParse->zErrMsg and return
-** NULL.
-*/
-SrcList *sqliteTableTokenToSrcList(Parse *pParse, Token *pTableName){
-  Table *pTab;
-  SrcList *pTabList;
-
-  pTabList = sqliteSrcListAppend(0, pTableName);
-  if( pTabList==0 ) return 0;
-  assert( pTabList->nSrc==1 );
-  pTab = sqliteTableNameToTable(pParse, pTabList->a[0].zName);
-  if( pTab==0 ){
-    sqliteSrcListDelete(pTabList);
-    return 0;
-  }
-  pTabList->a[0].pTab = pTab;
-  return pTabList;
-}
-
-/*
-** Process a DELETE FROM statement.
-*/
-void sqliteDeleteFrom(
-  Parse *pParse,         /* The parser context */
-  Token *pTableName,     /* The table from which we should delete things */
-  Expr *pWhere           /* The WHERE clause.  May be null */
-){
-  Vdbe *v;               /* The virtual database engine */
-  Table *pTab;           /* The table from which records will be deleted */
-  char *zTab;            /* Name of the table from which we are deleting */
-  SrcList *pTabList;     /* A fake FROM clause holding just pTab */
-  int end, addr;         /* A couple addresses of generated code */
-  int i;                 /* Loop counter */
-  WhereInfo *pWInfo;     /* Information about the WHERE clause */
-  Index *pIdx;           /* For looping over indices of the table */
-  int base;              /* Index of the first available table cursor */
-  sqlite *db;            /* Main database structure */
-  int openOp;            /* Opcode used to open a cursor to the table */
-
-  int row_triggers_exist = 0;
-  int oldIdx = -1;
-
-  if( pParse->nErr || sqlite_malloc_failed ){
-    pTabList = 0;
-    goto delete_from_cleanup;
-  }
-  db = pParse->db;
-
-  /* Check for the special case of a VIEW with one or more ON DELETE triggers 
-  ** defined 
-  */
-  zTab = sqliteTableNameFromToken(pTableName);
-  if( zTab != 0 ){
-    pTab = sqliteFindTable(pParse->db, zTab);
-    if( pTab ){
-      row_triggers_exist = 
-        sqliteTriggersExist(pParse, pTab->pTrigger, 
-            TK_DELETE, TK_BEFORE, TK_ROW, 0) ||
-        sqliteTriggersExist(pParse, pTab->pTrigger, 
-            TK_DELETE, TK_AFTER, TK_ROW, 0);
-    }
-    sqliteFree(zTab);
-    if( row_triggers_exist &&  pTab->pSelect ){
-      /* Just fire VIEW triggers */
-      sqliteViewTriggers(pParse, pTab, pWhere, OE_Replace, 0);
-      return;
-    }
-  }
-
-  /* Locate the table which we want to delete.  This table has to be
-  ** put in an SrcList structure because some of the subroutines we
-  ** will be calling are designed to work with multiple tables and expect
-  ** an SrcList* parameter instead of just a Table* parameter.
-  */
-  pTabList = sqliteTableTokenToSrcList(pParse, pTableName);
-  if( pTabList==0 ) goto delete_from_cleanup;
-  assert( pTabList->nSrc==1 );
-  pTab = pTabList->a[0].pTab;
-  assert( pTab->pSelect==0 );  /* This table is not a view */
-  if( sqliteAuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0) ){
-    goto delete_from_cleanup;
-  }
-
-  /* Allocate a cursor used to store the old.* data for a trigger.
-  */
-  if( row_triggers_exist ){ 
-    oldIdx = pParse->nTab++;
-  }
-
-  /* Resolve the column names in all the expressions.
-  */
-  base = pParse->nTab++;
-  if( pWhere ){
-    if( sqliteExprResolveIds(pParse, base, pTabList, 0, pWhere) ){
-      goto delete_from_cleanup;
-    }
-    if( sqliteExprCheck(pParse, pWhere, 0, 0) ){
-      goto delete_from_cleanup;
-    }
-  }
-
-  /* Begin generating code.
-  */
-  v = sqliteGetVdbe(pParse);
-  if( v==0 ){
-    goto delete_from_cleanup;
-  }
-  sqliteBeginWriteOperation(pParse, row_triggers_exist,
-       !row_triggers_exist && pTab->isTemp);
-
-  /* Initialize the counter of the number of rows deleted, if
-  ** we are counting rows.
-  */
-  if( db->flags & SQLITE_CountRows ){
-    sqliteVdbeAddOp(v, OP_Integer, 0, 0);
-  }
-
-  /* Special case: A DELETE without a WHERE clause deletes everything.
-  ** It is easier just to erase the whole table.  Note, however, that
-  ** this means that the row change count will be incorrect.
-  */
-  if( pWhere==0 && !row_triggers_exist ){
-    if( db->flags & SQLITE_CountRows ){
-      /* If counting rows deleted, just count the total number of
-      ** entries in the table. */
-      int endOfLoop = sqliteVdbeMakeLabel(v);
-      int addr;
-      openOp = pTab->isTemp ? OP_OpenAux : OP_Open;
-      sqliteVdbeAddOp(v, openOp, base, pTab->tnum);
-      sqliteVdbeAddOp(v, OP_Rewind, base, sqliteVdbeCurrentAddr(v)+2);
-      addr = sqliteVdbeAddOp(v, OP_AddImm, 1, 0);
-      sqliteVdbeAddOp(v, OP_Next, base, addr);
-      sqliteVdbeResolveLabel(v, endOfLoop);
-      sqliteVdbeAddOp(v, OP_Close, base, 0);
-    }
-    sqliteVdbeAddOp(v, OP_Clear, pTab->tnum, pTab->isTemp);
-    for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-      sqliteVdbeAddOp(v, OP_Clear, pIdx->tnum, pTab->isTemp);
-    }
-  }
-
-  /* The usual case: There is a WHERE clause so we have to scan through
-  ** the table an pick which records to delete.
-  */
-  else{
-    /* Begin the database scan
-    */
-    pWInfo = sqliteWhereBegin(pParse, base, pTabList, pWhere, 1, 0);
-    if( pWInfo==0 ) goto delete_from_cleanup;
-
-    /* Remember the key of every item to be deleted.
-    */
-    sqliteVdbeAddOp(v, OP_ListWrite, 0, 0);
-    if( db->flags & SQLITE_CountRows ){
-      sqliteVdbeAddOp(v, OP_AddImm, 1, 0);
-    }
-
-    /* End the database scan loop.
-    */
-    sqliteWhereEnd(pWInfo);
-
-    /* Delete every item whose key was written to the list during the
-    ** database scan.  We have to delete items after the scan is complete
-    ** because deleting an item can change the scan order.
-    */
-    sqliteVdbeAddOp(v, OP_ListRewind, 0, 0);
-    end = sqliteVdbeMakeLabel(v);
-
-    /* This is the beginning of the delete loop when there are
-    ** row triggers.
-    */
-    if( row_triggers_exist ){
-      addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end);
-      sqliteVdbeAddOp(v, OP_Dup, 0, 0);
-
-      openOp = pTab->isTemp ? OP_OpenAux : OP_Open;
-      sqliteVdbeAddOp(v, openOp, base, pTab->tnum);
-      sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
-      sqliteVdbeAddOp(v, OP_OpenTemp, oldIdx, 0);
-
-      sqliteVdbeAddOp(v, OP_Integer, 13, 0);
-      for(i = 0; i<pTab->nCol; i++){
-        if( i==pTab->iPKey ){ 
-          sqliteVdbeAddOp(v, OP_Recno, base, 0);
-	} else {
-          sqliteVdbeAddOp(v, OP_Column, base, i);
-	}
-      }
-      sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0);
-      sqliteVdbeAddOp(v, OP_PutIntKey, oldIdx, 0);
-      sqliteVdbeAddOp(v, OP_Close, base, 0);
-      sqliteVdbeAddOp(v, OP_Rewind, oldIdx, 0);
-
-      sqliteCodeRowTrigger(pParse, TK_DELETE, 0, TK_BEFORE, pTab, -1, 
-          oldIdx, (pParse->trigStack)?pParse->trigStack->orconf:OE_Default,
-	  addr);
-    }
-
-    /* Open cursors for the table we are deleting from and all its
-    ** indices.  If there are row triggers, this happens inside the
-    ** OP_ListRead loop because the cursor have to all be closed
-    ** before the trigger fires.  If there are no row triggers, the
-    ** cursors are opened only once on the outside the loop.
-    */
-    pParse->nTab = base + 1;
-    openOp = pTab->isTemp ? OP_OpenWrAux : OP_OpenWrite;
-    sqliteVdbeAddOp(v, openOp, base, pTab->tnum);
-    for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
-      sqliteVdbeAddOp(v, openOp, pParse->nTab++, pIdx->tnum);
-    }
-
-    /* This is the beginning of the delete loop when there are no
-    ** row triggers */
-    if( !row_triggers_exist ){ 
-      addr = sqliteVdbeAddOp(v, OP_ListRead, 0, end);
-    }
-
-    /* Delete the row */
-    sqliteGenerateRowDelete(db, v, pTab, base, pParse->trigStack==0);
-
-    /* If there are row triggers, close all cursors then invoke
-    ** the AFTER triggers
-    */
-    if( row_triggers_exist ){
-      for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
-        sqliteVdbeAddOp(v, OP_Close, base + i, pIdx->tnum);
-      }
-      sqliteVdbeAddOp(v, OP_Close, base, 0);
-      sqliteCodeRowTrigger(pParse, TK_DELETE, 0, TK_AFTER, pTab, -1, 
-          oldIdx, (pParse->trigStack)?pParse->trigStack->orconf:OE_Default,
-	  addr);
-    }
-
-    /* End of the delete loop */
-    sqliteVdbeAddOp(v, OP_Goto, 0, addr);
-    sqliteVdbeResolveLabel(v, end);
-    sqliteVdbeAddOp(v, OP_ListReset, 0, 0);
-
-    /* Close the cursors after the loop if there are no row triggers */
-    if( !row_triggers_exist ){
-      for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
-        sqliteVdbeAddOp(v, OP_Close, base + i, pIdx->tnum);
-      }
-      sqliteVdbeAddOp(v, OP_Close, base, 0);
-      pParse->nTab = base;
-    }
-  }
-  sqliteEndWriteOperation(pParse);
-
-  /*
-  ** Return the number of rows that were deleted.
-  */
-  if( db->flags & SQLITE_CountRows ){
-    sqliteVdbeAddOp(v, OP_ColumnName, 0, 0);
-    sqliteVdbeChangeP3(v, -1, "rows deleted", P3_STATIC);
-    sqliteVdbeAddOp(v, OP_Callback, 1, 0);
-  }
-
-delete_from_cleanup:
-  sqliteSrcListDelete(pTabList);
-  sqliteExprDelete(pWhere);
-  return;
-}
-
-/*
-** This routine generates VDBE code that causes a single row of a
-** single table to be deleted.
-**
-** The VDBE must be in a particular state when this routine is called.
-** These are the requirements:
-**
-**   1.  A read/write cursor pointing to pTab, the table containing the row
-**       to be deleted, must be opened as cursor number "base".
-**
-**   2.  Read/write cursors for all indices of pTab must be open as
-**       cursor number base+i for the i-th index.
-**
-**   3.  The record number of the row to be deleted must be on the top
-**       of the stack.
-**
-** This routine pops the top of the stack to remove the record number
-** and then generates code to remove both the table record and all index
-** entries that point to that record.
-*/
-void sqliteGenerateRowDelete(
-  sqlite *db,        /* The database containing the index */
-  Vdbe *v,           /* Generate code into this VDBE */
-  Table *pTab,       /* Table containing the row to be deleted */
-  int base,          /* Cursor number for the table */
-  int count          /* Increment the row change counter */
-){
-  int addr;
-  addr = sqliteVdbeAddOp(v, OP_NotExists, base, 0);
-  sqliteGenerateRowIndexDelete(db, v, pTab, base, 0);
-  sqliteVdbeAddOp(v, OP_Delete, base, count);
-  sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v));
-}
-
-/*
-** This routine generates VDBE code that causes the deletion of all
-** index entries associated with a single row of a single table.
-**
-** The VDBE must be in a particular state when this routine is called.
-** These are the requirements:
-**
-**   1.  A read/write cursor pointing to pTab, the table containing the row
-**       to be deleted, must be opened as cursor number "base".
-**
-**   2.  Read/write cursors for all indices of pTab must be open as
-**       cursor number base+i for the i-th index.
-**
-**   3.  The "base" cursor must be pointing to the row that is to be
-**       deleted.
-*/
-void sqliteGenerateRowIndexDelete(
-  sqlite *db,        /* The database containing the index */
-  Vdbe *v,           /* Generate code into this VDBE */
-  Table *pTab,       /* Table containing the row to be deleted */
-  int base,          /* Cursor number for the table */
-  char *aIdxUsed     /* Only delete if aIdxUsed!=0 && aIdxUsed[i]!=0 */
-){
-  int i;
-  Index *pIdx;
-
-  for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
-    int j;
-    if( aIdxUsed!=0 && aIdxUsed[i-1]==0 ) continue;
-    sqliteVdbeAddOp(v, OP_Recno, base, 0);
-    for(j=0; j<pIdx->nColumn; j++){
-      int idx = pIdx->aiColumn[j];
-      if( idx==pTab->iPKey ){
-        sqliteVdbeAddOp(v, OP_Dup, j, 0);
-      }else{
-        sqliteVdbeAddOp(v, OP_Column, base, idx);
-      }
-    }
-    sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0);
-    if( db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx);
-    sqliteVdbeAddOp(v, OP_IdxDelete, base+i, 0);
-  }
-}

ext/sqlite/libsqlite/src/encode.c

@@ -1,165 +0,0 @@
-/*
-** 2002 April 25
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file contains helper routines used to translate binary data into
-** a null-terminated string (suitable for use in SQLite) and back again.
-** These are convenience routines for use by people who want to store binary
-** data in an SQLite database.  The code in this file is not used by any other
-** part of the SQLite library.
-**
-** $Id$
-*/
-#include <string.h>
-
-/*
-** Encode a binary buffer "in" of size n bytes so that it contains
-** no instances of characters '\'' or '\000'.  The output is 
-** null-terminated and can be used as a string value in an INSERT
-** or UPDATE statement.  Use sqlite_decode_binary() to convert the
-** string back into its original binary.
-**
-** The result is written into a preallocated output buffer "out".
-** "out" must be able to hold at least (256*n + 1262)/253 bytes.
-** In other words, the output will be expanded by as much as 3
-** bytes for every 253 bytes of input plus 2 bytes of fixed overhead.
-** (This is approximately 2 + 1.019*n or about a 2% size increase.)
-**
-** The return value is the number of characters in the encoded
-** string, excluding the "\000" terminator.
-*/
-int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out){
-  int i, j, e, m;
-  int cnt[256];
-  if( n<=0 ){
-    out[0] = 'x';
-    out[1] = 0;
-    return 1;
-  }
-  memset(cnt, 0, sizeof(cnt));
-  for(i=n-1; i>=0; i--){ cnt[in[i]]++; }
-  m = n;
-  for(i=1; i<256; i++){
-    int sum;
-    if( i=='\'' ) continue;
-    sum = cnt[i] + cnt[(i+1)&0xff] + cnt[(i+'\'')&0xff];
-    if( sum<m ){
-      m = sum;
-      e = i;
-      if( m==0 ) break;
-    }
-  }
-  out[0] = e;
-  j = 1;
-  for(i=0; i<n; i++){
-    int c = (in[i] - e)&0xff;
-    if( c==0 ){
-      out[j++] = 1;
-      out[j++] = 1;
-    }else if( c==1 ){
-      out[j++] = 1;
-      out[j++] = 2;
-    }else if( c=='\'' ){
-      out[j++] = 1;
-      out[j++] = 3;
-    }else{
-      out[j++] = c;
-    }
-  }
-  out[j] = 0;
-  return j;
-}
-
-/*
-** Decode the string "in" into binary data and write it into "out".
-** This routine reverses the encoded created by sqlite_encode_binary().
-** The output will always be a few bytes less than the input.  The number
-** of bytes of output is returned.  If the input is not a well-formed
-** encoding, -1 is returned.
-**
-** The "in" and "out" parameters may point to the same buffer in order
-** to decode a string in place.
-*/
-int sqlite_decode_binary(const unsigned char *in, unsigned char *out){
-  int i, c, e;
-  e = *(in++);
-  i = 0;
-  while( (c = *(in++))!=0 ){
-    if( c==1 ){
-      c = *(in++);
-      if( c==1 ){
-        c = 0;
-      }else if( c==2 ){
-        c = 1;
-      }else if( c==3 ){
-        c = '\'';
-      }else{
-        return -1;
-      }
-    }
-    out[i++] = (c + e)&0xff;
-  }
-  return i;
-}
-
-#ifdef ENCODER_TEST
-/*
-** The subroutines above are not tested by the usual test suite.  To test
-** these routines, compile just this one file with a -DENCODER_TEST=1 option
-** and run the result.
-*/
-int main(int argc, char **argv){
-  int i, j, n, m, nOut;
-  unsigned char in[30000];
-  unsigned char out[33000];
-
-  for(i=0; i<sizeof(in); i++){
-    printf("Test %d: ", i+1);
-    n = rand() % (i+1);
-    if( i%100==0 ){
-      int k;
-      for(j=k=0; j<n; j++){
-        /* if( k==0 || k=='\'' ) k++; */
-        in[j] = k;
-        k = (k+1)&0xff;
-      }
-    }else{
-      for(j=0; j<n; j++) in[j] = rand() & 0xff;
-    }
-    nOut = sqlite_encode_binary(in, n, out);
-    if( nOut!=strlen(out) ){
-      printf(" ERROR return value is %d instead of %d\n", nOut, strlen(out));
-      exit(1);
-    }
-    m = (256*n + 1262)/253;
-    printf("size %d->%d (max %d)", n, strlen(out)+1, m);
-    if( strlen(out)+1>m ){
-      printf(" ERROR output too big\n");
-      exit(1);
-    }
-    for(j=0; out[j]; j++){
-      if( out[j]=='\'' ){
-        printf(" ERROR contains (')\n");
-        exit(1);
-      }
-    }
-    j = sqlite_decode_binary(out, out);
-    if( j!=n ){
-      printf(" ERROR decode size %d\n", j);
-      exit(1);
-    }
-    if( memcmp(in, out, n)!=0 ){
-      printf(" ERROR decode mismatch\n");
-      exit(1);
-    }
-    printf(" OK\n");
-  }
-}
-#endif /* ENCODER_TEST */

ext/sqlite/libsqlite/src/func.c

@@ -1,531 +0,0 @@
-/*
-** 2002 February 23
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file contains the C functions that implement various SQL
-** functions of SQLite.  
-**
-** There is only one exported symbol in this file - the function
-** sqliteRegisterBuildinFunctions() found at the bottom of the file.
-** All other code has file scope.
-**
-** $Id$
-*/
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-#include <assert.h>
-#include "sqliteInt.h"
-
-/*
-** Implementation of the non-aggregate min() and max() functions
-*/
-static void minFunc(sqlite_func *context, int argc, const char **argv){
-  const char *zBest; 
-  int i;
-
-  if( argc==0 ) return;
-  zBest = argv[0];
-  if( zBest==0 ) return;
-  for(i=1; i<argc; i++){
-    if( argv[i]==0 ) return;
-    if( sqliteCompare(argv[i], zBest)<0 ){
-      zBest = argv[i];
-    }
-  }
-  sqlite_set_result_string(context, zBest, -1);
-}
-static void maxFunc(sqlite_func *context, int argc, const char **argv){
-  const char *zBest; 
-  int i;
-
-  if( argc==0 ) return;
-  zBest = argv[0];
-  if( zBest==0 ) return;
-  for(i=1; i<argc; i++){
-    if( argv[i]==0 ) return;
-    if( sqliteCompare(argv[i], zBest)>0 ){
-      zBest = argv[i];
-    }
-  }
-  sqlite_set_result_string(context, zBest, -1);
-}
-
-/*
-** Implementation of the length() function
-*/
-static void lengthFunc(sqlite_func *context, int argc, const char **argv){
-  const char *z;
-  int len;
-
-  assert( argc==1 );
-  z = argv[0];
-  if( z==0 ) return;
-#ifdef SQLITE_UTF8
-  for(len=0; *z; z++){ if( (0xc0&*z)!=0x80 ) len++; }
-#else
-  len = strlen(z);
-#endif
-  sqlite_set_result_int(context, len);
-}
-
-/*
-** Implementation of the abs() function
-*/
-static void absFunc(sqlite_func *context, int argc, const char **argv){
-  const char *z;
-  assert( argc==1 );
-  z = argv[0];
-  if( z==0 ) return;
-  if( z[0]=='-' && isdigit(z[1]) ) z++;
-  sqlite_set_result_string(context, z, -1);
-}
-
-/*
-** Implementation of the substr() function
-*/
-static void substrFunc(sqlite_func *context, int argc, const char **argv){
-  const char *z;
-#ifdef SQLITE_UTF8
-  const char *z2;
-  int i;
-#endif
-  int p1, p2, len;
-  assert( argc==3 );
-  z = argv[0];
-  if( z==0 ) return;
-  p1 = atoi(argv[1]?argv[1]:0);
-  p2 = atoi(argv[2]?argv[2]:0);
-#ifdef SQLITE_UTF8
-  for(len=0, z2=z; *z2; z2++){ if( (0xc0&*z2)!=0x80 ) len++; }
-#else
-  len = strlen(z);
-#endif
-  if( p1<0 ){
-    p1 += len;
-    if( p1<0 ){
-      p2 += p1;
-      p1 = 0;
-    }
-  }else if( p1>0 ){
-    p1--;
-  }
-  if( p1+p2>len ){
-    p2 = len-p1;
-  }
-#ifdef SQLITE_UTF8
-  for(i=0; i<p1; i++){
-    assert( z[i] );
-    if( (z[i]&0xc0)==0x80 ) p1++;
-  }
-  while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p1++; }
-  for(; i<p1+p2; i++){
-    assert( z[i] );
-    if( (z[i]&0xc0)==0x80 ) p2++;
-  }
-  while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p2++; }
-#endif
-  if( p2<0 ) p2 = 0;
-  sqlite_set_result_string(context, &z[p1], p2);
-}
-
-/*
-** Implementation of the round() function
-*/
-static void roundFunc(sqlite_func *context, int argc, const char **argv){
-  int n;
-  double r;
-  char zBuf[100];
-  assert( argc==1 || argc==2 );
-  if( argv[0]==0 || (argc==2 && argv[1]==0) ) return;
-  n = argc==2 ? atoi(argv[1]) : 0;
-  if( n>30 ) n = 30;
-  if( n<0 ) n = 0;
-  r = atof(argv[0]);
-  sprintf(zBuf,"%.*f",n,r);
-  sqlite_set_result_string(context, zBuf, -1);
-}
-
-/*
-** Implementation of the upper() and lower() SQL functions.
-*/
-static void upperFunc(sqlite_func *context, int argc, const char **argv){
-  char *z;
-  int i;
-  if( argc<1 || argv[0]==0 ) return;
-  z = sqlite_set_result_string(context, argv[0], -1);
-  if( z==0 ) return;
-  for(i=0; z[i]; i++){
-    if( islower(z[i]) ) z[i] = toupper(z[i]);
-  }
-}
-static void lowerFunc(sqlite_func *context, int argc, const char **argv){
-  char *z;
-  int i;
-  if( argc<1 || argv[0]==0 ) return;
-  z = sqlite_set_result_string(context, argv[0], -1);
-  if( z==0 ) return;
-  for(i=0; z[i]; i++){
-    if( isupper(z[i]) ) z[i] = tolower(z[i]);
-  }
-}
-
-/*
-** Implementation of the IFNULL(), NVL(), and COALESCE() functions.  
-** All three do the same thing.  They return the first argument
-** non-NULL argument.
-*/
-static void ifnullFunc(sqlite_func *context, int argc, const char **argv){
-  int i;
-  for(i=0; i<argc; i++){
-    if( argv[i] ){
-      sqlite_set_result_string(context, argv[i], -1);
-      break;
-    }
-  }
-}
-
-/*
-** Implementation of random().  Return a random integer.  
-*/
-static void randomFunc(sqlite_func *context, int argc, const char **argv){
-  sqlite_set_result_int(context, sqliteRandomInteger());
-}
-
-/*
-** Implementation of the last_insert_rowid() SQL function.  The return
-** value is the same as the sqlite_last_insert_rowid() API function.
-*/
-static void last_insert_rowid(sqlite_func *context, int arg, const char **argv){
-  sqlite *db = sqlite_user_data(context);
-  sqlite_set_result_int(context, sqlite_last_insert_rowid(db));
-}
-
-/*
-** Implementation of the like() SQL function.  This function implements
-** the build-in LIKE operator.  The first argument to the function is the
-** string and the second argument is the pattern.  So, the SQL statements:
-**
-**       A LIKE B
-**
-** is implemented as like(A,B).
-*/
-static void likeFunc(sqlite_func *context, int arg, const char **argv){
-  if( argv[0]==0 || argv[1]==0 ) return;
-  sqlite_set_result_int(context, sqliteLikeCompare(argv[0], argv[1]));
-}
-
-/*
-** Implementation of the glob() SQL function.  This function implements
-** the build-in GLOB operator.  The first argument to the function is the
-** string and the second argument is the pattern.  So, the SQL statements:
-**
-**       A GLOB B
-**
-** is implemented as glob(A,B).
-*/
-static void globFunc(sqlite_func *context, int arg, const char **argv){
-  if( argv[0]==0 || argv[1]==0 ) return;
-  sqlite_set_result_int(context, sqliteGlobCompare(argv[0], argv[1]));
-}
-
-/*
-** Implementation of the NULLIF(x,y) function.  The result is the first
-** argument if the arguments are different.  The result is NULL if the
-** arguments are equal to each other.
-*/
-static void nullifFunc(sqlite_func *context, int argc, const char **argv){
-  if( argv[0]!=0 && sqliteCompare(argv[0],argv[1])!=0 ){
-    sqlite_set_result_string(context, argv[0], -1);
-  }
-}
-
-/*
-** Implementation of the VERSION(*) function.  The result is the version
-** of the SQLite library that is running.
-*/
-static void versionFunc(sqlite_func *context, int argc, const char **argv){
-  sqlite_set_result_string(context, sqlite_version, -1);
-}
-
-#ifdef SQLITE_TEST
-/*
-** This function generates a string of random characters.  Used for
-** generating test data.
-*/
-static void randStr(sqlite_func *context, int argc, const char **argv){
-  static const char zSrc[] = 
-     "abcdefghijklmnopqrstuvwxyz"
-     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-     "0123456789"
-     ".-!,:*^+=_|?/<> ";
-  int iMin, iMax, n, r, i;
-  char zBuf[1000];
-  if( argc>=1 ){
-    iMin = atoi(argv[0]);
-    if( iMin<0 ) iMin = 0;
-    if( iMin>=sizeof(zBuf) ) iMin = sizeof(zBuf)-1;
-  }else{
-    iMin = 1;
-  }
-  if( argc>=2 ){
-    iMax = atoi(argv[1]);
-    if( iMax<iMin ) iMax = iMin;
-    if( iMax>=sizeof(zBuf) ) iMax = sizeof(zBuf);
-  }else{
-    iMax = 50;
-  }
-  n = iMin;
-  if( iMax>iMin ){
-    r = sqliteRandomInteger();
-    if( r<0 ) r = -r;
-    n += r%(iMax + 1 - iMin);
-  }
-  r = 0;
-  for(i=0; i<n; i++){
-    r = (r + sqliteRandomByte())% (sizeof(zSrc)-1);
-    zBuf[i] = zSrc[r];
-  }
-  zBuf[n] = 0;
-  sqlite_set_result_string(context, zBuf, n);
-}
-#endif
-
-/*
-** An instance of the following structure holds the context of a
-** sum() or avg() aggregate computation.
-*/
-typedef struct SumCtx SumCtx;
-struct SumCtx {
-  double sum;     /* Sum of terms */
-  int cnt;        /* Number of elements summed */
-};
-
-/*
-** Routines used to compute the sum or average.
-*/
-static void sumStep(sqlite_func *context, int argc, const char **argv){
-  SumCtx *p;
-  if( argc<1 ) return;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p && argv[0] ){
-    p->sum += atof(argv[0]);
-    p->cnt++;
-  }
-}
-static void sumFinalize(sqlite_func *context){
-  SumCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  sqlite_set_result_double(context, p ? p->sum : 0.0);
-}
-static void avgFinalize(sqlite_func *context){
-  SumCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p && p->cnt>0 ){
-    sqlite_set_result_double(context, p->sum/(double)p->cnt);
-  }
-}
-
-/*
-** An instance of the following structure holds the context of a
-** variance or standard deviation computation.
-*/
-typedef struct StdDevCtx StdDevCtx;
-struct StdDevCtx {
-  double sum;     /* Sum of terms */
-  double sum2;    /* Sum of the squares of terms */
-  int cnt;        /* Number of terms counted */
-};
-
-#if 0   /* Omit because math library is required */
-/*
-** Routines used to compute the standard deviation as an aggregate.
-*/
-static void stdDevStep(sqlite_func *context, int argc, const char **argv){
-  StdDevCtx *p;
-  double x;
-  if( argc<1 ) return;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p && argv[0] ){
-    x = atof(argv[0]);
-    p->sum += x;
-    p->sum2 += x*x;
-    p->cnt++;
-  }
-}
-static void stdDevFinalize(sqlite_func *context){
-  double rN = sqlite_aggregate_count(context);
-  StdDevCtx *p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p && p->cnt>1 ){
-    double rCnt = cnt;
-    sqlite_set_result_double(context, 
-       sqrt((p->sum2 - p->sum*p->sum/rCnt)/(rCnt-1.0)));
-  }
-}
-#endif
-
-/*
-** The following structure keeps track of state information for the
-** count() aggregate function.
-*/
-typedef struct CountCtx CountCtx;
-struct CountCtx {
-  int n;
-};
-
-/*
-** Routines to implement the count() aggregate function.
-*/
-static void countStep(sqlite_func *context, int argc, const char **argv){
-  CountCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( (argc==0 || argv[0]) && p ){
-    p->n++;
-  }
-}   
-static void countFinalize(sqlite_func *context){
-  CountCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  sqlite_set_result_int(context, p ? p->n : 0);
-}
-
-/*
-** This function tracks state information for the min() and max()
-** aggregate functions.
-*/
-typedef struct MinMaxCtx MinMaxCtx;
-struct MinMaxCtx {
-  char *z;         /* The best so far */
-  char zBuf[28];   /* Space that can be used for storage */
-};
-
-/*
-** Routines to implement min() and max() aggregate functions.
-*/
-static void minStep(sqlite_func *context, int argc, const char **argv){
-  MinMaxCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p==0 || argc<1 || argv[0]==0 ) return;
-  if( p->z==0 || sqliteCompare(argv[0],p->z)<0 ){
-    int len;
-    if( p->z && p->z!=p->zBuf ){
-      sqliteFree(p->z);
-    }
-    len = strlen(argv[0]);
-    if( len < sizeof(p->zBuf) ){
-      p->z = p->zBuf;
-    }else{
-      p->z = sqliteMalloc( len+1 );
-      if( p->z==0 ) return;
-    }
-    strcpy(p->z, argv[0]);
-  }
-}
-static void maxStep(sqlite_func *context, int argc, const char **argv){
-  MinMaxCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p==0 || argc<1 || argv[0]==0 ) return;
-  if( p->z==0 || sqliteCompare(argv[0],p->z)>0 ){
-    int len;
-    if( p->z && p->z!=p->zBuf ){
-      sqliteFree(p->z);
-    }
-    len = strlen(argv[0]);
-    if( len < sizeof(p->zBuf) ){
-      p->z = p->zBuf;
-    }else{
-      p->z = sqliteMalloc( len+1 );
-      if( p->z==0 ) return;
-    }
-    strcpy(p->z, argv[0]);
-  }
-}
-static void minMaxFinalize(sqlite_func *context){
-  MinMaxCtx *p;
-  p = sqlite_aggregate_context(context, sizeof(*p));
-  if( p && p->z ){
-    sqlite_set_result_string(context, p->z, strlen(p->z));
-  }
-  if( p && p->z && p->z!=p->zBuf ){
-    sqliteFree(p->z);
-  }
-}
-
-/*
-** This function registered all of the above C functions as SQL
-** functions.  This should be the only routine in this file with
-** external linkage.
-*/
-void sqliteRegisterBuiltinFunctions(sqlite *db){
-  static struct {
-     char *zName;
-     int nArg;
-     int dataType;
-     void (*xFunc)(sqlite_func*,int,const char**);
-  } aFuncs[] = {
-    { "min",       -1, SQLITE_ARGS,    minFunc    },
-    { "min",        0, 0,              0          },
-    { "max",       -1, SQLITE_ARGS,    maxFunc    },
-    { "max",        0, 0,              0          },
-    { "length",     1, SQLITE_NUMERIC, lengthFunc },
-    { "substr",     3, SQLITE_TEXT,    substrFunc },
-    { "abs",        1, SQLITE_NUMERIC, absFunc    },
-    { "round",      1, SQLITE_NUMERIC, roundFunc  },
-    { "round",      2, SQLITE_NUMERIC, roundFunc  },
-    { "upper",      1, SQLITE_TEXT,    upperFunc  },
-    { "lower",      1, SQLITE_TEXT,    lowerFunc  },
-    { "coalesce",  -1, SQLITE_ARGS,    ifnullFunc },
-    { "coalesce",   0, 0,              0          },
-    { "coalesce",   1, 0,              0          },
-    { "ifnull",     2, SQLITE_ARGS,    ifnullFunc },
-    { "random",    -1, SQLITE_NUMERIC, randomFunc },
-    { "like",       2, SQLITE_NUMERIC, likeFunc   },
-    { "glob",       2, SQLITE_NUMERIC, globFunc   },
-    { "nullif",     2, SQLITE_ARGS,    nullifFunc },
-    { "sqlite_version",0,SQLITE_TEXT,  versionFunc},
-#ifdef SQLITE_TEST
-    { "randstr",    2, SQLITE_TEXT,    randStr    },
-#endif
-  };
-  static struct {
-    char *zName;
-    int nArg;
-    int dataType;
-    void (*xStep)(sqlite_func*,int,const char**);
-    void (*xFinalize)(sqlite_func*);
-  } aAggs[] = {
-    { "min",    1, 0,              minStep,      minMaxFinalize },
-    { "max",    1, 0,              maxStep,      minMaxFinalize },
-    { "sum",    1, SQLITE_NUMERIC, sumStep,      sumFinalize    },
-    { "avg",    1, SQLITE_NUMERIC, sumStep,      avgFinalize    },
-    { "count",  0, SQLITE_NUMERIC, countStep,    countFinalize  },
-    { "count",  1, SQLITE_NUMERIC, countStep,    countFinalize  },
-#if 0
-    { "stddev", 1, SQLITE_NUMERIC, stdDevStep,   stdDevFinalize },
-#endif
-  };
-  int i;
-
-  for(i=0; i<sizeof(aFuncs)/sizeof(aFuncs[0]); i++){
-    sqlite_create_function(db, aFuncs[i].zName,
-           aFuncs[i].nArg, aFuncs[i].xFunc, 0);
-    if( aFuncs[i].xFunc ){
-      sqlite_function_type(db, aFuncs[i].zName, aFuncs[i].dataType);
-    }
-  }
-  sqlite_create_function(db, "last_insert_rowid", 0, 
-           last_insert_rowid, db);
-  sqlite_function_type(db, "last_insert_rowid", SQLITE_NUMERIC);
-  for(i=0; i<sizeof(aAggs)/sizeof(aAggs[0]); i++){
-    sqlite_create_aggregate(db, aAggs[i].zName,
-           aAggs[i].nArg, aAggs[i].xStep, aAggs[i].xFinalize, 0);
-    sqlite_function_type(db, aAggs[i].zName, aAggs[i].dataType);
-  }
-}

ext/sqlite/libsqlite/src/hash.c

@@ -1,355 +0,0 @@
-/*
-** 2001 September 22
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This is the implementation of generic hash-tables
-** used in SQLite.
-**
-** $Id$
-*/
-#include "sqliteInt.h"
-#include <assert.h>
-
-/* Turn bulk memory into a hash table object by initializing the
-** fields of the Hash structure.
-**
-** "new" is a pointer to the hash table that is to be initialized.
-** keyClass is one of the constants SQLITE_HASH_INT, SQLITE_HASH_POINTER,
-** SQLITE_HASH_BINARY, or SQLITE_HASH_STRING.  The value of keyClass 
-** determines what kind of key the hash table will use.  "copyKey" is
-** true if the hash table should make its own private copy of keys and
-** false if it should just use the supplied pointer.  CopyKey only makes
-** sense for SQLITE_HASH_STRING and SQLITE_HASH_BINARY and is ignored
-** for other key classes.
-*/
-void sqliteHashInit(Hash *new, int keyClass, int copyKey){
-  assert( new!=0 );
-  assert( keyClass>=SQLITE_HASH_INT && keyClass<=SQLITE_HASH_BINARY );
-  new->keyClass = keyClass;
-  new->copyKey = copyKey &&
-                (keyClass==SQLITE_HASH_STRING || keyClass==SQLITE_HASH_BINARY);
-  new->first = 0;
-  new->count = 0;
-  new->htsize = 0;
-  new->ht = 0;
-}
-
-/* Remove all entries from a hash table.  Reclaim all memory.
-** Call this routine to delete a hash table or to reset a hash table
-** to the empty state.
-*/
-void sqliteHashClear(Hash *pH){
-  HashElem *elem;         /* For looping over all elements of the table */
-
-  assert( pH!=0 );
-  elem = pH->first;
-  pH->first = 0;
-  if( pH->ht ) sqliteFree(pH->ht);
-  pH->ht = 0;
-  pH->htsize = 0;
-  while( elem ){
-    HashElem *next_elem = elem->next;
-    if( pH->copyKey && elem->pKey ){
-      sqliteFree(elem->pKey);
-    }
-    sqliteFree(elem);
-    elem = next_elem;
-  }
-  pH->count = 0;
-}
-
-/*
-** Hash and comparison functions when the mode is SQLITE_HASH_INT
-*/
-static int intHash(const void *pKey, int nKey){
-  return nKey ^ (nKey<<8) ^ (nKey>>8);
-}
-static int intCompare(const void *pKey1, int n1, const void *pKey2, int n2){
-  return n2 - n1;
-}
-
-/*
-** Hash and comparison functions when the mode is SQLITE_HASH_POINTER
-*/
-static int ptrHash(const void *pKey, int nKey){
-  uptr x = Addr(pKey);
-  return x ^ (x<<8) ^ (x>>8);
-}
-static int ptrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
-  if( pKey1==pKey2 ) return 0;
-  if( pKey1<pKey2 ) return -1;
-  return 1;
-}
-
-/*
-** Hash and comparison functions when the mode is SQLITE_HASH_STRING
-*/
-static int strHash(const void *pKey, int nKey){
-  return sqliteHashNoCase((const char*)pKey, nKey); 
-}
-static int strCompare(const void *pKey1, int n1, const void *pKey2, int n2){
-  if( n1!=n2 ) return n2-n1;
-  return sqliteStrNICmp((const char*)pKey1,(const char*)pKey2,n1);
-}
-
-/*
-** Hash and comparison functions when the mode is SQLITE_HASH_BINARY
-*/
-static int binHash(const void *pKey, int nKey){
-  int h = 0;
-  const char *z = (const char *)pKey;
-  while( nKey-- > 0 ){
-    h = (h<<3) ^ h ^ *(z++);
-  }
-  if( h<0 ) h = -h;
-  return h;
-}
-static int binCompare(const void *pKey1, int n1, const void *pKey2, int n2){
-  if( n1!=n2 ) return n2-n1;
-  return memcmp(pKey1,pKey2,n1);
-}
-
-/*
-** Return a pointer to the appropriate hash function given the key class.
-**
-** The C syntax in this function definition may be unfamilar to some 
-** programmers, so we provide the following additional explanation:
-**
-** The name of the function is "hashFunction".  The function takes a
-** single parameter "keyClass".  The return value of hashFunction()
-** is a pointer to another function.  Specifically, the return value
-** of hashFunction() is a pointer to a function that takes two parameters
-** with types "const void*" and "int" and returns an "int".
-*/
-static int (*hashFunction(int keyClass))(const void*,int){
-  switch( keyClass ){
-    case SQLITE_HASH_INT:     return &intHash;
-    case SQLITE_HASH_POINTER: return &ptrHash;
-    case SQLITE_HASH_STRING:  return &strHash;
-    case SQLITE_HASH_BINARY:  return &binHash;;
-    default: break;
-  }
-  return 0;
-}
-
-/*
-** Return a pointer to the appropriate hash function given the key class.
-**
-** For help in interpreted the obscure C code in the function definition,
-** see the header comment on the previous function.
-*/
-static int (*compareFunction(int keyClass))(const void*,int,const void*,int){
-  switch( keyClass ){
-    case SQLITE_HASH_INT:     return &intCompare;
-    case SQLITE_HASH_POINTER: return &ptrCompare;
-    case SQLITE_HASH_STRING:  return &strCompare;
-    case SQLITE_HASH_BINARY:  return &binCompare;
-    default: break;
-  }
-  return 0;
-}
-
-
-/* Resize the hash table so that it cantains "new_size" buckets.
-** "new_size" must be a power of 2.  The hash table might fail 
-** to resize if sqliteMalloc() fails.
-*/
-static void rehash(Hash *pH, int new_size){
-  struct _ht *new_ht;            /* The new hash table */
-  HashElem *elem, *next_elem;    /* For looping over existing elements */
-  HashElem *x;                   /* Element being copied to new hash table */
-  int (*xHash)(const void*,int); /* The hash function */
-
-  assert( (new_size & (new_size-1))==0 );
-  new_ht = (struct _ht *)sqliteMalloc( new_size*sizeof(struct _ht) );
-  if( new_ht==0 ) return;
-  if( pH->ht ) sqliteFree(pH->ht);
-  pH->ht = new_ht;
-  pH->htsize = new_size;
-  xHash = hashFunction(pH->keyClass);
-  for(elem=pH->first, pH->first=0; elem; elem = next_elem){
-    int h = (*xHash)(elem->pKey, elem->nKey) & (new_size-1);
-    next_elem = elem->next;
-    x = new_ht[h].chain;
-    if( x ){
-      elem->next = x;
-      elem->prev = x->prev;
-      if( x->prev ) x->prev->next = elem;
-      else          pH->first = elem;
-      x->prev = elem;
-    }else{
-      elem->next = pH->first;
-      if( pH->first ) pH->first->prev = elem;
-      elem->prev = 0;
-      pH->first = elem;
-    }
-    new_ht[h].chain = elem;
-    new_ht[h].count++;
-  }
-}
-
-/* This function (for internal use only) locates an element in an
-** hash table that matches the given key.  The hash for this key has
-** already been computed and is passed as the 4th parameter.
-*/
-static HashElem *findElementGivenHash(
-  const Hash *pH,     /* The pH to be searched */
-  const void *pKey,   /* The key we are searching for */
-  int nKey,
-  int h               /* The hash for this key. */
-){
-  HashElem *elem;                /* Used to loop thru the element list */
-  int count;                     /* Number of elements left to test */
-  int (*xCompare)(const void*,int,const void*,int);  /* comparison function */
-
-  if( pH->ht ){
-    elem = pH->ht[h].chain;
-    count = pH->ht[h].count;
-    xCompare = compareFunction(pH->keyClass);
-    while( count-- && elem ){
-      if( (*xCompare)(elem->pKey,elem->nKey,pKey,nKey)==0 ){ 
-        return elem;
-      }
-      elem = elem->next;
-    }
-  }
-  return 0;
-}
-
-/* Remove a single entry from the hash table given a pointer to that
-** element and a hash on the element's key.
-*/
-static void removeElementGivenHash(
-  Hash *pH,         /* The pH containing "elem" */
-  HashElem* elem,   /* The element to be removed from the pH */
-  int h             /* Hash value for the element */
-){
-  if( elem->prev ){
-    elem->prev->next = elem->next; 
-  }else{
-    pH->first = elem->next;
-  }
-  if( elem->next ){
-    elem->next->prev = elem->prev;
-  }
-  if( pH->ht[h].chain==elem ){
-    pH->ht[h].chain = elem->next;
-  }
-  pH->ht[h].count--;
-  if( pH->ht[h].count<=0 ){
-    pH->ht[h].chain = 0;
-  }
-  if( pH->copyKey && elem->pKey ){
-    sqliteFree(elem->pKey);
-  }
-  sqliteFree( elem );
-  pH->count--;
-}
-
-/* Attempt to locate an element of the hash table pH with a key
-** that matches pKey,nKey.  Return the data for this element if it is
-** found, or NULL if there is no match.
-*/
-void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){
-  int h;             /* A hash on key */
-  HashElem *elem;    /* The element that matches key */
-  int (*xHash)(const void*,int);  /* The hash function */
-
-  if( pH==0 || pH->ht==0 ) return 0;
-  xHash = hashFunction(pH->keyClass);
-  assert( xHash!=0 );
-  h = (*xHash)(pKey,nKey);
-  assert( (pH->htsize & (pH->htsize-1))==0 );
-  elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1));
-  return elem ? elem->data : 0;
-}
-
-/* Insert an element into the hash table pH.  The key is pKey,nKey
-** and the data is "data".
-**
-** If no element exists with a matching key, then a new
-** element is created.  A copy of the key is made if the copyKey
-** flag is set.  NULL is returned.
-**
-** If another element already exists with the same key, then the
-** new data replaces the old data and the old data is returned.
-** The key is not copied in this instance.  If a malloc fails, then
-** the new data is returned and the hash table is unchanged.
-**
-** If the "data" parameter to this function is NULL, then the
-** element corresponding to "key" is removed from the hash table.
-*/
-void *sqliteHashInsert(Hash *pH, const void *pKey, int nKey, void *data){
-  int hraw;             /* Raw hash value of the key */
-  int h;                /* the hash of the key modulo hash table size */
-  HashElem *elem;       /* Used to loop thru the element list */
-  HashElem *new_elem;   /* New element added to the pH */
-  int (*xHash)(const void*,int);  /* The hash function */
-
-  assert( pH!=0 );
-  xHash = hashFunction(pH->keyClass);
-  assert( xHash!=0 );
-  hraw = (*xHash)(pKey, nKey);
-  assert( (pH->htsize & (pH->htsize-1))==0 );
-  h = hraw & (pH->htsize-1);
-  elem = findElementGivenHash(pH,pKey,nKey,h);
-  if( elem ){
-    void *old_data = elem->data;
-    if( data==0 ){
-      removeElementGivenHash(pH,elem,h);
-    }else{
-      elem->data = data;
-    }
-    return old_data;
-  }
-  if( data==0 ) return 0;
-  new_elem = (HashElem*)sqliteMalloc( sizeof(HashElem) );
-  if( new_elem==0 ) return data;
-  if( pH->copyKey && pKey!=0 ){
-    new_elem->pKey = sqliteMallocRaw( nKey );
-    if( new_elem->pKey==0 ){
-      sqliteFree(new_elem);
-      return data;
-    }
-    memcpy((void*)new_elem->pKey, pKey, nKey);
-  }else{
-    new_elem->pKey = (void*)pKey;
-  }
-  new_elem->nKey = nKey;
-  pH->count++;
-  if( pH->htsize==0 ) rehash(pH,8);
-  if( pH->htsize==0 ){
-    pH->count = 0;
-    sqliteFree(new_elem);
-    return data;
-  }
-  if( pH->count > pH->htsize ){
-    rehash(pH,pH->htsize*2);
-  }
-  assert( (pH->htsize & (pH->htsize-1))==0 );
-  h = hraw & (pH->htsize-1);
-  elem = pH->ht[h].chain;
-  if( elem ){
-    new_elem->next = elem;
-    new_elem->prev = elem->prev;
-    if( elem->prev ){ elem->prev->next = new_elem; }
-    else            { pH->first = new_elem; }
-    elem->prev = new_elem;
-  }else{
-    new_elem->next = pH->first;
-    new_elem->prev = 0;
-    if( pH->first ){ pH->first->prev = new_elem; }
-    pH->first = new_elem;
-  }
-  pH->ht[h].count++;
-  pH->ht[h].chain = new_elem;
-  new_elem->data = data;
-  return 0;
-}

ext/sqlite/libsqlite/src/hash.h

@@ -1,109 +0,0 @@
-/*
-** 2001 September 22
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This is the header file for the generic hash-table implemenation
-** used in SQLite.
-**
-** $Id$
-*/
-#ifndef _SQLITE_HASH_H_
-#define _SQLITE_HASH_H_
-
-/* Forward declarations of structures. */
-typedef struct Hash Hash;
-typedef struct HashElem HashElem;
-
-/* A complete hash table is an instance of the following structure.
-** The internals of this structure are intended to be opaque -- client
-** code should not attempt to access or modify the fields of this structure
-** directly.  Change this structure only by using the routines below.
-** However, many of the "procedures" and "functions" for modifying and
-** accessing this structure are really macros, so we can't really make
-** this structure opaque.
-*/
-struct Hash {
-  char keyClass;          /* SQLITE_HASH_INT, _POINTER, _STRING, _BINARY */
-  char copyKey;           /* True if copy of key made on insert */
-  int count;              /* Number of entries in this table */
-  HashElem *first;        /* The first element of the array */
-  int htsize;             /* Number of buckets in the hash table */
-  struct _ht {            /* the hash table */
-    int count;               /* Number of entries with this hash */
-    HashElem *chain;         /* Pointer to first entry with this hash */
-  } *ht;
-};
-
-/* Each element in the hash table is an instance of the following 
-** structure.  All elements are stored on a single doubly-linked list.
-**
-** Again, this structure is intended to be opaque, but it can't really
-** be opaque because it is used by macros.
-*/
-struct HashElem {
-  HashElem *next, *prev;   /* Next and previous elements in the table */
-  void *data;              /* Data associated with this element */
-  void *pKey; int nKey;    /* Key associated with this element */
-};
-
-/*
-** There are 4 different modes of operation for a hash table:
-**
-**   SQLITE_HASH_INT         nKey is used as the key and pKey is ignored.
-**
-**   SQLITE_HASH_POINTER     pKey is used as the key and nKey is ignored.
-**
-**   SQLITE_HASH_STRING      pKey points to a string that is nKey bytes long
-**                           (including the null-terminator, if any).  Case
-**                           is ignored in comparisons.
-**
-**   SQLITE_HASH_BINARY      pKey points to binary data nKey bytes long. 
-**                           memcmp() is used to compare keys.
-**
-** A copy of the key is made for SQLITE_HASH_STRING and SQLITE_HASH_BINARY
-** if the copyKey parameter to HashInit is 1.  
-*/
-#define SQLITE_HASH_INT       1
-#define SQLITE_HASH_POINTER   2
-#define SQLITE_HASH_STRING    3
-#define SQLITE_HASH_BINARY    4
-
-/*
-** Access routines.  To delete, insert a NULL pointer.
-*/
-void sqliteHashInit(Hash*, int keytype, int copyKey);
-void *sqliteHashInsert(Hash*, const void *pKey, int nKey, void *pData);
-void *sqliteHashFind(const Hash*, const void *pKey, int nKey);
-void sqliteHashClear(Hash*);
-
-/*
-** Macros for looping over all elements of a hash table.  The idiom is
-** like this:
-**
-**   Hash h;
-**   HashElem *p;
-**   ...
-**   for(p=sqliteHashFirst(&h); p; p=sqliteHashNext(p)){
-**     SomeStructure *pData = sqliteHashData(p);
-**     // do something with pData
-**   }
-*/
-#define sqliteHashFirst(H)  ((H)->first)
-#define sqliteHashNext(E)   ((E)->next)
-#define sqliteHashData(E)   ((E)->data)
-#define sqliteHashKey(E)    ((E)->pKey)
-#define sqliteHashKeysize(E) ((E)->nKey)
-
-/*
-** Number of entries in a hash table
-*/
-#define sqliteHashCount(H)  ((H)->count)
-
-#endif /* _SQLITE_HASH_H_ */

ext/sqlite/libsqlite/src/insert.c

@@ -1,832 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file contains C code routines that are called by the parser
-** to handle INSERT statements in SQLite.
-**
-** $Id$
-*/
-#include "sqliteInt.h"
-
-/*
-** This routine is call to handle SQL of the following forms:
-**
-**    insert into TABLE (IDLIST) values(EXPRLIST)
-**    insert into TABLE (IDLIST) select
-**
-** The IDLIST following the table name is always optional.  If omitted,
-** then a list of all columns for the table is substituted.  The IDLIST
-** appears in the pColumn parameter.  pColumn is NULL if IDLIST is omitted.
-**
-** The pList parameter holds EXPRLIST in the first form of the INSERT
-** statement above, and pSelect is NULL.  For the second form, pList is
-** NULL and pSelect is a pointer to the select statement used to generate
-** data for the insert.
-**
-** The code generated follows one of three templates.  For a simple
-** select with data coming from a VALUES clause, the code executes
-** once straight down through.  The template looks like this:
-**
-**         open write cursor to <table> and its indices
-**         puts VALUES clause expressions onto the stack
-**         write the resulting record into <table>
-**         cleanup
-**
-** If the statement is of the form
-**
-**   INSERT INTO <table> SELECT ...
-**
-** And the SELECT clause does not read from <table> at any time, then
-** the generated code follows this template:
-**
-**         goto B
-**      A: setup for the SELECT
-**         loop over the tables in the SELECT
-**           gosub C
-**         end loop
-**         cleanup after the SELECT
-**         goto D
-**      B: open write cursor to <table> and its indices
-**         goto A
-**      C: insert the select result into <table>
-**         return
-**      D: cleanup
-**
-** The third template is used if the insert statement takes its
-** values from a SELECT but the data is being inserted into a table
-** that is also read as part of the SELECT.  In the third form,
-** we have to use a intermediate table to store the results of
-** the select.  The template is like this:
-**
-**         goto B
-**      A: setup for the SELECT
-**         loop over the tables in the SELECT
-**           gosub C
-**         end loop
-**         cleanup after the SELECT
-**         goto D
-**      C: insert the select result into the intermediate table
-**         return
-**      B: open a cursor to an intermediate table
-**         goto A
-**      D: open write cursor to <table> and its indices
-**         loop over the intermediate table
-**           transfer values form intermediate table into <table>
-**         end the loop
-**         cleanup
-*/
-void sqliteInsert(
-  Parse *pParse,        /* Parser context */
-  Token *pTableName,    /* Name of table into which we are inserting */
-  ExprList *pList,      /* List of values to be inserted */
-  Select *pSelect,      /* A SELECT statement to use as the data source */
-  IdList *pColumn,      /* Column names corresponding to IDLIST. */
-  int onError           /* How to handle constraint errors */
-){
-  Table *pTab;          /* The table to insert into */
-  char *zTab = 0;       /* Name of the table into which we are inserting */
-  int i, j, idx;        /* Loop counters */
-  Vdbe *v;              /* Generate code into this virtual machine */
-  Index *pIdx;          /* For looping over indices of the table */
-  int nColumn;          /* Number of columns in the data */
-  int base;             /* First available cursor */
-  int iCont, iBreak;    /* Beginning and end of the loop over srcTab */
-  sqlite *db;           /* The main database structure */
-  int openOp;           /* Opcode used to open cursors */
-  int keyColumn = -1;   /* Column that is the INTEGER PRIMARY KEY */
-  int endOfLoop;        /* Label for the end of the insertion loop */
-  int useTempTable;     /* Store SELECT results in intermediate table */
-  int srcTab;           /* Data comes from this temporary cursor if >=0 */
-  int iSelectLoop;      /* Address of code that implements the SELECT */
-  int iCleanup;         /* Address of the cleanup code */
-  int iInsertBlock;     /* Address of the subroutine used to insert data */
-  int iCntMem;          /* Memory cell used for the row counter */
-
-  int row_triggers_exist = 0; /* True if there are FOR EACH ROW triggers */
-  int newIdx = -1;
-
-  if( pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup;
-  db = pParse->db;
-
-  /* Locate the table into which we will be inserting new information.
-  */
-  zTab = sqliteTableNameFromToken(pTableName);
-  if( zTab==0 ) goto insert_cleanup;
-  pTab = sqliteFindTable(pParse->db, zTab);
-  if( pTab==0 ){
-    sqliteSetString(&pParse->zErrMsg, "no such table: ", zTab, 0);
-    pParse->nErr++;
-    goto insert_cleanup;
-  }
-  if( sqliteAuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0) ){
-    goto insert_cleanup;
-  }
-
-  /* Ensure that:
-  *  (a) the table is not read-only, 
-  *  (b) that if it is a view then ON INSERT triggers exist
-  */
-  row_triggers_exist = 
-    sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, 
-        TK_BEFORE, TK_ROW, 0) ||
-    sqliteTriggersExist(pParse, pTab->pTrigger, TK_INSERT, TK_AFTER, TK_ROW, 0);
-  if( pTab->readOnly || (pTab->pSelect && !row_triggers_exist) ){
-    sqliteSetString(&pParse->zErrMsg, 
-      pTab->pSelect ? "view " : "table ",
-      zTab,
-      " may not be modified", 0);
-    pParse->nErr++;
-    goto insert_cleanup;
-  }
-  sqliteFree(zTab);
-  zTab = 0;
-
-  if( pTab==0 ) goto insert_cleanup;
-
-  /* If pTab is really a view, make sure it has been initialized.
-  */
-  if( pTab->pSelect ){
-    if( sqliteViewGetColumnNames(pParse, pTab) ){
-      goto insert_cleanup;
-    }
-  }
-
-  /* Allocate a VDBE
-  */
-  v = sqliteGetVdbe(pParse);
-  if( v==0 ) goto insert_cleanup;
-  sqliteBeginWriteOperation(pParse, pSelect || row_triggers_exist,
-         !row_triggers_exist && pTab->isTemp);
-
-  /* if there are row triggers, allocate a temp table for new.* references. */
-  if( row_triggers_exist ){
-    newIdx = pParse->nTab++;
-  }
-
-  /* Figure out how many columns of data are supplied.  If the data
-  ** is coming from a SELECT statement, then this step also generates
-  ** all the code to implement the SELECT statement and invoke a subroutine
-  ** to process each row of the result. (Template 2.) If the SELECT
-  ** statement uses the the table that is being inserted into, then the
-  ** subroutine is also coded here.  That subroutine stores the SELECT
-  ** results in a temporary table. (Template 3.)
-  */
-  if( pSelect ){
-    /* Data is coming from a SELECT.  Generate code to implement that SELECT
-    */
-    int rc, iInitCode;
-    int opCode;
-    iInitCode = sqliteVdbeAddOp(v, OP_Goto, 0, 0);
-    iSelectLoop = sqliteVdbeCurrentAddr(v);
-    iInsertBlock = sqliteVdbeMakeLabel(v);
-    rc = sqliteSelect(pParse, pSelect, SRT_Subroutine, iInsertBlock, 0,0,0);
-    if( rc || pParse->nErr || sqlite_malloc_failed ) goto insert_cleanup;
-    iCleanup = sqliteVdbeMakeLabel(v);
-    sqliteVdbeAddOp(v, OP_Goto, 0, iCleanup);
-    assert( pSelect->pEList );
-    nColumn = pSelect->pEList->nExpr;
-
-    /* Set useTempTable to TRUE if the result of the SELECT statement
-    ** should be written into a temporary table.  Set to FALSE if each
-    ** row of the SELECT can be written directly into the result table.
-    */
-    opCode = pTab->isTemp ? OP_OpenTemp : OP_Open;
-    useTempTable = row_triggers_exist || sqliteVdbeFindOp(v,opCode,pTab->tnum);
-
-    if( useTempTable ){
-      /* Generate the subroutine that SELECT calls to process each row of
-      ** the result.  Store the result in a temporary table
-      */
-      srcTab = pParse->nTab++;
-      sqliteVdbeResolveLabel(v, iInsertBlock);
-      sqliteVdbeAddOp(v, OP_MakeRecord, nColumn, 0);
-      sqliteVdbeAddOp(v, OP_NewRecno, srcTab, 0);
-      sqliteVdbeAddOp(v, OP_Pull, 1, 0);
-      sqliteVdbeAddOp(v, OP_PutIntKey, srcTab, 0);
-      sqliteVdbeAddOp(v, OP_Return, 0, 0);
-
-      /* The following code runs first because the GOTO at the very top
-      ** of the program jumps to it.  Create the temporary table, then jump
-      ** back up and execute the SELECT code above.
-      */
-      sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v));
-      sqliteVdbeAddOp(v, OP_OpenTemp, srcTab, 0);
-      sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop);
-      sqliteVdbeResolveLabel(v, iCleanup);
-    }else{
-      sqliteVdbeChangeP2(v, iInitCode, sqliteVdbeCurrentAddr(v));
-    }
-  }else{
-    /* This is the case if the data for the INSERT is coming from a VALUES
-    ** clause
-    */
-    SrcList dummy;
-    assert( pList!=0 );
-    srcTab = -1;
-    useTempTable = 0;
-    assert( pList );
-    nColumn = pList->nExpr;
-    dummy.nSrc = 0;
-    for(i=0; i<nColumn; i++){
-      if( sqliteExprResolveIds(pParse, 0, &dummy, 0, pList->a[i].pExpr) ){
-        goto insert_cleanup;
-      }
-      if( sqliteExprCheck(pParse, pList->a[i].pExpr, 0, 0) ){
-        goto insert_cleanup;
-      }
-    }
-  }
-
-  /* Make sure the number of columns in the source data matches the number
-  ** of columns to be inserted into the table.
-  */
-  if( pColumn==0 && nColumn!=pTab->nCol ){
-    char zNum1[30];
-    char zNum2[30];
-    sprintf(zNum1,"%d", nColumn);
-    sprintf(zNum2,"%d", pTab->nCol);
-    sqliteSetString(&pParse->zErrMsg, "table ", pTab->zName,
-       " has ", zNum2, " columns but ",
-       zNum1, " values were supplied", 0);
-    pParse->nErr++;
-    goto insert_cleanup;
-  }
-  if( pColumn!=0 && nColumn!=pColumn->nId ){
-    char zNum1[30];
-    char zNum2[30];
-    sprintf(zNum1,"%d", nColumn);
-    sprintf(zNum2,"%d", pColumn->nId);
-    sqliteSetString(&pParse->zErrMsg, zNum1, " values for ",
-       zNum2, " columns", 0);
-    pParse->nErr++;
-    goto insert_cleanup;
-  }
-
-  /* If the INSERT statement included an IDLIST term, then make sure
-  ** all elements of the IDLIST really are columns of the table and 
-  ** remember the column indices.
-  **
-  ** If the table has an INTEGER PRIMARY KEY column and that column
-  ** is named in the IDLIST, then record in the keyColumn variable
-  ** the index into IDLIST of the primary key column.  keyColumn is
-  ** the index of the primary key as it appears in IDLIST, not as
-  ** is appears in the original table.  (The index of the primary
-  ** key in the original table is pTab->iPKey.)
-  */
-  if( pColumn ){
-    for(i=0; i<pColumn->nId; i++){
-      pColumn->a[i].idx = -1;
-    }
-    for(i=0; i<pColumn->nId; i++){
-      for(j=0; j<pTab->nCol; j++){
-        if( sqliteStrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){
-          pColumn->a[i].idx = j;
-          if( j==pTab->iPKey ){
-            keyColumn = i;
-          }
-          break;
-        }
-      }
-      if( j>=pTab->nCol ){
-        sqliteSetString(&pParse->zErrMsg, "table ", pTab->zName,
-           " has no column named ", pColumn->a[i].zName, 0);
-        pParse->nErr++;
-        goto insert_cleanup;
-      }
-    }
-  }
-
-  /* If there is no IDLIST term but the table has an integer primary
-  ** key, the set the keyColumn variable to the primary key column index
-  ** in the original table definition.
-  */
-  if( pColumn==0 ){
-    keyColumn = pTab->iPKey;
-  }
-
-  /* Open the temp table for FOR EACH ROW triggers
-  */
-  if( row_triggers_exist ){
-    sqliteVdbeAddOp(v, OP_OpenTemp, newIdx, 0);
-  }
-    
-  /* Initialize the count of rows to be inserted
-  */
-  if( db->flags & SQLITE_CountRows ){
-    iCntMem = pParse->nMem++;
-    sqliteVdbeAddOp(v, OP_Integer, 0, 0);
-    sqliteVdbeAddOp(v, OP_MemStore, iCntMem, 1);
-  }
-
-  /* Open tables and indices if there are no row triggers */
-  if( !row_triggers_exist ){
-    base = pParse->nTab;
-    openOp = pTab->isTemp ? OP_OpenWrAux : OP_OpenWrite;
-    sqliteVdbeAddOp(v, openOp, base, pTab->tnum);
-    sqliteVdbeChangeP3(v, -1, pTab->zName, P3_STATIC);
-    for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
-      sqliteVdbeAddOp(v, openOp, idx+base, pIdx->tnum);
-      sqliteVdbeChangeP3(v, -1, pIdx->zName, P3_STATIC);
-    }
-    pParse->nTab += idx;
-  }
-
-  /* If the data source is a temporary table, then we have to create
-  ** a loop because there might be multiple rows of data.  If the data
-  ** source is a subroutine call from the SELECT statement, then we need
-  ** to launch the SELECT statement processing.
-  */
-  if( useTempTable ){
-    iBreak = sqliteVdbeMakeLabel(v);
-    sqliteVdbeAddOp(v, OP_Rewind, srcTab, iBreak);
-    iCont = sqliteVdbeCurrentAddr(v);
-  }else if( pSelect ){
-    sqliteVdbeAddOp(v, OP_Goto, 0, iSelectLoop);
-    sqliteVdbeResolveLabel(v, iInsertBlock);
-  }
-
-  endOfLoop = sqliteVdbeMakeLabel(v);
-  if( row_triggers_exist ){
-
-    /* build the new.* reference row */
-    sqliteVdbeAddOp(v, OP_Integer, 13, 0);
-    for(i=0; i<pTab->nCol; i++){
-      if( pColumn==0 ){
-        j = i;
-      }else{
-        for(j=0; j<pColumn->nId; j++){
-          if( pColumn->a[j].idx==i ) break;
-        }
-      }
-      if( pColumn && j>=pColumn->nId ){
-        sqliteVdbeAddOp(v, OP_String, 0, 0);
-        sqliteVdbeChangeP3(v, -1, pTab->aCol[i].zDflt, P3_STATIC);
-      }else if( useTempTable ){
-        sqliteVdbeAddOp(v, OP_Column, srcTab, j); 
-      }else if( pSelect ){
-        sqliteVdbeAddOp(v, OP_Dup, nColumn-j-1, 1);
-      }else{
-        sqliteExprCode(pParse, pList->a[j].pExpr);
-      }
-    }
-    sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0);
-    sqliteVdbeAddOp(v, OP_PutIntKey, newIdx, 0);
-    sqliteVdbeAddOp(v, OP_Rewind, newIdx, 0);
-
-    /* Fire BEFORE triggers */
-    if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_BEFORE, pTab, newIdx, -1, 
-        onError, endOfLoop) ){
-      goto insert_cleanup;
-    }
-
-    /* Open the tables and indices for the INSERT */
-    if( !pTab->pSelect ){
-      base = pParse->nTab;
-      openOp = pTab->isTemp ? OP_OpenWrAux : OP_OpenWrite;
-      sqliteVdbeAddOp(v, openOp, base, pTab->tnum);
-      sqliteVdbeChangeP3(v, -1, pTab->zName, P3_STATIC);
-      for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
-        sqliteVdbeAddOp(v, openOp, idx+base, pIdx->tnum);
-        sqliteVdbeChangeP3(v, -1, pIdx->zName, P3_STATIC);
-      }
-      pParse->nTab += idx;
-    }
-  }
-
-  /* Push the record number for the new entry onto the stack.  The
-  ** record number is a randomly generate integer created by NewRecno
-  ** except when the table has an INTEGER PRIMARY KEY column, in which
-  ** case the record number is the same as that column. 
-  */
-  if( !pTab->pSelect ){
-    if( keyColumn>=0 ){
-      if( useTempTable ){
-        sqliteVdbeAddOp(v, OP_Column, srcTab, keyColumn);
-      }else if( pSelect ){
-        sqliteVdbeAddOp(v, OP_Dup, nColumn - keyColumn - 1, 1);
-      }else{
-        sqliteExprCode(pParse, pList->a[keyColumn].pExpr);
-      }
-      /* If the PRIMARY KEY expression is NULL, then use OP_NewRecno
-      ** to generate a unique primary key value.
-      */
-      sqliteVdbeAddOp(v, OP_NotNull, -1, sqliteVdbeCurrentAddr(v)+3);
-      sqliteVdbeAddOp(v, OP_Pop, 1, 0);
-      sqliteVdbeAddOp(v, OP_NewRecno, base, 0);
-      sqliteVdbeAddOp(v, OP_MustBeInt, 0, 0);
-    }else{
-      sqliteVdbeAddOp(v, OP_NewRecno, base, 0);
-    }
-
-    /* Push onto the stack, data for all columns of the new entry, beginning
-    ** with the first column.
-    */
-    for(i=0; i<pTab->nCol; i++){
-      if( i==pTab->iPKey ){
-        /* The value of the INTEGER PRIMARY KEY column is always a NULL.
-        ** Whenever this column is read, the record number will be substituted
-        ** in its place.  So will fill this column with a NULL to avoid
-        ** taking up data space with information that will never be used. */
-        sqliteVdbeAddOp(v, OP_String, 0, 0);
-        continue;
-      }
-      if( pColumn==0 ){
-        j = i;
-      }else{
-        for(j=0; j<pColumn->nId; j++){
-          if( pColumn->a[j].idx==i ) break;
-        }
-      }
-      if( pColumn && j>=pColumn->nId ){
-        sqliteVdbeAddOp(v, OP_String, 0, 0);
-        sqliteVdbeChangeP3(v, -1, pTab->aCol[i].zDflt, P3_STATIC);
-      }else if( useTempTable ){
-        sqliteVdbeAddOp(v, OP_Column, srcTab, j); 
-      }else if( pSelect ){
-        sqliteVdbeAddOp(v, OP_Dup, i+nColumn-j, 1);
-      }else{
-        sqliteExprCode(pParse, pList->a[j].pExpr);
-      }
-    }
-
-    /* Generate code to check constraints and generate index keys and
-    ** do the insertion.
-    */
-    sqliteGenerateConstraintChecks(pParse, pTab, base, 0,0,0,onError,endOfLoop);
-    sqliteCompleteInsertion(pParse, pTab, base, 0,0,0);
-
-    /* Update the count of rows that are inserted
-    */
-    if( (db->flags & SQLITE_CountRows)!=0 ){
-      sqliteVdbeAddOp(v, OP_MemIncr, iCntMem, 0);
-    }
-  }
-
-  if( row_triggers_exist ){
-    /* Close all tables opened */
-    if( !pTab->pSelect ){
-      sqliteVdbeAddOp(v, OP_Close, base, 0);
-      for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
-        sqliteVdbeAddOp(v, OP_Close, idx+base, 0);
-      }
-    }
-
-    /* Code AFTER triggers */
-    if( sqliteCodeRowTrigger(pParse, TK_INSERT, 0, TK_AFTER, pTab, newIdx, -1, 
-          onError, endOfLoop) ){
-      goto insert_cleanup;
-    }
-  }
-
-  /* The bottom of the loop, if the data source is a SELECT statement
-  */
-  sqliteVdbeResolveLabel(v, endOfLoop);
-  if( useTempTable ){
-    sqliteVdbeAddOp(v, OP_Next, srcTab, iCont);
-    sqliteVdbeResolveLabel(v, iBreak);
-    sqliteVdbeAddOp(v, OP_Close, srcTab, 0);
-  }else if( pSelect ){
-    sqliteVdbeAddOp(v, OP_Pop, nColumn, 0);
-    sqliteVdbeAddOp(v, OP_Return, 0, 0);
-    sqliteVdbeResolveLabel(v, iCleanup);
-  }
-
-  if( !row_triggers_exist ){
-    /* Close all tables opened */
-    sqliteVdbeAddOp(v, OP_Close, base, 0);
-    for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
-      sqliteVdbeAddOp(v, OP_Close, idx+base, 0);
-    }
-  }
-
-  sqliteEndWriteOperation(pParse);
-
-  /*
-  ** Return the number of rows inserted.
-  */
-  if( db->flags & SQLITE_CountRows ){
-    sqliteVdbeAddOp(v, OP_ColumnName, 0, 0);
-    sqliteVdbeChangeP3(v, -1, "rows inserted", P3_STATIC);
-    sqliteVdbeAddOp(v, OP_MemLoad, iCntMem, 0);
-    sqliteVdbeAddOp(v, OP_Callback, 1, 0);
-  }
-
-insert_cleanup:
-  if( pList ) sqliteExprListDelete(pList);
-  if( pSelect ) sqliteSelectDelete(pSelect);
-  if ( zTab ) sqliteFree(zTab);
-  sqliteIdListDelete(pColumn);
-}
-
-/*
-** Generate code to do a constraint check prior to an INSERT or an UPDATE.
-**
-** When this routine is called, the stack contains (from bottom to top)
-** the following values:
-**
-**    1.  The recno of the row to be updated before it is updated.  This
-**        value is omitted unless we are doing an UPDATE that involves a
-**        change to the record number.
-**
-**    2.  The recno of the row after the update.
-**
-**    3.  The data in the first column of the entry after the update.
-**
-**    i.  Data from middle columns...
-**
-**    N.  The data in the last column of the entry after the update.
-**
-** The old recno shown as entry (1) above is omitted unless both isUpdate
-** and recnoChng are 1.  isUpdate is true for UPDATEs and false for
-** INSERTs and recnoChng is true if the record number is being changed.
-**
-** The code generated by this routine pushes additional entries onto
-** the stack which are the keys for new index entries for the new record.
-** The order of index keys is the same as the order of the indices on
-** the pTable->pIndex list.  A key is only created for index i if 
-** aIdxUsed!=0 and aIdxUsed[i]!=0.
-**
-** This routine also generates code to check constraints.  NOT NULL,
-** CHECK, and UNIQUE constraints are all checked.  If a constraint fails,
-** then the appropriate action is performed.  There are five possible
-** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE.
-**
-**  Constraint type  Action       What Happens
-**  ---------------  ----------   ----------------------------------------
-**  any              ROLLBACK     The current transaction is rolled back and
-**                                sqlite_exec() returns immediately with a
-**                                return code of SQLITE_CONSTRAINT.
-**
-**  any              ABORT        Back out changes from the current command
-**                                only (do not do a complete rollback) then
-**                                cause sqlite_exec() to return immediately
-**                                with SQLITE_CONSTRAINT.
-**
-**  any              FAIL         Sqlite_exec() returns immediately with a
-**                                return code of SQLITE_CONSTRAINT.  The
-**                                transaction is not rolled back and any
-**                                prior changes are retained.
-**
-**  any              IGNORE       The record number and data is popped from
-**                                the stack and there is an immediate jump
-**                                to label ignoreDest.
-**
-**  NOT NULL         REPLACE      The NULL value is replace by the default
-**                                value for that column.  If the default value
-**                                is NULL, the action is the same as ABORT.
-**
-**  UNIQUE           REPLACE      The other row that conflicts with the row
-**                                being inserted is removed.
-**
-**  CHECK            REPLACE      Illegal.  The results in an exception.
-**
-** Which action to take is determined by the overrideError parameter.
-** Or if overrideError==OE_Default, then the pParse->onError parameter
-** is used.  Or if pParse->onError==OE_Default then the onError value
-** for the constraint is used.
-**
-** The calling routine must open a read/write cursor for pTab with
-** cursor number "base".  All indices of pTab must also have open
-** read/write cursors with cursor number base+i for the i-th cursor.
-** Except, if there is no possibility of a REPLACE action then
-** cursors do not need to be open for indices where aIdxUsed[i]==0.
-**
-** If the isUpdate flag is true, it means that the "base" cursor is
-** initially pointing to an entry that is being updated.  The isUpdate
-** flag causes extra code to be generated so that the "base" cursor
-** is still pointing at the same entry after the routine returns.
-** Without the isUpdate flag, the "base" cursor might be moved.
-*/
-void sqliteGenerateConstraintChecks(
-  Parse *pParse,      /* The parser context */
-  Table *pTab,        /* the table into which we are inserting */
-  int base,           /* Index of a read/write cursor pointing at pTab */
-  char *aIdxUsed,     /* Which indices are used.  NULL means all are used */
-  int recnoChng,      /* True if the record number will change */
-  int isUpdate,       /* True for UPDATE, False for INSERT */
-  int overrideError,  /* Override onError to this if not OE_Default */
-  int ignoreDest      /* Jump to this label on an OE_Ignore resolution */
-){
-  int i;
-  Vdbe *v;
-  int nCol;
-  int onError;
-  int addr;
-  int extra;
-  int iCur;
-  Index *pIdx;
-  int seenReplace = 0;
-  int jumpInst1, jumpInst2;
-  int contAddr;
-  int hasTwoRecnos = (isUpdate && recnoChng);
-
-  v = sqliteGetVdbe(pParse);
-  assert( v!=0 );
-  assert( pTab->pSelect==0 );  /* This table is not a VIEW */
-  nCol = pTab->nCol;
-
-  /* Test all NOT NULL constraints.
-  */
-  for(i=0; i<nCol; i++){
-    if( i==pTab->iPKey ){
-      /* Fix me: Make sure the INTEGER PRIMARY KEY is not NULL. */
-      continue;
-    }
-    onError = pTab->aCol[i].notNull;
-    if( onError==OE_None ) continue;
-    if( overrideError!=OE_Default ){
-      onError = overrideError;
-    }else if( onError==OE_Default ){
-      onError = pParse->db->onError;
-      if( onError==OE_Default ) onError = OE_Abort;
-    }
-    if( onError==OE_Replace && pTab->aCol[i].zDflt==0 ){
-      onError = OE_Abort;
-    }
-    sqliteVdbeAddOp(v, OP_Dup, nCol-1-i, 1);
-    addr = sqliteVdbeAddOp(v, OP_NotNull, 1, 0);
-    switch( onError ){
-      case OE_Rollback:
-      case OE_Abort:
-      case OE_Fail: {
-        char *zMsg = 0;
-        sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError);
-        sqliteSetString(&zMsg, pTab->zName, ".", pTab->aCol[i].zName,
-                        " may not be NULL", 0);
-        sqliteVdbeChangeP3(v, -1, zMsg, P3_DYNAMIC);
-        break;
-      }
-      case OE_Ignore: {
-        sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0);
-        sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest);
-        break;
-      }
-      case OE_Replace: {
-        sqliteVdbeAddOp(v, OP_String, 0, 0);
-        sqliteVdbeChangeP3(v, -1, pTab->aCol[i].zDflt, P3_STATIC);
-        sqliteVdbeAddOp(v, OP_Push, nCol-i, 0);
-        break;
-      }
-      default: assert(0);
-    }
-    sqliteVdbeChangeP2(v, addr, sqliteVdbeCurrentAddr(v));
-  }
-
-  /* Test all CHECK constraints
-  */
-  /**** TBD ****/
-
-  /* If we have an INTEGER PRIMARY KEY, make sure the primary key
-  ** of the new record does not previously exist.  Except, if this
-  ** is an UPDATE and the primary key is not changing, that is OK.
-  ** Also, if the conflict resolution policy is REPLACE, then we
-  ** can skip this test.
-  */
-  if( (recnoChng || !isUpdate) && pTab->iPKey>=0 ){
-    onError = pTab->keyConf;
-    if( overrideError!=OE_Default ){
-      onError = overrideError;
-    }else if( onError==OE_Default ){
-      onError = pParse->db->onError;
-      if( onError==OE_Default ) onError = OE_Abort;
-    }
-    if( onError!=OE_Replace ){
-      if( isUpdate ){
-        sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1);
-        sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1);
-        jumpInst1 = sqliteVdbeAddOp(v, OP_Eq, 0, 0);
-      }
-      sqliteVdbeAddOp(v, OP_Dup, nCol, 1);
-      jumpInst2 = sqliteVdbeAddOp(v, OP_NotExists, base, 0);
-      switch( onError ){
-        case OE_Rollback:
-        case OE_Abort:
-        case OE_Fail: {
-          sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError);
-          sqliteVdbeChangeP3(v, -1, "PRIMARY KEY must be unique", P3_STATIC);
-          break;
-        }
-        case OE_Ignore: {
-          sqliteVdbeAddOp(v, OP_Pop, nCol+1+hasTwoRecnos, 0);
-          sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest);
-          break;
-        }
-        default: assert(0);
-      }
-      contAddr = sqliteVdbeCurrentAddr(v);
-      sqliteVdbeChangeP2(v, jumpInst2, contAddr);
-      if( isUpdate ){
-        sqliteVdbeChangeP2(v, jumpInst1, contAddr);
-        sqliteVdbeAddOp(v, OP_Dup, nCol+1, 1);
-        sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
-      }
-    }
-  }
-
-  /* Test all UNIQUE constraints by creating entries for each UNIQUE
-  ** index and making sure that duplicate entries do not already exist.
-  ** Add the new records to the indices as we go.
-  */
-  extra = 0;
-  for(extra=(-1), iCur=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, iCur++){
-    if( aIdxUsed && aIdxUsed[iCur]==0 ) continue;
-    extra++;    
-    sqliteVdbeAddOp(v, OP_Dup, nCol+extra, 1);
-    for(i=0; i<pIdx->nColumn; i++){
-      int idx = pIdx->aiColumn[i];
-      if( idx==pTab->iPKey ){
-        sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol+1, 1);
-      }else{
-        sqliteVdbeAddOp(v, OP_Dup, i+extra+nCol-idx, 1);
-      }
-    }
-    jumpInst1 = sqliteVdbeAddOp(v, OP_MakeIdxKey, pIdx->nColumn, 0);
-    if( pParse->db->file_format>=4 ) sqliteAddIdxKeyType(v, pIdx);
-    onError = pIdx->onError;
-    if( onError==OE_None ) continue;
-    if( overrideError!=OE_Default ){
-      onError = overrideError;
-    }else if( onError==OE_Default ){
-      onError = pParse->db->onError;
-      if( onError==OE_Default ) onError = OE_Abort;
-    }
-    sqliteVdbeAddOp(v, OP_Dup, extra+nCol+1+hasTwoRecnos, 1);
-    jumpInst2 = sqliteVdbeAddOp(v, OP_IsUnique, base+iCur+1, 0);
-    switch( onError ){
-      case OE_Rollback:
-      case OE_Abort:
-      case OE_Fail: {
-        sqliteVdbeAddOp(v, OP_Halt, SQLITE_CONSTRAINT, onError);
-        sqliteVdbeChangeP3(v, -1, "uniqueness constraint failed", P3_STATIC);
-        break;
-      }
-      case OE_Ignore: {
-        assert( seenReplace==0 );
-        sqliteVdbeAddOp(v, OP_Pop, nCol+extra+3+hasTwoRecnos, 0);
-        sqliteVdbeAddOp(v, OP_Goto, 0, ignoreDest);
-        break;
-      }
-      case OE_Replace: {
-        sqliteGenerateRowDelete(pParse->db, v, pTab, base, 0);
-        if( isUpdate ){
-          sqliteVdbeAddOp(v, OP_Dup, nCol+extra+1+hasTwoRecnos, 1);
-          sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
-        }
-        seenReplace = 1;
-        break;
-      }
-      default: assert(0);
-    }
-    contAddr = sqliteVdbeCurrentAddr(v);
-#if NULL_DISTINCT_FOR_UNIQUE
-    sqliteVdbeChangeP2(v, jumpInst1, contAddr);
-#endif
-    sqliteVdbeChangeP2(v, jumpInst2, contAddr);
-  }
-}
-
-/*
-** This routine generates code to finish the INSERT or UPDATE operation
-** that was started by a prior call to sqliteGenerateConstraintChecks.
-** The stack must contain keys for all active indices followed by data
-** and the recno for the new entry.  This routine creates the new
-** entries in all indices and in the main table.
-**
-** The arguments to this routine should be the same as the first six
-** arguments to sqliteGenerateConstraintChecks.
-*/
-void sqliteCompleteInsertion(
-  Parse *pParse,      /* The parser context */
-  Table *pTab,        /* the table into which we are inserting */
-  int base,           /* Index of a read/write cursor pointing at pTab */
-  char *aIdxUsed,     /* Which indices are used.  NULL means all are used */
-  int recnoChng,      /* True if the record number will change */
-  int isUpdate        /* True for UPDATE, False for INSERT */
-){
-  int i;
-  Vdbe *v;
-  int nIdx;
-  Index *pIdx;
-
-  v = sqliteGetVdbe(pParse);
-  assert( v!=0 );
-  assert( pTab->pSelect==0 );  /* This table is not a VIEW */
-  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){}
-  for(i=nIdx-1; i>=0; i--){
-    if( aIdxUsed && aIdxUsed[i]==0 ) continue;
-    sqliteVdbeAddOp(v, OP_IdxPut, base+i+1, 0);
-  }
-  sqliteVdbeAddOp(v, OP_MakeRecord, pTab->nCol, 0);
-  sqliteVdbeAddOp(v, OP_PutIntKey, base, pParse->trigStack?0:1);
-  if( isUpdate && recnoChng ){
-    sqliteVdbeAddOp(v, OP_Pop, 1, 0);
-  }
-}

ext/sqlite/libsqlite/src/main.c

@@ -1,989 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** Main file for the SQLite library.  The routines in this file
-** implement the programmer interface to the library.  Routines in
-** other files are for internal use by SQLite and should not be
-** accessed by users of the library.
-**
-** $Id$
-*/
-#include "sqliteInt.h"
-#include "os.h"
-#include <ctype.h>
-
-/*
-** A pointer to this structure is used to communicate information
-** from sqliteInit into the sqliteInitCallback.
-*/
-typedef struct {
-  sqlite *db;         /* The database being initialized */
-  char **pzErrMsg;    /* Error message stored here */
-} InitData;
-
-
-/*
-** This is the callback routine for the code that initializes the
-** database.  See sqliteInit() below for additional information.
-**
-** Each callback contains the following information:
-**
-**     argv[0] = "file-format" or "schema-cookie" or "table" or "index"
-**     argv[1] = table or index name or meta statement type.
-**     argv[2] = root page number for table or index.  NULL for meta.
-**     argv[3] = SQL text for a CREATE TABLE or CREATE INDEX statement.
-**     argv[4] = "1" for temporary files, "0" for main database
-**
-*/
-static
-int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){
-  InitData *pData = (InitData*)pInit;
-  Parse sParse;
-  int nErr = 0;
-
-  /* TODO: Do some validity checks on all fields.  In particular,
-  ** make sure fields do not contain NULLs. Otherwise we might core
-  ** when attempting to initialize from a corrupt database file. */
-
-  assert( argc==5 );
-  switch( argv[0][0] ){
-    case 'v':
-    case 'i':
-    case 't': {  /* CREATE TABLE, CREATE INDEX, or CREATE VIEW statements */
-      if( argv[3] && argv[3][0] ){
-        /* Call the parser to process a CREATE TABLE, INDEX or VIEW.
-        ** But because sParse.initFlag is set to 1, no VDBE code is generated
-        ** or executed.  All the parser does is build the internal data
-        ** structures that describe the table, index, or view.
-        */
-        memset(&sParse, 0, sizeof(sParse));
-        sParse.db = pData->db;
-        sParse.initFlag = 1;
-        sParse.isTemp = argv[4][0] - '0';
-        sParse.newTnum = atoi(argv[2]);
-        sParse.useCallback = 1;
-        sqliteRunParser(&sParse, argv[3], pData->pzErrMsg);
-      }else{
-        /* If the SQL column is blank it means this is an index that
-        ** was created to be the PRIMARY KEY or to fulfill a UNIQUE
-        ** constraint for a CREATE TABLE.  The index should have already
-        ** been created when we processed the CREATE TABLE.  All we have
-        ** to do here is record the root page number for that index.
-        */
-        Index *pIndex = sqliteFindIndex(pData->db, argv[1]);
-        if( pIndex==0 || pIndex->tnum!=0 ){
-          /* This can occur if there exists an index on a TEMP table which
-          ** has the same name as another index on a permanent index.  Since
-          ** the permanent table is hidden by the TEMP table, we can also
-          ** safely ignore the index on the permanent table.
-          */
-          /* Do Nothing */;
-        }else{
-          pIndex->tnum = atoi(argv[2]);
-        }
-      }
-      break;
-    }
-    default: {
-      /* This can not happen! */
-      nErr = 1;
-      assert( nErr==0 );
-    }
-  }
-  return nErr;
-}
-
-/*
-** This is a callback procedure used to reconstruct a table.  The
-** name of the table to be reconstructed is passed in as argv[0].
-**
-** This routine is used to automatically upgrade a database from
-** format version 1 or 2 to version 3.  The correct operation of
-** this routine relys on the fact that no indices are used when
-** copying a table out to a temporary file.
-*/
-static
-int upgrade_3_callback(void *pInit, int argc, char **argv, char **NotUsed){
-  InitData *pData = (InitData*)pInit;
-  int rc;
-  Table *pTab;
-  Trigger *pTrig;
-  char *zErr = 0;
-
-  pTab = sqliteFindTable(pData->db, argv[0]);
-  assert( pTab!=0 );
-  assert( sqliteStrICmp(pTab->zName, argv[0])==0 );
-  if( pTab ){
-    pTrig = pTab->pTrigger;
-    pTab->pTrigger = 0;  /* Disable all triggers before rebuilding the table */
-  }
-  rc = sqlite_exec_printf(pData->db,
-    "CREATE TEMP TABLE sqlite_x AS SELECT * FROM '%q'; "
-    "DELETE FROM '%q'; "
-    "INSERT INTO '%q' SELECT * FROM sqlite_x; "
-    "DROP TABLE sqlite_x;",
-    0, 0, &zErr, argv[0], argv[0], argv[0]);
-  if( zErr ){
-    sqliteSetString(pData->pzErrMsg, zErr, 0);
-    sqlite_freemem(zErr);
-  }
-
-  /* If an error occurred in the SQL above, then the transaction will
-  ** rollback which will delete the internal symbol tables.  This will
-  ** cause the structure that pTab points to be deleted.  In case that
-  ** happened, we need to refetch pTab.
-  */
-  pTab = sqliteFindTable(pData->db, argv[0]);
-  if( pTab ){
-    assert( sqliteStrICmp(pTab->zName, argv[0])==0 );
-    pTab->pTrigger = pTrig;  /* Re-enable triggers */
-  }
-  return rc!=SQLITE_OK;
-}
-
-
-
-/*
-** Attempt to read the database schema and initialize internal
-** data structures.  Return one of the SQLITE_ error codes to
-** indicate success or failure.
-**
-** After the database is initialized, the SQLITE_Initialized
-** bit is set in the flags field of the sqlite structure.  An
-** attempt is made to initialize the database as soon as it
-** is opened.  If that fails (perhaps because another process
-** has the sqlite_master table locked) than another attempt
-** is made the first time the database is accessed.
-*/
-int sqliteInit(sqlite *db, char **pzErrMsg){
-  int rc;
-  BtCursor *curMain;
-  int size;
-  Table *pTab;
-  char *azArg[6];
-  int meta[SQLITE_N_BTREE_META];
-  Parse sParse;
-  InitData initData;
-
-  /*
-  ** The master database table has a structure like this
-  */
-  static char master_schema[] = 
-     "CREATE TABLE sqlite_master(\n"
-     "  type text,\n"
-     "  name text,\n"
-     "  tbl_name text,\n"
-     "  rootpage integer,\n"
-     "  sql text\n"
-     ")"
-  ;
-  static char temp_master_schema[] = 
-     "CREATE TEMP TABLE sqlite_temp_master(\n"
-     "  type text,\n"
-     "  name text,\n"
-     "  tbl_name text,\n"
-     "  rootpage integer,\n"
-     "  sql text\n"
-     ")"
-  ;
-
-  /* The following SQL will read the schema from the master tables.
-  ** The first version works with SQLite file formats 2 or greater.
-  ** The second version is for format 1 files.
-  **
-  ** Beginning with file format 2, the rowid for new table entries
-  ** (including entries in sqlite_master) is an increasing integer.
-  ** So for file format 2 and later, we can play back sqlite_master
-  ** and all the CREATE statements will appear in the right order.
-  ** But with file format 1, table entries were random and so we
-  ** have to make sure the CREATE TABLEs occur before their corresponding
-  ** CREATE INDEXs.  (We don't have to deal with CREATE VIEW or
-  ** CREATE TRIGGER in file format 1 because those constructs did
-  ** not exist then.) 
-  */
-  static char init_script[] = 
-     "SELECT type, name, rootpage, sql, 1 FROM sqlite_temp_master "
-     "UNION ALL "
-     "SELECT type, name, rootpage, sql, 0 FROM sqlite_master";
-  static char older_init_script[] = 
-     "SELECT type, name, rootpage, sql, 1 FROM sqlite_temp_master "
-     "UNION ALL "
-     "SELECT type, name, rootpage, sql, 0 FROM sqlite_master "
-     "WHERE type='table' "
-     "UNION ALL "
-     "SELECT type, name, rootpage, sql, 0 FROM sqlite_master "
-     "WHERE type='index'";
-
-
-  /* Construct the schema tables: sqlite_master and sqlite_temp_master
-  */
-  azArg[0] = "table";
-  azArg[1] = MASTER_NAME;
-  azArg[2] = "2";
-  azArg[3] = master_schema;
-  azArg[4] = "0";
-  azArg[5] = 0;
-  initData.db = db;
-  initData.pzErrMsg = pzErrMsg;
-  sqliteInitCallback(&initData, 5, azArg, 0);
-  pTab = sqliteFindTable(db, MASTER_NAME);
-  if( pTab ){
-    pTab->readOnly = 1;
-  }
-  azArg[1] = TEMP_MASTER_NAME;
-  azArg[3] = temp_master_schema;
-  azArg[4] = "1";
-  sqliteInitCallback(&initData, 5, azArg, 0);
-  pTab = sqliteFindTable(db, TEMP_MASTER_NAME);
-  if( pTab ){
-    pTab->readOnly = 1;
-  }
-
-  /* Create a cursor to hold the database open
-  */
-  if( db->pBe==0 ) return SQLITE_OK;
-  rc = sqliteBtreeCursor(db->pBe, 2, 0, &curMain);
-  if( rc ){
-    sqliteSetString(pzErrMsg, sqlite_error_string(rc), 0);
-    sqliteResetInternalSchema(db);
-    return rc;
-  }
-
-  /* Get the database meta information
-  */
-  rc = sqliteBtreeGetMeta(db->pBe, meta);
-  if( rc ){
-    sqliteSetString(pzErrMsg, sqlite_error_string(rc), 0);
-    sqliteResetInternalSchema(db);
-    sqliteBtreeCloseCursor(curMain);
-    return rc;
-  }
-  db->schema_cookie = meta[1];
-  db->next_cookie = db->schema_cookie;
-  db->file_format = meta[2];
-  size = meta[3];
-  if( size==0 ){ size = MAX_PAGES; }
-  db->cache_size = size;
-  sqliteBtreeSetCacheSize(db->pBe, size);
-  db->safety_level = meta[4];
-  if( db->safety_level==0 ) db->safety_level = 2;
-  sqliteBtreeSetSafetyLevel(db->pBe, db->safety_level);
-
-  /*
-  **     file_format==1    Version 2.1.0.
-  **     file_format==2    Version 2.2.0. Add support for INTEGER PRIMARY KEY.
-  **     file_format==3    Version 2.6.0. Fix empty-string index bug.
-  **     file_format==4    Version 2.7.0. Add support for separate numeric and
-  **                       text datatypes.
-  */
-  if( db->file_format==0 ){
-    /* This happens if the database was initially empty */
-    db->file_format = 4;
-  }else if( db->file_format>4 ){
-    sqliteBtreeCloseCursor(curMain);
-    sqliteSetString(pzErrMsg, "unsupported file format", 0);
-    return SQLITE_ERROR;
-  }
-
-  /* Read the schema information out of the schema tables
-  */
-  memset(&sParse, 0, sizeof(sParse));
-  sParse.db = db;
-  sParse.pBe = db->pBe;
-  sParse.xCallback = sqliteInitCallback;
-  sParse.pArg = (void*)&initData;
-  sParse.initFlag = 1;
-  sParse.useCallback = 1;
-  sqliteRunParser(&sParse,
-      db->file_format>=2 ? init_script : older_init_script,
-      pzErrMsg);
-  if( sqlite_malloc_failed ){
-    sqliteSetString(pzErrMsg, "out of memory", 0);
-    sParse.rc = SQLITE_NOMEM;
-    sqliteBtreeRollback(db->pBe);
-    sqliteResetInternalSchema(db);
-  }
-  if( sParse.rc==SQLITE_OK ){
-    db->flags |= SQLITE_Initialized;
-    sqliteCommitInternalChanges(db);
-  }else{
-    db->flags &= ~SQLITE_Initialized;
-    sqliteResetInternalSchema(db);
-  }
-  sqliteBtreeCloseCursor(curMain);
-  return sParse.rc;
-}
-
-/*
-** The version of the library
-*/
-const char rcsid[] = "@(#) \044Id: SQLite version " SQLITE_VERSION " $";
-const char sqlite_version[] = SQLITE_VERSION;
-
-/*
-** Does the library expect data to be encoded as UTF-8 or iso8859?  The
-** following global constant always lets us know.
-*/
-#ifdef SQLITE_UTF8
-const char sqlite_encoding[] = "UTF-8";
-#else
-const char sqlite_encoding[] = "iso8859";
-#endif
-
-/*
-** Open a new SQLite database.  Construct an "sqlite" structure to define
-** the state of this database and return a pointer to that structure.
-**
-** An attempt is made to initialize the in-memory data structures that
-** hold the database schema.  But if this fails (because the schema file
-** is locked) then that step is deferred until the first call to
-** sqlite_exec().
-*/
-sqlite *sqlite_open(const char *zFilename, int mode, char **pzErrMsg){
-  sqlite *db;
-  int rc;
-
-  /* Allocate the sqlite data structure */
-  db = sqliteMalloc( sizeof(sqlite) );
-  if( pzErrMsg ) *pzErrMsg = 0;
-  if( db==0 ) goto no_mem_on_open;
-  sqliteHashInit(&db->tblHash, SQLITE_HASH_STRING, 0);
-  sqliteHashInit(&db->idxHash, SQLITE_HASH_STRING, 0);
-  sqliteHashInit(&db->trigHash, SQLITE_HASH_STRING, 0);
-  sqliteHashInit(&db->aFunc, SQLITE_HASH_STRING, 1);
-  sqliteHashInit(&db->aFKey, SQLITE_HASH_STRING, 1);
-  db->onError = OE_Default;
-  db->priorNewRowid = 0;
-  db->magic = SQLITE_MAGIC_BUSY;
-  
-  /* Open the backend database driver */
-  rc = sqliteBtreeOpen(zFilename, 0, MAX_PAGES, &db->pBe);
-  if( rc!=SQLITE_OK ){
-    switch( rc ){
-      default: {
-        sqliteSetString(pzErrMsg, "unable to open database: ", zFilename, 0);
-      }
-    }
-    sqliteFree(db);
-    sqliteStrRealloc(pzErrMsg);
-    return 0;
-  }
-
-  /* Attempt to read the schema */
-  sqliteRegisterBuiltinFunctions(db);
-  rc = sqliteInit(db, pzErrMsg);
-  db->magic = SQLITE_MAGIC_OPEN;
-  if( sqlite_malloc_failed ){
-    sqlite_close(db);
-    goto no_mem_on_open;
-  }else if( rc!=SQLITE_OK && rc!=SQLITE_BUSY ){
-    sqlite_close(db);
-    sqliteStrRealloc(pzErrMsg);
-    return 0;
-  }else if( pzErrMsg ){
-    sqliteFree(*pzErrMsg);
-    *pzErrMsg = 0;
-  }
-
-  /* If the database is in formats 1 or 2, then upgrade it to
-  ** version 3.  This will reconstruct all indices.  If the
-  ** upgrade fails for any reason (ex: out of disk space, database
-  ** is read only, interrupt received, etc.) then refuse to open.
-  */
-  if( rc==SQLITE_OK && db->file_format<3 ){
-    char *zErr = 0;
-    InitData initData;
-    int meta[SQLITE_N_BTREE_META];
-
-    initData.db = db;
-    initData.pzErrMsg = &zErr;
-    db->file_format = 3;
-    rc = sqlite_exec(db,
-      "BEGIN; SELECT name FROM sqlite_master WHERE type='table';",
-      upgrade_3_callback,
-      &initData,
-      &zErr);
-    if( rc==SQLITE_OK ){
-      sqliteBtreeGetMeta(db->pBe, meta);
-      meta[2] = 4;
-      sqliteBtreeUpdateMeta(db->pBe, meta);
-      sqlite_exec(db, "COMMIT", 0, 0, 0);
-    }
-    if( rc!=SQLITE_OK ){
-      sqliteSetString(pzErrMsg, 
-        "unable to upgrade database to the version 2.6 format",
-        zErr ? ": " : 0, zErr, 0);
-      sqlite_freemem(zErr);
-      sqliteStrRealloc(pzErrMsg);
-      sqlite_close(db);
-      return 0;
-    }
-    sqlite_freemem(zErr);
-  }
-
-  /* Return a pointer to the newly opened database structure */
-  return db;
-
-no_mem_on_open:
-  sqliteSetString(pzErrMsg, "out of memory", 0);
-  sqliteStrRealloc(pzErrMsg);
-  return 0;
-}
-
-/*
-** Return the ROWID of the most recent insert
-*/
-int sqlite_last_insert_rowid(sqlite *db){
-  return db->lastRowid;
-}
-
-/*
-** Return the number of changes in the most recent call to sqlite_exec().
-*/
-int sqlite_changes(sqlite *db){
-  return db->nChange;
-}
-
-/*
-** Close an existing SQLite database
-*/
-void sqlite_close(sqlite *db){
-  HashElem *i;
-  db->want_to_close = 1;
-  if( sqliteSafetyCheck(db) || sqliteSafetyOn(db) ){
-    /* printf("DID NOT CLOSE\n"); fflush(stdout); */
-    return;
-  }
-  db->magic = SQLITE_MAGIC_CLOSED;
-  sqliteBtreeClose(db->pBe);
-  sqliteResetInternalSchema(db);
-  if( db->pBeTemp ){
-    sqliteBtreeClose(db->pBeTemp);
-  }
-  for(i=sqliteHashFirst(&db->aFunc); i; i=sqliteHashNext(i)){
-    FuncDef *pFunc, *pNext;
-    for(pFunc = (FuncDef*)sqliteHashData(i); pFunc; pFunc=pNext){
-      pNext = pFunc->pNext;
-      sqliteFree(pFunc);
-    }
-  }
-  sqliteHashClear(&db->aFunc);
-  sqliteHashClear(&db->aFKey);
-  sqliteFree(db);
-}
-
-/*
-** Return TRUE if the given SQL string ends in a semicolon.
-**
-** Special handling is require for CREATE TRIGGER statements.
-** Whenever the CREATE TRIGGER keywords are seen, the statement
-** must end with ";END;".
-*/
-int sqlite_complete(const char *zSql){
-  int isComplete = 1;
-  int requireEnd = 0;
-  int seenText = 0;
-  int seenCreate = 0;
-  while( *zSql ){
-    switch( *zSql ){
-      case ';': {
-        isComplete = 1;
-        seenText = 1;
-        seenCreate = 0;
-        break;
-      }
-      case ' ':
-      case '\t':
-      case '\n':
-      case '\f': {
-        break;
-      }
-      case '[': {
-        isComplete = 0;
-        seenText = 1;
-        seenCreate = 0;
-        zSql++;
-        while( *zSql && *zSql!=']' ){ zSql++; }
-        if( *zSql==0 ) return 0;
-        break;
-      }
-      case '"':
-      case '\'': {
-        int c = *zSql;
-        isComplete = 0;
-        seenText = 1;
-        seenCreate = 0;
-        zSql++;
-        while( *zSql && *zSql!=c ){ zSql++; }
-        if( *zSql==0 ) return 0;
-        break;
-      }
-      case '-': {
-        if( zSql[1]!='-' ){
-          isComplete = 0;
-          seenCreate = 0;
-          break;
-        }
-        while( *zSql && *zSql!='\n' ){ zSql++; }
-        if( *zSql==0 ) return seenText && isComplete && requireEnd==0;
-        break;
-      }
-      case 'c':
-      case 'C': {
-        seenText = 1;
-        if( !isComplete ) break;
-        isComplete = 0;
-        if( sqliteStrNICmp(zSql, "create", 6)!=0 ) break;
-        if( !isspace(zSql[6]) ) break;
-        zSql += 5;
-        seenCreate = 1;
-        while( isspace(zSql[1]) ) zSql++;
-        if( sqliteStrNICmp(&zSql[1],"trigger", 7)!=0 ) break;
-        zSql += 7;
-        requireEnd++;
-        break;
-      }
-      case 't':
-      case 'T': {
-        seenText = 1;
-        if( !seenCreate ) break;
-        seenCreate = 0;
-        isComplete = 0;
-        if( sqliteStrNICmp(zSql, "trigger", 7)!=0 ) break;
-        if( !isspace(zSql[7]) ) break;
-        zSql += 6;
-        requireEnd++;
-        break;
-      }
-      case 'e':
-      case 'E': {
-        seenCreate = 0;
-        seenText = 1;
-        if( !isComplete ) break;
-        isComplete = 0;
-        if( requireEnd==0 ) break;
-        if( sqliteStrNICmp(zSql, "end", 3)!=0 ) break;
-        zSql += 2;
-        while( isspace(zSql[1]) ) zSql++;
-        if( zSql[1]==';' ){
-          zSql++;
-          isComplete = 1;
-          requireEnd--;
-        }
-        break;
-      }
-      default: {
-        seenCreate = 0;
-        seenText = 1;
-        isComplete = 0;
-        break;
-      }
-    }
-    zSql++;
-  }
-  return seenText && isComplete && requireEnd==0;
-}
-
-/*
-** This routine does the work of either sqlite_exec() or sqlite_compile().
-** It works like sqlite_exec() if pVm==NULL and it works like sqlite_compile()
-** otherwise.
-*/
-static int sqliteMain(
-  sqlite *db,                 /* The database on which the SQL executes */
-  const char *zSql,           /* The SQL to be executed */
-  sqlite_callback xCallback,  /* Invoke this callback routine */
-  void *pArg,                 /* First argument to xCallback() */
-  const char **pzTail,        /* OUT: Next statement after the first */
-  sqlite_vm **ppVm,           /* OUT: The virtual machine */
-  char **pzErrMsg             /* OUT: Write error messages here */
-){
-  Parse sParse;
-
-  if( pzErrMsg ) *pzErrMsg = 0;
-  if( sqliteSafetyOn(db) ) goto exec_misuse;
-  if( (db->flags & SQLITE_Initialized)==0 ){
-    int rc, cnt = 1;
-    while( (rc = sqliteInit(db, pzErrMsg))==SQLITE_BUSY
-       && db->xBusyCallback && db->xBusyCallback(db->pBusyArg, "", cnt++)!=0 ){}
-    if( rc!=SQLITE_OK ){
-      sqliteStrRealloc(pzErrMsg);
-      sqliteSafetyOff(db);
-      return rc;
-    }
-    if( pzErrMsg ){
-      sqliteFree(*pzErrMsg);
-      *pzErrMsg = 0;
-    }
-  }
-  if( db->file_format<3 ){
-    sqliteSafetyOff(db);
-    sqliteSetString(pzErrMsg, "obsolete database file format", 0);
-    return SQLITE_ERROR;
-  }
-  if( db->pVdbe==0 ){ db->nChange = 0; }
-  memset(&sParse, 0, sizeof(sParse));
-  sParse.db = db;
-  sParse.pBe = db->pBe;
-  sParse.xCallback = xCallback;
-  sParse.pArg = pArg;
-  sParse.useCallback = ppVm==0;
-#ifndef SQLITE_OMIT_TRACE
-  if( db->xTrace ) db->xTrace(db->pTraceArg, zSql);
-#endif
-  sqliteRunParser(&sParse, zSql, pzErrMsg);
-  if( sqlite_malloc_failed ){
-    sqliteSetString(pzErrMsg, "out of memory", 0);
-    sParse.rc = SQLITE_NOMEM;
-    sqliteBtreeRollback(db->pBe);
-    if( db->pBeTemp ) sqliteBtreeRollback(db->pBeTemp);
-    db->flags &= ~SQLITE_InTrans;
-    sqliteResetInternalSchema(db);
-  }
-  if( sParse.rc==SQLITE_DONE ) sParse.rc = SQLITE_OK;
-  if( sParse.rc!=SQLITE_OK && pzErrMsg && *pzErrMsg==0 ){
-    sqliteSetString(pzErrMsg, sqlite_error_string(sParse.rc), 0);
-  }
-  sqliteStrRealloc(pzErrMsg);
-  if( sParse.rc==SQLITE_SCHEMA ){
-    sqliteResetInternalSchema(db);
-  }
-  if( sParse.useCallback==0 ){
-    assert( ppVm );
-    *ppVm = (sqlite_vm*)sParse.pVdbe;
-    *pzTail = sParse.zTail;
-  }
-  if( sqliteSafetyOff(db) ) goto exec_misuse;
-  return sParse.rc;
-
-exec_misuse:
-  if( pzErrMsg ){
-    *pzErrMsg = 0;
-    sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), 0);
-    sqliteStrRealloc(pzErrMsg);
-  }
-  return SQLITE_MISUSE;
-}
-
-/*
-** Execute SQL code.  Return one of the SQLITE_ success/failure
-** codes.  Also write an error message into memory obtained from
-** malloc() and make *pzErrMsg point to that message.
-**
-** If the SQL is a query, then for each row in the query result
-** the xCallback() function is called.  pArg becomes the first
-** argument to xCallback().  If xCallback=NULL then no callback
-** is invoked, even for queries.
-*/
-int sqlite_exec(
-  sqlite *db,                 /* The database on which the SQL executes */
-  const char *zSql,           /* The SQL to be executed */
-  sqlite_callback xCallback,  /* Invoke this callback routine */
-  void *pArg,                 /* First argument to xCallback() */
-  char **pzErrMsg             /* Write error messages here */
-){
-  return sqliteMain(db, zSql, xCallback, pArg, 0, 0, pzErrMsg);
-}
-
-/*
-** Compile a single statement of SQL into a virtual machine.  Return one
-** of the SQLITE_ success/failure codes.  Also write an error message into
-** memory obtained from malloc() and make *pzErrMsg point to that message.
-*/
-int sqlite_compile(
-  sqlite *db,                 /* The database on which the SQL executes */
-  const char *zSql,           /* The SQL to be executed */
-  const char **pzTail,        /* OUT: Next statement after the first */
-  sqlite_vm **ppVm,           /* OUT: The virtual machine */
-  char **pzErrMsg             /* OUT: Write error messages here */
-){
-  return sqliteMain(db, zSql, 0, 0, pzTail, ppVm, pzErrMsg);
-}
-
-/*
-** The following routine destroys a virtual machine that is created by
-** the sqlite_compile() routine.
-**
-** The integer returned is an SQLITE_ success/failure code that describes
-** the result of executing the virtual machine.  An error message is
-** written into memory obtained from malloc and *pzErrMsg is made to
-** point to that error if pzErrMsg is not NULL.  The calling routine
-** should use sqlite_freemem() to delete the message when it has finished
-** with it.
-*/
-int sqlite_finalize(
-  sqlite_vm *pVm,            /* The virtual machine to be destroyed */
-  char **pzErrMsg            /* OUT: Write error messages here */
-){
-  int rc = sqliteVdbeFinalize((Vdbe*)pVm, pzErrMsg);
-  sqliteStrRealloc(pzErrMsg);
-  return rc;
-}
-
-/*
-** Return a static string that describes the kind of error specified in the
-** argument.
-*/
-const char *sqlite_error_string(int rc){
-  const char *z;
-  switch( rc ){
-    case SQLITE_OK:         z = "not an error";                          break;
-    case SQLITE_ERROR:      z = "SQL logic error or missing database";   break;
-    case SQLITE_INTERNAL:   z = "internal SQLite implementation flaw";   break;
-    case SQLITE_PERM:       z = "access permission denied";              break;
-    case SQLITE_ABORT:      z = "callback requested query abort";        break;
-    case SQLITE_BUSY:       z = "database is locked";                    break;
-    case SQLITE_LOCKED:     z = "database table is locked";              break;
-    case SQLITE_NOMEM:      z = "out of memory";                         break;
-    case SQLITE_READONLY:   z = "attempt to write a readonly database";  break;
-    case SQLITE_INTERRUPT:  z = "interrupted";                           break;
-    case SQLITE_IOERR:      z = "disk I/O error";                        break;
-    case SQLITE_CORRUPT:    z = "database disk image is malformed";      break;
-    case SQLITE_NOTFOUND:   z = "table or record not found";             break;
-    case SQLITE_FULL:       z = "database is full";                      break;
-    case SQLITE_CANTOPEN:   z = "unable to open database file";          break;
-    case SQLITE_PROTOCOL:   z = "database locking protocol failure";     break;
-    case SQLITE_EMPTY:      z = "table contains no data";                break;
-    case SQLITE_SCHEMA:     z = "database schema has changed";           break;
-    case SQLITE_TOOBIG:     z = "too much data for one table row";       break;
-    case SQLITE_CONSTRAINT: z = "constraint failed";                     break;
-    case SQLITE_MISMATCH:   z = "datatype mismatch";                     break;
-    case SQLITE_MISUSE:     z = "library routine called out of sequence";break;
-    case SQLITE_NOLFS:      z = "kernel lacks large file support";       break;
-    case SQLITE_AUTH:       z = "authorization denied";                  break;
-    default:                z = "unknown error";                         break;
-  }
-  return z;
-}
-
-/*
-** This routine implements a busy callback that sleeps and tries
-** again until a timeout value is reached.  The timeout value is
-** an integer number of milliseconds passed in as the first
-** argument.
-*/
-static int sqliteDefaultBusyCallback(
- void *Timeout,           /* Maximum amount of time to wait */
- const char *NotUsed,     /* The name of the table that is busy */
- int count                /* Number of times table has been busy */
-){
-#if SQLITE_MIN_SLEEP_MS==1
-  int delay = 10;
-  int prior_delay = 0;
-  int timeout = (int)Timeout;
-  int i;
-
-  for(i=1; i<count; i++){ 
-    prior_delay += delay;
-    delay = delay*2;
-    if( delay>=1000 ){
-      delay = 1000;
-      prior_delay += 1000*(count - i - 1);
-      break;
-    }
-  }
-  if( prior_delay + delay > timeout ){
-    delay = timeout - prior_delay;
-    if( delay<=0 ) return 0;
-  }
-  sqliteOsSleep(delay);
-  return 1;
-#else
-  int timeout = (int)Timeout;
-  if( (count+1)*1000 > timeout ){
-    return 0;
-  }
-  sqliteOsSleep(1000);
-  return 1;
-#endif
-}
-
-/*
-** This routine sets the busy callback for an Sqlite database to the
-** given callback function with the given argument.
-*/
-void sqlite_busy_handler(
-  sqlite *db,
-  int (*xBusy)(void*,const char*,int),
-  void *pArg
-){
-  db->xBusyCallback = xBusy;
-  db->pBusyArg = pArg;
-}
-
-/*
-** This routine installs a default busy handler that waits for the
-** specified number of milliseconds before returning 0.
-*/
-void sqlite_busy_timeout(sqlite *db, int ms){
-  if( ms>0 ){
-    sqlite_busy_handler(db, sqliteDefaultBusyCallback, (void*)ms);
-  }else{
-    sqlite_busy_handler(db, 0, 0);
-  }
-}
-
-/*
-** Cause any pending operation to stop at its earliest opportunity.
-*/
-void sqlite_interrupt(sqlite *db){
-  db->flags |= SQLITE_Interrupt;
-}
-
-/*
-** Windows systems should call this routine to free memory that
-** is returned in the in the errmsg parameter of sqlite_open() when
-** SQLite is a DLL.  For some reason, it does not work to call free()
-** directly.
-**
-** Note that we need to call free() not sqliteFree() here, since every
-** string that is exported from SQLite should have already passed through
-** sqliteStrRealloc().
-*/
-void sqlite_freemem(void *p){ free(p); }
-
-/*
-** Windows systems need functions to call to return the sqlite_version
-** and sqlite_encoding strings since they are unable to access constants
-** within DLLs.
-*/
-const char *sqlite_libversion(void){ return sqlite_version; }
-const char *sqlite_libencoding(void){ return sqlite_encoding; }
-
-/*
-** Create new user-defined functions.  The sqlite_create_function()
-** routine creates a regular function and sqlite_create_aggregate()
-** creates an aggregate function.
-**
-** Passing a NULL xFunc argument or NULL xStep and xFinalize arguments
-** disables the function.  Calling sqlite_create_function() with the
-** same name and number of arguments as a prior call to
-** sqlite_create_aggregate() disables the prior call to
-** sqlite_create_aggregate(), and vice versa.
-**
-** If nArg is -1 it means that this function will accept any number
-** of arguments, including 0.
-*/
-int sqlite_create_function(
-  sqlite *db,          /* Add the function to this database connection */
-  const char *zName,   /* Name of the function to add */
-  int nArg,            /* Number of arguments */
-  void (*xFunc)(sqlite_func*,int,const char**),  /* The implementation */
-  void *pUserData      /* User data */
-){
-  FuncDef *p;
-  int nName;
-  if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1;
-  nName = strlen(zName);
-  if( nName>255 ) return 1;
-  p = sqliteFindFunction(db, zName, nName, nArg, 1);
-  if( p==0 ) return 1;
-  p->xFunc = xFunc;
-  p->xStep = 0;
-  p->xFinalize = 0;
-  p->pUserData = pUserData;
-  return 0;
-}
-int sqlite_create_aggregate(
-  sqlite *db,          /* Add the function to this database connection */
-  const char *zName,   /* Name of the function to add */
-  int nArg,            /* Number of arguments */
-  void (*xStep)(sqlite_func*,int,const char**), /* The step function */
-  void (*xFinalize)(sqlite_func*),              /* The finalizer */
-  void *pUserData      /* User data */
-){
-  FuncDef *p;
-  int nName;
-  if( db==0 || zName==0 || sqliteSafetyCheck(db) ) return 1;
-  nName = strlen(zName);
-  if( nName>255 ) return 1;
-  p = sqliteFindFunction(db, zName, nName, nArg, 1);
-  if( p==0 ) return 1;
-  p->xFunc = 0;
-  p->xStep = xStep;
-  p->xFinalize = xFinalize;
-  p->pUserData = pUserData;
-  return 0;
-}
-
-/*
-** Change the datatype for all functions with a given name.  See the
-** header comment for the prototype of this function in sqlite.h for
-** additional information.
-*/
-int sqlite_function_type(sqlite *db, const char *zName, int dataType){
-  FuncDef *p = (FuncDef*)sqliteHashFind(&db->aFunc, zName, strlen(zName));
-  while( p ){
-    p->dataType = dataType; 
-    p = p->pNext;
-  }
-  return SQLITE_OK;
-}
-
-/*
-** Register a trace function.  The pArg from the previously registered trace
-** is returned.  
-**
-** A NULL trace function means that no tracing is executes.  A non-NULL
-** trace is a pointer to a function that is invoked at the start of each
-** sqlite_exec().
-*/
-void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
-#ifndef SQLITE_OMIT_TRACE
-  void *pOld = db->pTraceArg;
-  db->xTrace = xTrace;
-  db->pTraceArg = pArg;
-  return pOld;
-#else
-  return 0;
-#endif
-}
-
-
-/*
-** Attempt to open the file named in the argument as the auxiliary database
-** file.  The auxiliary database file is used to store TEMP tables.  But
-** by using this API, it is possible to trick SQLite into opening two
-** separate databases and acting on them as if they were one.
-**
-** This routine closes the existing auxiliary database file, which will
-** cause any previously created TEMP tables to be dropped.
-**
-** The zName parameter can be a NULL pointer or an empty string to cause
-** a temporary file to be opened and automatically deleted when closed.
-*/
-int sqlite_open_aux_file(sqlite *db, const char *zName, char **pzErrMsg){
-  int rc;
-  if( zName && zName[0]==0 ) zName = 0;
-  if( sqliteSafetyOn(db) ) goto openaux_misuse;
-  sqliteResetInternalSchema(db);
-  if( db->pBeTemp!=0 ){
-    sqliteBtreeClose(db->pBeTemp);
-  }
-  rc = sqliteBtreeOpen(zName, 0, MAX_PAGES, &db->pBeTemp);
-  if( rc ){
-    if( zName==0 ) zName = "a temporary file";
-    sqliteSetString(pzErrMsg, "unable to open ", zName, 
-      ": ", sqlite_error_string(rc), 0);
-    sqliteStrRealloc(pzErrMsg);
-    sqliteSafetyOff(db);
-    return rc;
-  }
-  rc = sqliteInit(db, pzErrMsg);
-  if( sqliteSafetyOff(db) ) goto openaux_misuse;
-  sqliteStrRealloc(pzErrMsg);
-  return rc;
-
-openaux_misuse:
-  sqliteSetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), 0);
-  sqliteStrRealloc(pzErrMsg);
-  return SQLITE_MISUSE;
-}

ext/sqlite/libsqlite/src/opcodes.h

@@ -1,130 +0,0 @@
-/* Automatically generated file.  Do not edit */
-#define OP_Goto                          1
-#define OP_Gosub                         2
-#define OP_Return                        3
-#define OP_Halt                          4
-#define OP_Integer                       5
-#define OP_String                        6
-#define OP_Pop                           7
-#define OP_Dup                           8
-#define OP_Pull                          9
-#define OP_Push                         10
-#define OP_ColumnName                   11
-#define OP_Callback                     12
-#define OP_NullCallback                 13
-#define OP_Concat                       14
-#define OP_Add                          15
-#define OP_Subtract                     16
-#define OP_Multiply                     17
-#define OP_Divide                       18
-#define OP_Remainder                    19
-#define OP_Function                     20
-#define OP_BitAnd                       21
-#define OP_BitOr                        22
-#define OP_ShiftLeft                    23
-#define OP_ShiftRight                   24
-#define OP_AddImm                       25
-#define OP_MustBeInt                    26
-#define OP_Eq                           27
-#define OP_Ne                           28
-#define OP_Lt                           29
-#define OP_Le                           30
-#define OP_Gt                           31
-#define OP_Ge                           32
-#define OP_StrEq                        33
-#define OP_StrNe                        34
-#define OP_StrLt                        35
-#define OP_StrLe                        36
-#define OP_StrGt                        37
-#define OP_StrGe                        38
-#define OP_And                          39
-#define OP_Or                           40
-#define OP_Negative                     41
-#define OP_AbsValue                     42
-#define OP_Not                          43
-#define OP_BitNot                       44
-#define OP_Noop                         45
-#define OP_If                           46
-#define OP_IfNot                        47
-#define OP_IsNull                       48
-#define OP_NotNull                      49
-#define OP_MakeRecord                   50
-#define OP_MakeIdxKey                   51
-#define OP_MakeKey                      52
-#define OP_IncrKey                      53
-#define OP_Checkpoint                   54
-#define OP_Transaction                  55
-#define OP_Commit                       56
-#define OP_Rollback                     57
-#define OP_ReadCookie                   58
-#define OP_SetCookie                    59
-#define OP_VerifyCookie                 60
-#define OP_OpenAux                      61
-#define OP_OpenWrAux                    62
-#define OP_OpenWrite                    63
-#define OP_Open                         64
-#define OP_OpenTemp                     65
-#define OP_RenameCursor                 66
-#define OP_Close                        67
-#define OP_MoveLt                       68
-#define OP_MoveTo                       69
-#define OP_Distinct                     70
-#define OP_NotFound                     71
-#define OP_Found                        72
-#define OP_IsUnique                     73
-#define OP_NotExists                    74
-#define OP_NewRecno                     75
-#define OP_PutIntKey                    76
-#define OP_PutStrKey                    77
-#define OP_Delete                       78
-#define OP_KeyAsData                    79
-#define OP_Column                       80
-#define OP_Recno                        81
-#define OP_FullKey                      82
-#define OP_NullRow                      83
-#define OP_Last                         84
-#define OP_Rewind                       85
-#define OP_Prev                         86
-#define OP_Next                         87
-#define OP_IdxPut                       88
-#define OP_IdxDelete                    89
-#define OP_IdxRecno                     90
-#define OP_IdxLT                        91
-#define OP_IdxGT                        92
-#define OP_IdxGE                        93
-#define OP_Destroy                      94
-#define OP_Clear                        95
-#define OP_CreateIndex                  96
-#define OP_CreateTable                  97
-#define OP_IntegrityCk                  98
-#define OP_ListWrite                    99
-#define OP_ListRewind                  100
-#define OP_ListRead                    101
-#define OP_ListReset                   102
-#define OP_ListPush                    103
-#define OP_ListPop                     104
-#define OP_SortPut                     105
-#define OP_SortMakeRec                 106
-#define OP_SortMakeKey                 107
-#define OP_Sort                        108
-#define OP_SortNext                    109
-#define OP_SortCallback                110
-#define OP_SortReset                   111
-#define OP_FileOpen                    112
-#define OP_FileRead                    113
-#define OP_FileColumn                  114
-#define OP_MemStore                    115
-#define OP_MemLoad                     116
-#define OP_MemIncr                     117
-#define OP_AggReset                    118
-#define OP_AggInit                     119
-#define OP_AggFunc                     120
-#define OP_AggFocus                    121
-#define OP_AggSet                      122
-#define OP_AggGet                      123
-#define OP_AggNext                     124
-#define OP_SetInsert                   125
-#define OP_SetFound                    126
-#define OP_SetNotFound                 127
-#define OP_SetFirst                    128
-#define OP_SetNext                     129

ext/sqlite/libsqlite/src/os.h

@@ -1,172 +0,0 @@
-/*
-** 2001 September 16
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This header file (together with is companion C source-code file
-** "os.c") attempt to abstract the underlying operating system so that
-** the SQLite library will work on both POSIX and windows systems.
-*/
-#ifndef _SQLITE_OS_H_
-#define _SQLITE_OS_H_
-
-/*
-** These #defines should enable >2GB file support on Posix if the
-** underlying operating system supports it.  If the OS lacks
-** large file support, or if the OS is windows, these should be no-ops.
-**
-** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
-** on the compiler command line.  This is necessary if you are compiling
-** on a recent machine (ex: RedHat 7.2) but you want your code to work
-** on an older machine (ex: RedHat 6.0).  If you compile on RedHat 7.2
-** without this option, LFS is enable.  But LFS does not exist in the kernel
-** in RedHat 6.0, so the code won't work.  Hence, for maximum binary
-** portability you should omit LFS.
-**
-** Similar is true for MacOS.  LFS is only supported on MacOS 9 and later.
-*/
-#ifndef SQLITE_DISABLE_LFS
-# define _LARGE_FILE       1
-# define _FILE_OFFSET_BITS 64
-# define _LARGEFILE_SOURCE 1
-#endif
-
-/*
-** Temporary files are named starting with this prefix followed by 16 random
-** alphanumeric characters, and no file extension. They are stored in the
-** OS's standard temporary file directory, and are deleted prior to exit.
-** If sqlite is being embedded in another program, you may wish to change the
-** prefix to reflect your program's name, so that if your program exits
-** prematurely, old temporary files can be easily identified. This can be done
-** using -DTEMP_FILE_PREFIX=myprefix_ on the compiler command line.
-*/
-#ifndef TEMP_FILE_PREFIX
-# define TEMP_FILE_PREFIX "sqlite_"
-#endif
-
-/*
-** Figure out if we are dealing with Unix, Windows or MacOS.
-**
-** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix.
-**      The MacOS build is designed to use CodeWarrior (tested with v8)
-*/
-#ifndef OS_UNIX
-# ifndef OS_WIN
-#  ifndef OS_MAC
-#    if defined(__MACOS__)
-#      define OS_MAC 1
-#      define OS_WIN 0
-#      define OS_UNIX 0
-#    elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
-#      define OS_MAC 0
-#      define OS_WIN 1
-#      define OS_UNIX 0
-#    else
-#      define OS_MAC 0
-#      define OS_WIN 0
-#      define OS_UNIX 1
-#    endif
-#  else
-#    define OS_WIN 0
-#    define OS_UNIX 0
-#  endif
-# else
-#  define OS_MAC 0
-#  define OS_UNIX 0
-# endif
-#else
-# define OS_MAC 0
-# define OS_WIN 0
-#endif
-
-/*
-** A handle for an open file is stored in an OsFile object.
-*/
-#if OS_UNIX
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <unistd.h>
-  typedef struct OsFile OsFile;
-  struct OsFile {
-    struct lockInfo *pLock;  /* Information about locks on this inode */
-    int fd;                  /* The file descriptor */
-    int locked;              /* True if this user holds the lock */
-  };
-# define SQLITE_TEMPNAME_SIZE 200
-# if defined(HAVE_USLEEP) && HAVE_USLEEP
-#  define SQLITE_MIN_SLEEP_MS 1
-# else
-#  define SQLITE_MIN_SLEEP_MS 1000
-# endif
-#endif
-
-#if OS_WIN
-#include <windows.h>
-#include <winbase.h>
-  typedef struct OsFile OsFile;
-  struct OsFile {
-    HANDLE h;               /* Handle for accessing the file */
-    int locked;             /* 0: unlocked, <0: write lock, >0: read lock */
-  };
-# if defined(_MSC_VER) || defined(__BORLANDC__)
-    typedef __int64 off_t;
-# else
-    typedef long long off_t;
-# endif
-# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
-# define SQLITE_MIN_SLEEP_MS 1
-#endif
-
-#if OS_MAC
-# include <unistd.h>
-# include <Files.h>
-  typedef struct OsFile OsFile;
-  struct OsFile {
-    SInt16 refNum;           /* Data fork/file reference number */
-    SInt16 refNumRF;         /* Resource fork reference number (for locking) */
-    int locked;              /* 0: unlocked, <0: write lock, >0: read lock */
-    int delOnClose;          /* True if file is to be deleted on close */
-    char *pathToDel;         /* Name of file to delete on close */
-  };
-# ifdef _LARGE_FILE
-    typedef SInt64 off_t;
-# else
-    typedef SInt32 off_t;
-# endif
-# define SQLITE_TEMPNAME_SIZE _MAX_PATH
-# define SQLITE_MIN_SLEEP_MS 17
-#endif
-
-int sqliteOsDelete(const char*);
-int sqliteOsFileExists(const char*);
-int sqliteOsOpenReadWrite(const char*, OsFile*, int*);
-int sqliteOsOpenExclusive(const char*, OsFile*, int);
-int sqliteOsOpenReadOnly(const char*, OsFile*);
-int sqliteOsTempFileName(char*);
-int sqliteOsClose(OsFile*);
-int sqliteOsRead(OsFile*, void*, int amt);
-int sqliteOsWrite(OsFile*, const void*, int amt);
-int sqliteOsSeek(OsFile*, off_t offset);
-int sqliteOsSync(OsFile*);
-int sqliteOsTruncate(OsFile*, off_t size);
-int sqliteOsFileSize(OsFile*, off_t *pSize);
-int sqliteOsReadLock(OsFile*);
-int sqliteOsWriteLock(OsFile*);
-int sqliteOsUnlock(OsFile*);
-int sqliteOsRandomSeed(char*);
-int sqliteOsSleep(int ms);
-void sqliteOsEnterMutex(void);
-void sqliteOsLeaveMutex(void);
-char *sqliteOsFullPathname(const char*);
-
-
-
-#endif /* _SQLITE_OS_H_ */

ext/sqlite/libsqlite/src/pager.h

@@ -1,79 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This header file defines the interface that the sqlite page cache
-** subsystem.  The page cache subsystem reads and writes a file a page
-** at a time and provides a journal for rollback.
-**
-** @(#) $Id$
-*/
-
-/*
-** The size of one page
-**
-** You can change this value to another (reasonable) power of two
-** such as 512, 2048, 4096, or 8192 and things will still work.  But
-** experiments show that a page size of 1024 gives the best speed.
-** (The speed differences are minimal.)
-*/
-#define SQLITE_PAGE_SIZE 1024
-
-/*
-** Maximum number of pages in one database.  (This is a limitation of
-** imposed by 4GB files size limits.)
-*/
-#define SQLITE_MAX_PAGE 1073741823
-
-/*
-** The type used to represent a page number.  The first page in a file
-** is called page 1.  0 is used to represent "not a page".
-*/
-typedef unsigned int Pgno;
-
-/*
-** Each open file is managed by a separate instance of the "Pager" structure.
-*/
-typedef struct Pager Pager;
-
-/*
-** See source code comments for a detailed description of the following
-** routines:
-*/
-int sqlitepager_open(Pager **ppPager, const char *zFilename,
-                     int nPage, int nExtra, int useJournal);
-void sqlitepager_set_destructor(Pager*, void(*)(void*));
-void sqlitepager_set_cachesize(Pager*, int);
-int sqlitepager_close(Pager *pPager);
-int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage);
-void *sqlitepager_lookup(Pager *pPager, Pgno pgno);
-int sqlitepager_ref(void*);
-int sqlitepager_unref(void*);
-Pgno sqlitepager_pagenumber(void*);
-int sqlitepager_write(void*);
-int sqlitepager_iswriteable(void*);
-int sqlitepager_pagecount(Pager*);
-int sqlitepager_begin(void*);
-int sqlitepager_commit(Pager*);
-int sqlitepager_rollback(Pager*);
-int sqlitepager_isreadonly(Pager*);
-int sqlitepager_ckpt_begin(Pager*);
-int sqlitepager_ckpt_commit(Pager*);
-int sqlitepager_ckpt_rollback(Pager*);
-void sqlitepager_dont_rollback(void*);
-void sqlitepager_dont_write(Pager*, Pgno);
-int *sqlitepager_stats(Pager*);
-void sqlitepager_set_safety_level(Pager*,int);
-
-#ifdef SQLITE_TEST
-void sqlitepager_refdump(Pager*);
-int pager_refinfo_enable;
-int journal_format;
-#endif

ext/sqlite/libsqlite/src/parse.h

@@ -1,127 +0,0 @@
-#define TK_ABORT                           1
-#define TK_AFTER                           2
-#define TK_AGG_FUNCTION                    3
-#define TK_ALL                             4
-#define TK_AND                             5
-#define TK_AS                              6
-#define TK_ASC                             7
-#define TK_BEFORE                          8
-#define TK_BEGIN                           9
-#define TK_BETWEEN                        10
-#define TK_BITAND                         11
-#define TK_BITNOT                         12
-#define TK_BITOR                          13
-#define TK_BY                             14
-#define TK_CASCADE                        15
-#define TK_CASE                           16
-#define TK_CHECK                          17
-#define TK_CLUSTER                        18
-#define TK_COLLATE                        19
-#define TK_COLUMN                         20
-#define TK_COMMA                          21
-#define TK_COMMENT                        22
-#define TK_COMMIT                         23
-#define TK_CONCAT                         24
-#define TK_CONFLICT                       25
-#define TK_CONSTRAINT                     26
-#define TK_COPY                           27
-#define TK_CREATE                         28
-#define TK_DEFAULT                        29
-#define TK_DEFERRABLE                     30
-#define TK_DEFERRED                       31
-#define TK_DELETE                         32
-#define TK_DELIMITERS                     33
-#define TK_DESC                           34
-#define TK_DISTINCT                       35
-#define TK_DOT                            36
-#define TK_DROP                           37
-#define TK_EACH                           38
-#define TK_ELSE                           39
-#define TK_END                            40
-#define TK_END_OF_FILE                    41
-#define TK_EQ                             42
-#define TK_EXCEPT                         43
-#define TK_EXPLAIN                        44
-#define TK_FAIL                           45
-#define TK_FLOAT                          46
-#define TK_FOR                            47
-#define TK_FOREIGN                        48
-#define TK_FROM                           49
-#define TK_FUNCTION                       50
-#define TK_GE                             51
-#define TK_GLOB                           52
-#define TK_GROUP                          53
-#define TK_GT                             54
-#define TK_HAVING                         55
-#define TK_ID                             56
-#define TK_IGNORE                         57
-#define TK_ILLEGAL                        58
-#define TK_IMMEDIATE                      59
-#define TK_IN                             60
-#define TK_INDEX                          61
-#define TK_INITIALLY                      62
-#define TK_INSERT                         63
-#define TK_INSTEAD                        64
-#define TK_INTEGER                        65
-#define TK_INTERSECT                      66
-#define TK_INTO                           67
-#define TK_IS                             68
-#define TK_ISNULL                         69
-#define TK_JOIN                           70
-#define TK_JOIN_KW                        71
-#define TK_KEY                            72
-#define TK_LE                             73
-#define TK_LIKE                           74
-#define TK_LIMIT                          75
-#define TK_LP                             76
-#define TK_LSHIFT                         77
-#define TK_LT                             78
-#define TK_MATCH                          79
-#define TK_MINUS                          80
-#define TK_NE                             81
-#define TK_NOT                            82
-#define TK_NOTNULL                        83
-#define TK_NULL                           84
-#define TK_OF                             85
-#define TK_OFFSET                         86
-#define TK_ON                             87
-#define TK_OR                             88
-#define TK_ORACLE_OUTER_JOIN              89
-#define TK_ORDER                          90
-#define TK_PLUS                           91
-#define TK_PRAGMA                         92
-#define TK_PRIMARY                        93
-#define TK_RAISE                          94
-#define TK_REFERENCES                     95
-#define TK_REM                            96
-#define TK_REPLACE                        97
-#define TK_RESTRICT                       98
-#define TK_ROLLBACK                       99
-#define TK_ROW                            100
-#define TK_RP                             101
-#define TK_RSHIFT                         102
-#define TK_SELECT                         103
-#define TK_SEMI                           104
-#define TK_SET                            105
-#define TK_SLASH                          106
-#define TK_SPACE                          107
-#define TK_STAR                           108
-#define TK_STATEMENT                      109
-#define TK_STRING                         110
-#define TK_TABLE                          111
-#define TK_TEMP                           112
-#define TK_THEN                           113
-#define TK_TRANSACTION                    114
-#define TK_TRIGGER                        115
-#define TK_UMINUS                         116
-#define TK_UNCLOSED_STRING                117
-#define TK_UNION                          118
-#define TK_UNIQUE                         119
-#define TK_UPDATE                         120
-#define TK_UPLUS                          121
-#define TK_USING                          122
-#define TK_VACUUM                         123
-#define TK_VALUES                         124
-#define TK_VIEW                           125
-#define TK_WHEN                           126
-#define TK_WHERE                          127

ext/sqlite/libsqlite/src/parse.y

@@ -1,827 +0,0 @@
-/*
-** 2001 September 15
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** This file contains SQLite's grammar for SQL.  Process this file
-** using the lemon parser generator to generate C code that runs
-** the parser.  Lemon will also generate a header file containing
-** numeric codes for all of the tokens.
-**
-** @(#) $Id$
-*/
-%token_prefix TK_
-%token_type {Token}
-%default_type {Token}
-%extra_argument {Parse *pParse}
-%syntax_error {
-  if( pParse->zErrMsg==0 ){
-    if( TOKEN.z[0] ){
-      sqliteSetNString(&pParse->zErrMsg, 
-          "near \"", -1, TOKEN.z, TOKEN.n, "\": syntax error", -1, 0);
-    }else{
-      sqliteSetString(&pParse->zErrMsg, "incomplete SQL statement", 0);
-    }
-  }
-  pParse->nErr++;
-}
-%name sqliteParser
-%include {
-#include "sqliteInt.h"
-#include "parse.h"
-
-/*
-** An instance of this structure holds information about the
-** LIMIT clause of a SELECT statement.
-*/
-struct LimitVal {
-  int limit;    /* The LIMIT value.  -1 if there is no limit */
-  int offset;   /* The OFFSET.  0 if there is none */
-};
-
-/*
-** An instance of the following structure describes the event of a
-** TRIGGER.  "a" is the event type, one of TK_UPDATE, TK_INSERT,
-** TK_DELETE, or TK_INSTEAD.  If the event is of the form
-**
-**      UPDATE ON (a,b,c)
-**
-** Then the "b" IdList records the list "a,b,c".
-*/
-struct TrigEvent { int a; IdList * b; };
-
-} // end %include
-
-// These are extra tokens used by the lexer but never seen by the
-// parser.  We put them in a rule so that the parser generator will
-// add them to the parse.h output file.
-//
-%nonassoc END_OF_FILE ILLEGAL SPACE UNCLOSED_STRING COMMENT FUNCTION
-          COLUMN AGG_FUNCTION.
-
-// Input is zero or more commands.
-input ::= cmdlist.
-
-// A list of commands is zero or more commands
-//
-cmdlist ::= ecmd.
-cmdlist ::= cmdlist ecmd.
-ecmd ::= explain cmdx SEMI.
-ecmd ::= SEMI.
-cmdx ::= cmd.           { sqliteExec(pParse); }
-explain ::= EXPLAIN.    { sqliteBeginParse(pParse, 1); }
-explain ::= .           { sqliteBeginParse(pParse, 0); }
-
-///////////////////// Begin and end transactions. ////////////////////////////
-//
-
-cmd ::= BEGIN trans_opt onconf(R).  {sqliteBeginTransaction(pParse,R);}
-trans_opt ::= .
-trans_opt ::= TRANSACTION.
-trans_opt ::= TRANSACTION nm.
-cmd ::= COMMIT trans_opt.      {sqliteCommitTransaction(pParse);}
-cmd ::= END trans_opt.         {sqliteCommitTransaction(pParse);}
-cmd ::= ROLLBACK trans_opt.    {sqliteRollbackTransaction(pParse);}
-
-///////////////////// The CREATE TABLE statement ////////////////////////////
-//
-cmd ::= create_table create_table_args.
-create_table ::= CREATE(X) temp(T) TABLE nm(Y). {
-   sqliteStartTable(pParse,&X,&Y,T,0);
-}
-%type temp {int}
-temp(A) ::= TEMP.  {A = pParse->isTemp || !pParse->initFlag;}
-temp(A) ::= .      {A = pParse->isTemp;}
-create_table_args ::= LP columnlist conslist_opt RP(X). {
-  sqliteEndTable(pParse,&X,0);
-}
-create_table_args ::= AS select(S). {
-  sqliteEndTable(pParse,0,S);
-  sqliteSelectDelete(S);
-}
-columnlist ::= columnlist COMMA column.
-columnlist ::= column.
-
-// About the only information used for a column is the name of the
-// column.  The type is always just "text".  But the code will accept
-// an elaborate typename.  Perhaps someday we'll do something with it.
-//
-column ::= columnid type carglist. 
-columnid ::= nm(X).                {sqliteAddColumn(pParse,&X);}
-
-// An IDENTIFIER can be a generic identifier, or one of several
-// keywords.  Any non-standard keyword can also be an identifier.
-//
-%type id {Token}
-id(A) ::= ID(X).         {A = X;}
-
-// The following directive causes tokens ABORT, AFTER, ASC, etc. to
-// fallback to ID if they will not parse as their original value.
-// This obviates the need for the "id" nonterminal.
-//
-%fallback ID 
-  ABORT AFTER ASC BEFORE BEGIN CASCADE CLUSTER CONFLICT
-  COPY DEFERRED DELIMITERS DESC EACH END EXPLAIN FAIL FOR
-  IGNORE IMMEDIATE INITIALLY INSTEAD MATCH KEY
-  OF OFFSET PRAGMA RAISE REPLACE RESTRICT ROW STATEMENT
-  TEMP TRIGGER VACUUM VIEW.
-
-// And "ids" is an identifer-or-string.
-//
-%type ids {Token}
-ids(A) ::= ID(X).        {A = X;}
-ids(A) ::= STRING(X).    {A = X;}
-
-// The name of a column or table can be any of the following:
-//
-%type nm {Token}
-nm(A) ::= ID(X).         {A = X;}
-nm(A) ::= STRING(X).     {A = X;}
-nm(A) ::= JOIN_KW(X).    {A = X;}
-
-type ::= .
-type ::= typename(X).                    {sqliteAddColumnType(pParse,&X,&X);}
-type ::= typename(X) LP signed RP(Y).    {sqliteAddColumnType(pParse,&X,&Y);}
-type ::= typename(X) LP signed COMMA signed RP(Y).
-                                         {sqliteAddColumnType(pParse,&X,&Y);}
-%type typename {Token}
-typename(A) ::= ids(X).           {A = X;}
-typename(A) ::= typename(X) ids.  {A = X;}
-signed ::= INTEGER.
-signed ::= PLUS INTEGER.
-signed ::= MINUS INTEGER.
-carglist ::= carglist carg.
-carglist ::= .
-carg ::= CONSTRAINT nm ccons.
-carg ::= ccons.
-carg ::= DEFAULT STRING(X).          {sqliteAddDefaultValue(pParse,&X,0);}
-carg ::= DEFAULT ID(X).              {sqliteAddDefaultValue(pParse,&X,0);}
-carg ::= DEFAULT INTEGER(X).         {sqliteAddDefaultValue(pParse,&X,0);}
-carg ::= DEFAULT PLUS INTEGER(X).    {sqliteAddDefaultValue(pParse,&X,0);}
-carg ::= DEFAULT MINUS INTEGER(X).   {sqliteAddDefaultValue(pParse,&X,1);}
-carg ::= DEFAULT FLOAT(X).           {sqliteAddDefaultValue(pParse,&X,0);}
-carg ::= DEFAULT PLUS FLOAT(X).      {sqliteAddDefaultValue(pParse,&X,0);}
-carg ::= DEFAULT MINUS FLOAT(X).     {sqliteAddDefaultValue(pParse,&X,1);}
-carg ::= DEFAULT NULL. 
-
-// In addition to the type name, we also care about the primary key and
-// UNIQUE constraints.
-//
-ccons ::= NULL onconf.
-ccons ::= NOT NULL onconf(R).               {sqliteAddNotNull(pParse, R);}
-ccons ::= PRIMARY KEY sortorder onconf(R).  {sqliteAddPrimaryKey(pParse,0,R);}
-ccons ::= UNIQUE onconf(R).            {sqliteCreateIndex(pParse,0,0,0,R,0,0);}
-ccons ::= CHECK LP expr RP onconf.
-ccons ::= REFERENCES nm(T) idxlist_opt(TA) refargs(R).
-                                {sqliteCreateForeignKey(pParse,0,&T,TA,R);}
-ccons ::= defer_subclause(D).   {sqliteDeferForeignKey(pParse,D);}
-ccons ::= COLLATE id(C).  {
-   sqliteAddCollateType(pParse, sqliteCollateType(C.z, C.n));
-}
-
-// The next group of rules parses the arguments to a REFERENCES clause
-// that determine if the referential integrity checking is deferred or
-// or immediate and which determine what action to take if a ref-integ
-// check fails.
-//
-%type refargs {int}
-refargs(A) ::= .                     { A = OE_Restrict * 0x010101; }
-refargs(A) ::= refargs(X) refarg(Y). { A = (X & Y.mask) | Y.value; }
-%type refarg {struct {int value; int mask;}}
-refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
-refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
-refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
-refarg(A) ::= ON INSERT refact(X).   { A.value = X<<16; A.mask = 0xff0000; }
-%type refact {int}
-refact(A) ::= SET NULL.              { A = OE_SetNull; }
-refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
-refact(A) ::= CASCADE.               { A = OE_Cascade; }
-refact(A) ::= RESTRICT.              { A = OE_Restrict; }
-%type defer_subclause {int}
-defer_subclause(A) ::= NOT DEFERRABLE init_deferred_pred_opt(X).  {A = X;}
-defer_subclause(A) ::= DEFERRABLE init_deferred_pred_opt(X).      {A = X;}
-%type init_deferred_pred_opt {int}
-init_deferred_pred_opt(A) ::= .                       {A = 0;}
-init_deferred_pred_opt(A) ::= INITIALLY DEFERRED.     {A = 1;}
-init_deferred_pred_opt(A) ::= INITIALLY IMMEDIATE.    {A = 0;}
-
-// For the time being, the only constraint we care about is the primary
-// key and UNIQUE.  Both create indices.
-//
-conslist_opt ::= .
-conslist_opt ::= COMMA conslist.
-conslist ::= conslist COMMA tcons.
-conslist ::= conslist tcons.
-conslist ::= tcons.
-tcons ::= CONSTRAINT nm.
-tcons ::= PRIMARY KEY LP idxlist(X) RP onconf(R).
-                                             {sqliteAddPrimaryKey(pParse,X,R);}
-tcons ::= UNIQUE LP idxlist(X) RP onconf(R).
-                                       {sqliteCreateIndex(pParse,0,0,X,R,0,0);}
-tcons ::= CHECK expr onconf.
-tcons ::= FOREIGN KEY LP idxlist(FA) RP
-          REFERENCES nm(T) idxlist_opt(TA) refargs(R) defer_subclause_opt(D). {
-    sqliteCreateForeignKey(pParse, FA, &T, TA, R);
-    sqliteDeferForeignKey(pParse, D);
-}
-%type defer_subclause_opt {int}
-defer_subclause_opt(A) ::= .                    {A = 0;}
-defer_subclause_opt(A) ::= defer_subclause(X).  {A = X;}
-
-// The following is a non-standard extension that allows us to declare the
-// default behavior when there is a constraint conflict.
-//
-%type onconf {int}
-%type orconf {int}
-%type resolvetype {int}
-onconf(A) ::= .                              { A = OE_Default; }
-onconf(A) ::= ON CONFLICT resolvetype(X).    { A = X; }
-orconf(A) ::= .                              { A = OE_Default; }
-orconf(A) ::= OR resolvetype(X).             { A = X; }
-resolvetype(A) ::= ROLLBACK.                 { A = OE_Rollback; }
-resolvetype(A) ::= ABORT.                    { A = OE_Abort; }
-resolvetype(A) ::= FAIL.                     { A = OE_Fail; }
-resolvetype(A) ::= IGNORE.                   { A = OE_Ignore; }
-resolvetype(A) ::= REPLACE.                  { A = OE_Replace; }
-
-////////////////////////// The DROP TABLE /////////////////////////////////////
-//
-cmd ::= DROP TABLE nm(X).          {sqliteDropTable(pParse,&X,0);}
-
-///////////////////// The CREATE VIEW statement /////////////////////////////
-//
-cmd ::= CREATE(X) temp(T) VIEW nm(Y) AS select(S). {
-  sqliteCreateView(pParse, &X, &Y, S, T);
-}
-cmd ::= DROP VIEW nm(X). {
-  sqliteDropTable(pParse, &X, 1);
-}
-
-//////////////////////// The SELECT statement /////////////////////////////////
-//
-cmd ::= select(X).  {
-  sqliteSelect(pParse, X, SRT_Callback, 0, 0, 0, 0);
-  sqliteSelectDelete(X);
-}
-
-%type select {Select*}
-%destructor select {sqliteSelectDelete($$);}
-%type oneselect {Select*}
-%destructor oneselect {sqliteSelectDelete($$);}
-
-select(A) ::= oneselect(X).                      {A = X;}
-select(A) ::= select(X) multiselect_op(Y) oneselect(Z).  {
-  if( Z ){
-    Z->op = Y;
-    Z->pPrior = X;
-  }
-  A = Z;
-}
-%type multiselect_op {int}
-multiselect_op(A) ::= UNION.      {A = TK_UNION;}
-multiselect_op(A) ::= UNION ALL.  {A = TK_ALL;}
-multiselect_op(A) ::= INTERSECT.  {A = TK_INTERSECT;}
-multiselect_op(A) ::= EXCEPT.     {A = TK_EXCEPT;}
-oneselect(A) ::= SELECT distinct(D) selcollist(W) from(X) where_opt(Y)
-                 groupby_opt(P) having_opt(Q) orderby_opt(Z) limit_opt(L). {
-  A = sqliteSelectNew(W,X,Y,P,Q,Z,D,L.limit,L.offset);
-}
-
-// The "distinct" nonterminal is true (1) if the DISTINCT keyword is
-// present and false (0) if it is not.
-//
-%type distinct {int}
-distinct(A) ::= DISTINCT.   {A = 1;}
-distinct(A) ::= ALL.        {A = 0;}
-distinct(A) ::= .           {A = 0;}
-
-// selcollist is a list of expressions that are to become the return
-// values of the SELECT statement.  The "*" in statements like
-// "SELECT * FROM ..." is encoded as a special expression with an
-// opcode of TK_ALL.
-//
-%type selcollist {ExprList*}
-%destructor selcollist {sqliteExprListDelete($$);}
-%type sclp {ExprList*}
-%destructor sclp {sqliteExprListDelete($$);}
-sclp(A) ::= selcollist(X) COMMA.             {A = X;}
-sclp(A) ::= .                                {A = 0;}
-selcollist(A) ::= sclp(P) expr(X) as(Y).     {
-   A = sqliteExprListAppend(P,X,Y.n?&Y:0);
-}
-selcollist(A) ::= sclp(P) STAR. {
-  A = sqliteExprListAppend(P, sqliteExpr(TK_ALL, 0, 0, 0), 0);
-}
-selcollist(A) ::= sclp(P) nm(X) DOT STAR. {
-  Expr *pRight = sqliteExpr(TK_ALL, 0, 0, 0);
-  Expr *pLeft = sqliteExpr(TK_ID, 0, 0, &X);
-  A = sqliteExprListAppend(P, sqliteExpr(TK_DOT, pLeft, pRight, 0), 0);
-}
-
-// An option "AS <id>" phrase that can follow one of the expressions that
-// define the result set, or one of the tables in the FROM clause.
-//
-%type as {Token}
-as(X) ::= AS nm(Y).    { X = Y; }
-as(X) ::= ids(Y).      { X = Y; }
-as(X) ::= .            { X.n = 0; }
-
-
-%type seltablist {SrcList*}
-%destructor seltablist {sqliteSrcListDelete($$);}
-%type stl_prefix {SrcList*}
-%destructor stl_prefix {sqliteSrcListDelete($$);}
-%type from {SrcList*}
-%destructor from {sqliteSrcListDelete($$);}
-
-// A complete FROM clause.
-//
-from(A) ::= .                                 {A = sqliteMalloc(sizeof(*A));}
-from(A) ::= FROM seltablist(X).               {A = X;}
-
-// "seltablist" is a "Select Table List" - the content of the FROM clause
-// in a SELECT statement.  "stl_prefix" is a prefix of this list.
-//
-stl_prefix(A) ::= seltablist(X) joinop(Y).    {
-   A = X;
-   if( A && A->nSrc>0 ) A->a[A->nSrc-1].jointype = Y;
-}
-stl_prefix(A) ::= .                           {A = 0;}
-seltablist(A) ::= stl_prefix(X) nm(Y) as(Z) on_opt(N) using_opt(U). {
-  A = sqliteSrcListAppend(X,&Y);
-  if( Z.n ) sqliteSrcListAddAlias(A,&Z);
-  if( N ){
-    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; }
-    else { sqliteExprDelete(N); }
-  }
-  if( U ){
-    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; }
-    else { sqliteIdListDelete(U); }
-  }
-}
-seltablist(A) ::= stl_prefix(X) LP select(S) RP as(Z) on_opt(N) using_opt(U). {
-  A = sqliteSrcListAppend(X,0);
-  A->a[A->nSrc-1].pSelect = S;
-  if( Z.n ) sqliteSrcListAddAlias(A,&Z);
-  if( N ){
-    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pOn = N; }
-    else { sqliteExprDelete(N); }
-  }
-  if( U ){
-    if( A && A->nSrc>1 ){ A->a[A->nSrc-2].pUsing = U; }
-    else { sqliteIdListDelete(U); }
-  }
-}
-
-%type joinop {int}
-%type joinop2 {int}
-joinop(X) ::= COMMA.                   { X = JT_INNER; }
-joinop(X) ::= JOIN.                    { X = JT_INNER; }
-joinop(X) ::= JOIN_KW(A) JOIN.         { X = sqliteJoinType(pParse,&A,0,0); }
-joinop(X) ::= JOIN_KW(A) nm(B) JOIN.   { X = sqliteJoinType(pParse,&A,&B,0); }
-joinop(X) ::= JOIN_KW(A) nm(B) nm(C) JOIN.
-                                       { X = sqliteJoinType(pParse,&A,&B,&C); }
-
-%type on_opt {Expr*}
-%destructor on_opt {sqliteExprDelete($$);}
-on_opt(N) ::= ON expr(E).   {N = E;}
-on_opt(N) ::= .             {N = 0;}
-
-%type using_opt {IdList*}
-%destructor using_opt {sqliteIdListDelete($$);}
-using_opt(U) ::= USING LP idxlist(L) RP.  {U = L;}
-using_opt(U) ::= .                        {U = 0;}
-
-
-%type orderby_opt {ExprList*}
-%destructor orderby_opt {sqliteExprListDelete($$);}
-%type sortlist {ExprList*}
-%destructor sortlist {sqliteExprListDelete($$);}
-%type sortitem {Expr*}
-%destructor sortitem {sqliteExprDelete($$);}
-
-orderby_opt(A) ::= .                          {A = 0;}
-orderby_opt(A) ::= ORDER BY sortlist(X).      {A = X;}
-sortlist(A) ::= sortlist(X) COMMA sortitem(Y) collate(C) sortorder(Z). {
-  A = sqliteExprListAppend(X,Y,0);
-  if( A ) A->a[A->nExpr-1].sortOrder = C+Z;
-}
-sortlist(A) ::= sortitem(Y) collate(C) sortorder(Z). {
-  A = sqliteExprListAppend(0,Y,0);
-  if( A ) A->a[0].sortOrder = C+Z;
-}
-sortitem(A) ::= expr(X).   {A = X;}
-
-%type sortorder {int}
-%type collate {int}
-
-sortorder(A) ::= ASC.           {A = SQLITE_SO_ASC;}
-sortorder(A) ::= DESC.          {A = SQLITE_SO_DESC;}
-sortorder(A) ::= .              {A = SQLITE_SO_ASC;}
-collate(C) ::= .                {C = SQLITE_SO_UNK;}
-collate(C) ::= COLLATE id(X).   {C = sqliteCollateType(X.z, X.n);}
-
-%type groupby_opt {ExprList*}
-%destructor groupby_opt {sqliteExprListDelete($$);}
-groupby_opt(A) ::= .                      {A = 0;}
-groupby_opt(A) ::= GROUP BY exprlist(X).  {A = X;}
-
-%type having_opt {Expr*}
-%destructor having_opt {sqliteExprDelete($$);}
-having_opt(A) ::= .                {A = 0;}
-having_opt(A) ::= HAVING expr(X).  {A = X;}
-
-%type limit_opt {struct LimitVal}
-limit_opt(A) ::= .                  {A.limit = -1; A.offset = 0;}
-limit_opt(A) ::= LIMIT INTEGER(X).  {A.limit = atoi(X.z); A.offset = 0;}
-limit_opt(A) ::= LIMIT INTEGER(X) limit_sep INTEGER(Y). 
-                                    {A.limit = atoi(X.z); A.offset = atoi(Y.z);}
-limit_sep ::= OFFSET.
-limit_sep ::= COMMA.
-
-/////////////////////////// The DELETE statement /////////////////////////////
-//
-cmd ::= DELETE FROM nm(X) where_opt(Y).
-    {sqliteDeleteFrom(pParse, &X, Y);}
-
-%type where_opt {Expr*}
-%destructor where_opt {sqliteExprDelete($$);}
-
-where_opt(A) ::= .                    {A = 0;}
-where_opt(A) ::= WHERE expr(X).       {A = X;}
-
-%type setlist {ExprList*}
-%destructor setlist {sqliteExprListDelete($$);}
-
-////////////////////////// The UPDATE command ////////////////////////////////
-//
-cmd ::= UPDATE orconf(R) nm(X) SET setlist(Y) where_opt(Z).
-    {sqliteUpdate(pParse,&X,Y,Z,R);}
-
-setlist(A) ::= setlist(Z) COMMA nm(X) EQ expr(Y).
-    {A = sqliteExprListAppend(Z,Y,&X);}
-setlist(A) ::= nm(X) EQ expr(Y).   {A = sqliteExprListAppend(0,Y,&X);}
-
-////////////////////////// The INSERT command /////////////////////////////////
-//
-cmd ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) VALUES LP itemlist(Y) RP.
-               {sqliteInsert(pParse, &X, Y, 0, F, R);}
-cmd ::= insert_cmd(R) INTO nm(X) inscollist_opt(F) select(S).
-               {sqliteInsert(pParse, &X, 0, S, F, R);}
-
-%type insert_cmd {int}
-insert_cmd(A) ::= INSERT orconf(R).   {A = R;}
-insert_cmd(A) ::= REPLACE.            {A = OE_Replace;}
-
-
-%type itemlist {ExprList*}
-%destructor itemlist {sqliteExprListDelete($$);}
-
-itemlist(A) ::= itemlist(X) COMMA expr(Y).  {A = sqliteExprListAppend(X,Y,0);}
-itemlist(A) ::= expr(X).                    {A = sqliteExprListAppend(0,X,0);}
-
-%type inscollist_opt {IdList*}
-%destructor inscollist_opt {sqliteIdListDelete($$);}
-%type inscollist {IdList*}
-%destructor inscollist {sqliteIdListDelete($$);}
-
-inscollist_opt(A) ::= .                       {A = 0;}
-inscollist_opt(A) ::= LP inscollist(X) RP.    {A = X;}
-inscollist(A) ::= inscollist(X) COMMA nm(Y).  {A = sqliteIdListAppend(X,&Y);}
-inscollist(A) ::= nm(Y).                      {A = sqliteIdListAppend(0,&Y);}
-
-/////////////////////////// Expression Processing /////////////////////////////
-//
-%left OR.
-%left AND.
-%right NOT.
-%left EQ NE ISNULL NOTNULL IS LIKE GLOB BETWEEN IN.
-%left GT GE LT LE.
-%left BITAND BITOR LSHIFT RSHIFT.
-%left PLUS MINUS.
-%left STAR SLASH REM.
-%left CONCAT.
-%right UMINUS UPLUS BITNOT.
-%right ORACLE_OUTER_JOIN.
-
-%type expr {Expr*}
-%destructor expr {sqliteExprDelete($$);}
-
-expr(A) ::= LP(B) expr(X) RP(E). {A = X; sqliteExprSpan(A,&B,&E); }
-expr(A) ::= NULL(X).             {A = sqliteExpr(TK_NULL, 0, 0, &X);}
-expr(A) ::= ID(X).               {A = sqliteExpr(TK_ID, 0, 0, &X);}
-expr(A) ::= JOIN_KW(X).          {A = sqliteExpr(TK_ID, 0, 0, &X);}
-expr(A) ::= nm(X) DOT nm(Y). {
-  Expr *temp1 = sqliteExpr(TK_ID, 0, 0, &X);
-  Expr *temp2 = sqliteExpr(TK_ID, 0, 0, &Y);
-  A = sqliteExpr(TK_DOT, temp1, temp2, 0);
-}
-expr(A) ::= expr(B) ORACLE_OUTER_JOIN. 
-                             {A = B; ExprSetProperty(A,EP_Oracle8Join);}
-expr(A) ::= INTEGER(X).      {A = sqliteExpr(TK_INTEGER, 0, 0, &X);}
-expr(A) ::= FLOAT(X).        {A = sqliteExpr(TK_FLOAT, 0, 0, &X);}
-expr(A) ::= STRING(X).       {A = sqliteExpr(TK_STRING, 0, 0, &X);}
-expr(A) ::= ID(X) LP exprlist(Y) RP(E). {
-  A = sqliteExprFunction(Y, &X);
-  sqliteExprSpan(A,&X,&E);
-}
-expr(A) ::= ID(X) LP STAR RP(E). {
-  A = sqliteExprFunction(0, &X);
-  sqliteExprSpan(A,&X,&E);
-}
-expr(A) ::= expr(X) AND expr(Y).   {A = sqliteExpr(TK_AND, X, Y, 0);}
-expr(A) ::= expr(X) OR expr(Y).    {A = sqliteExpr(TK_OR, X, Y, 0);}
-expr(A) ::= expr(X) LT expr(Y).    {A = sqliteExpr(TK_LT, X, Y, 0);}
-expr(A) ::= expr(X) GT expr(Y).    {A = sqliteExpr(TK_GT, X, Y, 0);}
-expr(A) ::= expr(X) LE expr(Y).    {A = sqliteExpr(TK_LE, X, Y, 0);}
-expr(A) ::= expr(X) GE expr(Y).    {A = sqliteExpr(TK_GE, X, Y, 0);}
-expr(A) ::= expr(X) NE expr(Y).    {A = sqliteExpr(TK_NE, X, Y, 0);}
-expr(A) ::= expr(X) EQ expr(Y).    {A = sqliteExpr(TK_EQ, X, Y, 0);}
-expr(A) ::= expr(X) BITAND expr(Y). {A = sqliteExpr(TK_BITAND, X, Y, 0);}
-expr(A) ::= expr(X) BITOR expr(Y).  {A = sqliteExpr(TK_BITOR, X, Y, 0);}
-expr(A) ::= expr(X) LSHIFT expr(Y). {A = sqliteExpr(TK_LSHIFT, X, Y, 0);}
-expr(A) ::= expr(X) RSHIFT expr(Y). {A = sqliteExpr(TK_RSHIFT, X, Y, 0);}
-expr(A) ::= expr(X) likeop(OP) expr(Y).  [LIKE]  {
-  ExprList *pList = sqliteExprListAppend(0, Y, 0);
-  pList = sqliteExprListAppend(pList, X, 0);
-  A = sqliteExprFunction(pList, 0);
-  if( A ) A->op = OP;
-  sqliteExprSpan(A, &X->span, &Y->span);
-}
-expr(A) ::= expr(X) NOT likeop(OP) expr(Y). [LIKE] {
-  ExprList *pList = sqliteExprListAppend(0, Y, 0);
-  pList = sqliteExprListAppend(pList, X, 0);
-  A = sqliteExprFunction(pList, 0);
-  if( A ) A->op = OP;
-  A = sqliteExpr(TK_NOT, A, 0, 0);
-  sqliteExprSpan(A,&X->span,&Y->span);
-}
-%type likeop {int}
-likeop(A) ::= LIKE. {A = TK_LIKE;}
-likeop(A) ::= GLOB. {A = TK_GLOB;}
-expr(A) ::= expr(X) PLUS expr(Y).  {A = sqliteExpr(TK_PLUS, X, Y, 0);}
-expr(A) ::= expr(X) MINUS expr(Y). {A = sqliteExpr(TK_MINUS, X, Y, 0);}
-expr(A) ::= expr(X) STAR expr(Y).  {A = sqliteExpr(TK_STAR, X, Y, 0);}
-expr(A) ::= expr(X) SLASH expr(Y). {A = sqliteExpr(TK_SLASH, X, Y, 0);}
-expr(A) ::= expr(X) REM expr(Y).   {A = sqliteExpr(TK_REM, X, Y, 0);}
-expr(A) ::= expr(X) CONCAT expr(Y). {A = sqliteExpr(TK_CONCAT, X, Y, 0);}
-expr(A) ::= expr(X) ISNULL(E). {
-  A = sqliteExpr(TK_ISNULL, X, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) IS NULL(E). {
-  A = sqliteExpr(TK_ISNULL, X, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) NOTNULL(E). {
-  A = sqliteExpr(TK_NOTNULL, X, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) NOT NULL(E). {
-  A = sqliteExpr(TK_NOTNULL, X, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) IS NOT NULL(E). {
-  A = sqliteExpr(TK_NOTNULL, X, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= NOT(B) expr(X). {
-  A = sqliteExpr(TK_NOT, X, 0, 0);
-  sqliteExprSpan(A,&B,&X->span);
-}
-expr(A) ::= BITNOT(B) expr(X). {
-  A = sqliteExpr(TK_BITNOT, X, 0, 0);
-  sqliteExprSpan(A,&B,&X->span);
-}
-expr(A) ::= MINUS(B) expr(X). [UMINUS] {
-  A = sqliteExpr(TK_UMINUS, X, 0, 0);
-  sqliteExprSpan(A,&B,&X->span);
-}
-expr(A) ::= PLUS(B) expr(X). [UPLUS] {
-  A = sqliteExpr(TK_UPLUS, X, 0, 0);
-  sqliteExprSpan(A,&B,&X->span);
-}
-expr(A) ::= LP(B) select(X) RP(E). {
-  A = sqliteExpr(TK_SELECT, 0, 0, 0);
-  if( A ) A->pSelect = X;
-  sqliteExprSpan(A,&B,&E);
-}
-expr(A) ::= expr(W) BETWEEN expr(X) AND expr(Y). {
-  ExprList *pList = sqliteExprListAppend(0, X, 0);
-  pList = sqliteExprListAppend(pList, Y, 0);
-  A = sqliteExpr(TK_BETWEEN, W, 0, 0);
-  if( A ) A->pList = pList;
-  sqliteExprSpan(A,&W->span,&Y->span);
-}
-expr(A) ::= expr(W) NOT BETWEEN expr(X) AND expr(Y). {
-  ExprList *pList = sqliteExprListAppend(0, X, 0);
-  pList = sqliteExprListAppend(pList, Y, 0);
-  A = sqliteExpr(TK_BETWEEN, W, 0, 0);
-  if( A ) A->pList = pList;
-  A = sqliteExpr(TK_NOT, A, 0, 0);
-  sqliteExprSpan(A,&W->span,&Y->span);
-}
-expr(A) ::= expr(X) IN LP exprlist(Y) RP(E).  {
-  A = sqliteExpr(TK_IN, X, 0, 0);
-  if( A ) A->pList = Y;
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) IN LP select(Y) RP(E).  {
-  A = sqliteExpr(TK_IN, X, 0, 0);
-  if( A ) A->pSelect = Y;
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) NOT IN LP exprlist(Y) RP(E).  {
-  A = sqliteExpr(TK_IN, X, 0, 0);
-  if( A ) A->pList = Y;
-  A = sqliteExpr(TK_NOT, A, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-expr(A) ::= expr(X) NOT IN LP select(Y) RP(E).  {
-  A = sqliteExpr(TK_IN, X, 0, 0);
-  if( A ) A->pSelect = Y;
-  A = sqliteExpr(TK_NOT, A, 0, 0);
-  sqliteExprSpan(A,&X->span,&E);
-}
-
-/* CASE expressions */
-expr(A) ::= CASE(C) case_operand(X) case_exprlist(Y) case_else(Z) END(E). {
-  A = sqliteExpr(TK_CASE, X, Z, 0);
-  if( A ) A->pList = Y;
-  sqliteExprSpan(A, &C, &E);
-}
-%type case_exprlist {ExprList*}
-%destructor case_exprlist {sqliteExprListDelete($$);}
-case_exprlist(A) ::= case_exprlist(X) WHEN expr(Y) THEN expr(Z). {
-  A = sqliteExprListAppend(X, Y, 0);
-  A = sqliteExprListAppend(A, Z, 0);
-}
-case_exprlist(A) ::= WHEN expr(Y) THEN expr(Z). {
-  A = sqliteExprListAppend(0, Y, 0);
-  A = sqliteExprListAppend(A, Z, 0);
-}
-%type case_else {Expr*}
-case_else(A) ::=  ELSE expr(X).         {A = X;}
-case_else(A) ::=  .                     {A = 0;} 
-%type case_operand {Expr*}
-case_operand(A) ::= expr(X).            {A = X;} 
-case_operand(A) ::= .                   {A = 0;} 
-
-%type exprlist {ExprList*}
-%destructor exprlist {sqliteExprListDelete($$);}
-%type expritem {Expr*}
-%destructor expritem {sqliteExprDelete($$);}
-
-exprlist(A) ::= exprlist(X) COMMA expritem(Y). 
-   {A = sqliteExprListAppend(X,Y,0);}
-exprlist(A) ::= expritem(X).            {A = sqliteExprListAppend(0,X,0);}
-expritem(A) ::= expr(X).                {A = X;}
-expritem(A) ::= .                       {A = 0;}
-
-///////////////////////////// The CREATE INDEX command ///////////////////////
-//
-cmd ::= CREATE(S) uniqueflag(U) INDEX nm(X)
-        ON nm(Y) LP idxlist(Z) RP(E) onconf(R). {
-  if( U!=OE_None ) U = R;
-  if( U==OE_Default) U = OE_Abort;
-  sqliteCreateIndex(pParse, &X, &Y, Z, U, &S, &E);
-}
-
-%type uniqueflag {int}
-uniqueflag(A) ::= UNIQUE.  { A = OE_Abort; }
-uniqueflag(A) ::= .        { A = OE_None; }
-
-%type idxlist {IdList*}
-%destructor idxlist {sqliteIdListDelete($$);}
-%type idxlist_opt {IdList*}
-%destructor idxlist_opt {sqliteIdListDelete($$);}
-%type idxitem {Token}
-
-idxlist_opt(A) ::= .                         {A = 0;}
-idxlist_opt(A) ::= LP idxlist(X) RP.         {A = X;}
-idxlist(A) ::= idxlist(X) COMMA idxitem(Y).  {A = sqliteIdListAppend(X,&Y);}
-idxlist(A) ::= idxitem(Y).                   {A = sqliteIdListAppend(0,&Y);}
-idxitem(A) ::= nm(X).                        {A = X;}
-
-///////////////////////////// The DROP INDEX command /////////////////////////
-//
-
-cmd ::= DROP INDEX nm(X).      {sqliteDropIndex(pParse, &X);}
-
-
-///////////////////////////// The COPY command ///////////////////////////////
-//
-cmd ::= COPY orconf(R) nm(X) FROM nm(Y) USING DELIMITERS STRING(Z).
-    {sqliteCopy(pParse,&X,&Y,&Z,R);}
-cmd ::= COPY orconf(R) nm(X) FROM nm(Y).
-    {sqliteCopy(pParse,&X,&Y,0,R);}
-
-///////////////////////////// The VACUUM command /////////////////////////////
-//
-cmd ::= VACUUM.                {sqliteVacuum(pParse,0);}
-cmd ::= VACUUM nm(X).         {sqliteVacuum(pParse,&X);}
-
-///////////////////////////// The PRAGMA command /////////////////////////////
-//
-cmd ::= PRAGMA ids(X) EQ nm(Y).         {sqlitePragma(pParse,&X,&Y,0);}
-cmd ::= PRAGMA ids(X) EQ ON(Y).          {sqlitePragma(pParse,&X,&Y,0);}
-cmd ::= PRAGMA ids(X) EQ plus_num(Y).    {sqlitePragma(pParse,&X,&Y,0);}
-cmd ::= PRAGMA ids(X) EQ minus_num(Y).   {sqlitePragma(pParse,&X,&Y,1);}
-cmd ::= PRAGMA ids(X) LP nm(Y) RP.      {sqlitePragma(pParse,&X,&Y,0);}
-cmd ::= PRAGMA ids(X).                   {sqlitePragma(pParse,&X,&X,0);}
-plus_num(A) ::= plus_opt number(X).   {A = X;}
-minus_num(A) ::= MINUS number(X).     {A = X;}
-number(A) ::= INTEGER(X).  {A = X;}
-number(A) ::= FLOAT(X).    {A = X;}
-plus_opt ::= PLUS.
-plus_opt ::= .
-
-//////////////////////////// The CREATE TRIGGER command /////////////////////
-cmd ::= CREATE(A) TRIGGER nm(B) trigger_time(C) trigger_event(D) ON nm(E) 
-                  foreach_clause(F) when_clause(G)
-                  BEGIN trigger_cmd_list(S) END(Z). {
-  Token all;
-  all.z = A.z;
-  all.n = (Z.z - A.z) + Z.n;
-  sqliteCreateTrigger(pParse, &B, C, D.a, D.b, &E, F, G, S, &all);
-}
-
-%type trigger_time  {int}
-trigger_time(A) ::= BEFORE.      { A = TK_BEFORE; }
-trigger_time(A) ::= AFTER.       { A = TK_AFTER;  }
-trigger_time(A) ::= INSTEAD OF.  { A = TK_INSTEAD;}
-trigger_time(A) ::= .            { A = TK_BEFORE; }
-
-%type trigger_event {struct TrigEvent}
-%destructor trigger_event {sqliteIdListDelete($$.b);}
-trigger_event(A) ::= DELETE. { A.a = TK_DELETE; A.b = 0; }
-trigger_event(A) ::= INSERT. { A.a = TK_INSERT; A.b = 0; }
-trigger_event(A) ::= UPDATE. { A.a = TK_UPDATE; A.b = 0;}
-trigger_event(A) ::= UPDATE OF inscollist(X). {A.a = TK_UPDATE; A.b = X; }
-
-%type foreach_clause {int}
-foreach_clause(A) ::= .                   { A = TK_ROW; }
-foreach_clause(A) ::= FOR EACH ROW.       { A = TK_ROW; }
-foreach_clause(A) ::= FOR EACH STATEMENT. { A = TK_STATEMENT; }
-
-%type when_clause {Expr *}
-when_clause(A) ::= .             { A = 0; }
-when_clause(A) ::= WHEN expr(X). { A = X; }
-
-%type trigger_cmd_list {TriggerStep *}
-trigger_cmd_list(A) ::= trigger_cmd(X) SEMI trigger_cmd_list(Y). {
-  X->pNext = Y ; A = X; }
-trigger_cmd_list(A) ::= . { A = 0; }
-
-%type trigger_cmd {TriggerStep *}
-// UPDATE 
-trigger_cmd(A) ::= UPDATE orconf(R) nm(X) SET setlist(Y) where_opt(Z).  
-               { A = sqliteTriggerUpdateStep(&X, Y, Z, R); }
-
-// INSERT
-trigger_cmd(A) ::= INSERT orconf(R) INTO nm(X) inscollist_opt(F) 
-  VALUES LP itemlist(Y) RP.  
-{A = sqliteTriggerInsertStep(&X, F, Y, 0, R);}
-
-trigger_cmd(A) ::= INSERT orconf(R) INTO nm(X) inscollist_opt(F) select(S).
-               {A = sqliteTriggerInsertStep(&X, F, 0, S, R);}
-
-// DELETE
-trigger_cmd(A) ::= DELETE FROM nm(X) where_opt(Y).
-               {A = sqliteTriggerDeleteStep(&X, Y);}
-
-// SELECT
-trigger_cmd(A) ::= select(X).  {A = sqliteTriggerSelectStep(X); }
-
-// The special RAISE expression that may occur in trigger programs
-expr(A) ::= RAISE(X) LP IGNORE RP(Y).  {
-  A = sqliteExpr(TK_RAISE, 0, 0, 0); 
-  A->iColumn = OE_Ignore;
-  sqliteExprSpan(A, &X, &Y);
-}
-expr(A) ::= RAISE(X) LP ROLLBACK COMMA nm(Z) RP(Y).  {
-  A = sqliteExpr(TK_RAISE, 0, 0, &Z); 
-  A->iColumn = OE_Rollback;
-  sqliteExprSpan(A, &X, &Y);
-}
-expr(A) ::= RAISE(X) LP ABORT COMMA nm(Z) RP(Y).  {
-  A = sqliteExpr(TK_RAISE, 0, 0, &Z); 
-  A->iColumn = OE_Abort;
-  sqliteExprSpan(A, &X, &Y);
-}
-expr(A) ::= RAISE(X) LP FAIL COMMA nm(Z) RP(Y).  {
-  A = sqliteExpr(TK_RAISE, 0, 0, &Z); 
-  A->iColumn = OE_Fail;
-  sqliteExprSpan(A, &X, &Y);
-}
-
-////////////////////////  DROP TRIGGER statement //////////////////////////////
-cmd ::= DROP TRIGGER nm(X). {
-    sqliteDropTrigger(pParse,&X,0);
-}

ext/sqlite/libsqlite/src/printf.c

@@ -1,824 +0,0 @@
-/*
-** The "printf" code that follows dates from the 1980's.  It is in
-** the public domain.  The original comments are included here for
-** completeness.  They are slightly out-of-date.
-**
-** The following modules is an enhanced replacement for the "printf" subroutines
-** found in the standard C library.  The following enhancements are
-** supported:
-**
-**      +  Additional functions.  The standard set of "printf" functions
-**         includes printf, fprintf, sprintf, vprintf, vfprintf, and
-**         vsprintf.  This module adds the following:
-**
-**           *  snprintf -- Works like sprintf, but has an extra argument
-**                          which is the size of the buffer written to.
-**
-**           *  mprintf --  Similar to sprintf.  Writes output to memory
-**                          obtained from malloc.
-**
-**           *  xprintf --  Calls a function to dispose of output.
-**
-**           *  nprintf --  No output, but returns the number of characters
-**                          that would have been output by printf.
-**
-**           *  A v- version (ex: vsnprintf) of every function is also
-**              supplied.
-**
-**      +  A few extensions to the formatting notation are supported:
-**
-**           *  The "=" flag (similar to "-") causes the output to be
-**              be centered in the appropriately sized field.
-**
-**           *  The %b field outputs an integer in binary notation.
-**
-**           *  The %c field now accepts a precision.  The character output
-**              is repeated by the number of times the precision specifies.
-**
-**           *  The %' field works like %c, but takes as its character the
-**              next character of the format string, instead of the next
-**              argument.  For example,  printf("%.78'-")  prints 78 minus
-**              signs, the same as  printf("%.78c",'-').
-**
-**      +  When compiled using GCC on a SPARC, this version of printf is
-**         faster than the library printf for SUN OS 4.1.
-**
-**      +  All functions are fully reentrant.
-**
-*/
-#include "sqliteInt.h"
-
-/*
-** Undefine COMPATIBILITY to make some slight changes in the way things
-** work.  I think the changes are an improvement, but they are not
-** backwards compatible.
-*/
-/* #define COMPATIBILITY       / * Compatible with SUN OS 4.1 */
-
-/*
-** Conversion types fall into various categories as defined by the
-** following enumeration.
-*/
-enum et_type {    /* The type of the format field */
-   etRADIX,            /* Integer types.  %d, %x, %o, and so forth */
-   etFLOAT,            /* Floating point.  %f */
-   etEXP,              /* Exponentional notation. %e and %E */
-   etGENERIC,          /* Floating or exponential, depending on exponent. %g */
-   etSIZE,             /* Return number of characters processed so far. %n */
-   etSTRING,           /* Strings. %s */
-   etPERCENT,          /* Percent symbol. %% */
-   etCHARX,            /* Characters. %c */
-   etERROR,            /* Used to indicate no such conversion type */
-/* The rest are extensions, not normally found in printf() */
-   etCHARLIT,          /* Literal characters.  %' */
-   etSQLESCAPE,        /* Strings with '\'' doubled.  %q */
-   etSQLESCAPE2,       /* Strings with '\'' doubled and enclosed in '',
-                          NULL pointers replaced by SQL NULL.  %Q */
-   etORDINAL           /* 1st, 2nd, 3rd and so forth */
-};
-
-/*
-** Each builtin conversion character (ex: the 'd' in "%d") is described
-** by an instance of the following structure
-*/
-typedef struct et_info {   /* Information about each format field */
-  int  fmttype;              /* The format field code letter */
-  int  base;                 /* The base for radix conversion */
-  char *charset;             /* The character set for conversion */
-  int  flag_signed;          /* Is the quantity signed? */
-  char *prefix;              /* Prefix on non-zero values in alt format */
-  enum et_type type;          /* Conversion paradigm */
-} et_info;
-
-/*
-** The following table is searched linearly, so it is good to put the
-** most frequently used conversion types first.
-*/
-static et_info fmtinfo[] = {
-  { 'd',  10,  "0123456789",       1,    0, etRADIX,      },
-  { 's',   0,  0,                  0,    0, etSTRING,     }, 
-  { 'q',   0,  0,                  0,    0, etSQLESCAPE,  },
-  { 'Q',   0,  0,                  0,    0, etSQLESCAPE2, },
-  { 'c',   0,  0,                  0,    0, etCHARX,      },
-  { 'o',   8,  "01234567",         0,  "0", etRADIX,      },
-  { 'u',  10,  "0123456789",       0,    0, etRADIX,      },
-  { 'x',  16,  "0123456789abcdef", 0, "x0", etRADIX,      },
-  { 'X',  16,  "0123456789ABCDEF", 0, "X0", etRADIX,      },
-  { 'r',  10,  "0123456789",       0,    0, etORDINAL,    },
-  { 'f',   0,  0,                  1,    0, etFLOAT,      },
-  { 'e',   0,  "e",                1,    0, etEXP,        },
-  { 'E',   0,  "E",                1,    0, etEXP,        },
-  { 'g',   0,  "e",                1,    0, etGENERIC,    },
-  { 'G',   0,  "E",                1,    0, etGENERIC,    },
-  { 'i',  10,  "0123456789",       1,    0, etRADIX,      },
-  { 'n',   0,  0,                  0,    0, etSIZE,       },
-  { '%',   0,  0,                  0,    0, etPERCENT,    },
-  { 'b',   2,  "01",               0, "b0", etRADIX,      }, /* Binary */
-  { 'p',  10,  "0123456789",       0,    0, etRADIX,      }, /* Pointers */
-  { '\'',  0,  0,                  0,    0, etCHARLIT,    }, /* Literal char */
-};
-#define etNINFO  (sizeof(fmtinfo)/sizeof(fmtinfo[0]))
-
-/*
-** If NOFLOATINGPOINT is defined, then none of the floating point
-** conversions will work.
-*/
-#ifndef etNOFLOATINGPOINT
-/*
-** "*val" is a double such that 0.1 <= *val < 10.0
-** Return the ascii code for the leading digit of *val, then
-** multiply "*val" by 10.0 to renormalize.
-**
-** Example:
-**     input:     *val = 3.14159
-**     output:    *val = 1.4159    function return = '3'
-**
-** The counter *cnt is incremented each time.  After counter exceeds
-** 16 (the number of significant digits in a 64-bit float) '0' is
-** always returned.
-*/
-static int et_getdigit(double *val, int *cnt){
-  int digit;
-  double d;
-  if( (*cnt)++ >= 16 ) return '0';
-  digit = (int)*val;
-  d = digit;
-  digit += '0';
-  *val = (*val - d)*10.0;
-  return digit;
-}
-#endif
-
-#define etBUFSIZE 1000  /* Size of the output buffer */
-
-/*
-** The root program.  All variations call this core.
-**
-** INPUTS:
-**   func   This is a pointer to a function taking three arguments
-**            1. A pointer to anything.  Same as the "arg" parameter.
-**            2. A pointer to the list of characters to be output
-**               (Note, this list is NOT null terminated.)
-**            3. An integer number of characters to be output.
-**               (Note: This number might be zero.)
-**
-**   arg    This is the pointer to anything which will be passed as the
-**          first argument to "func".  Use it for whatever you like.
-**
-**   fmt    This is the format string, as in the usual print.
-**
-**   ap     This is a pointer to a list of arguments.  Same as in
-**          vfprint.
-**
-** OUTPUTS:
-**          The return value is the total number of characters sent to
-**          the function "func".  Returns -1 on a error.
-**
-** Note that the order in which automatic variables are declared below
-** seems to make a big difference in determining how fast this beast
-** will run.
-*/
-static int vxprintf(
-  void (*func)(void*,char*,int),
-  void *arg,
-  const char *format,
-  va_list ap
-){
-  register const char *fmt; /* The format string. */
-  register int c;           /* Next character in the format string */
-  register char *bufpt;     /* Pointer to the conversion buffer */
-  register int  precision;  /* Precision of the current field */
-  register int  length;     /* Length of the field */
-  register int  idx;        /* A general purpose loop counter */
-  int count;                /* Total number of characters output */
-  int width;                /* Width of the current field */
-  int flag_leftjustify;     /* True if "-" flag is present */
-  int flag_plussign;        /* True if "+" flag is present */
-  int flag_blanksign;       /* True if " " flag is present */
-  int flag_alternateform;   /* True if "#" flag is present */
-  int flag_zeropad;         /* True if field width constant starts with zero */
-  int flag_long;            /* True if "l" flag is present */
-  int flag_center;          /* True if "=" flag is present */
-  unsigned long longvalue;  /* Value for integer types */
-  double realvalue;         /* Value for real types */
-  et_info *infop;           /* Pointer to the appropriate info structure */
-  char buf[etBUFSIZE];      /* Conversion buffer */
-  char prefix;              /* Prefix character.  "+" or "-" or " " or '\0'. */
-  int  errorflag = 0;       /* True if an error is encountered */
-  enum et_type xtype;       /* Conversion paradigm */
-  char *zExtra;             /* Extra memory used for etTCLESCAPE conversions */
-  static char spaces[] = "                                                  "
-     "                                                                      ";
-#define etSPACESIZE (sizeof(spaces)-1)
-#ifndef etNOFLOATINGPOINT
-  int  exp;                 /* exponent of real numbers */
-  double rounder;           /* Used for rounding floating point values */
-  int flag_dp;              /* True if decimal point should be shown */
-  int flag_rtz;             /* True if trailing zeros should be removed */
-  int flag_exp;             /* True to force display of the exponent */
-  int nsd;                  /* Number of significant digits returned */
-#endif
-
-  fmt = format;                     /* Put in a register for speed */
-  count = length = 0;
-  bufpt = 0;
-  for(; (c=(*fmt))!=0; ++fmt){
-    if( c!='%' ){
-      register int amt;
-      bufpt = (char *)fmt;
-      amt = 1;
-      while( (c=(*++fmt))!='%' && c!=0 ) amt++;
-      (*func)(arg,bufpt,amt);
-      count += amt;
-      if( c==0 ) break;
-    }
-    if( (c=(*++fmt))==0 ){
-      errorflag = 1;
-      (*func)(arg,"%",1);
-      count++;
-      break;
-    }
-    /* Find out what flags are present */
-    flag_leftjustify = flag_plussign = flag_blanksign = 
-     flag_alternateform = flag_zeropad = flag_center = 0;
-    do{
-      switch( c ){
-        case '-':   flag_leftjustify = 1;     c = 0;   break;
-        case '+':   flag_plussign = 1;        c = 0;   break;
-        case ' ':   flag_blanksign = 1;       c = 0;   break;
-        case '#':   flag_alternateform = 1;   c = 0;   break;
-        case '0':   flag_zeropad = 1;         c = 0;   break;
-        case '=':   flag_center = 1;          c = 0;   break;
-        default:                                       break;
-      }
-    }while( c==0 && (c=(*++fmt))!=0 );
-    if( flag_center ) flag_leftjustify = 0;
-    /* Get the field width */
-    width = 0;
-    if( c=='*' ){
-      width = va_arg(ap,int);
-      if( width<0 ){
-        flag_leftjustify = 1;
-        width = -width;
-      }
-      c = *++fmt;
-    }else{
-      while( c>='0' && c<='9' ){
-        width = width*10 + c - '0';
-        c = *++fmt;
-      }
-    }
-    if( width > etBUFSIZE-10 ){
-      width = etBUFSIZE-10;
-    }
-    /* Get the precision */
-    if( c=='.' ){
-      precision = 0;
-      c = *++fmt;
-      if( c=='*' ){
-        precision = va_arg(ap,int);
-#ifndef etCOMPATIBILITY
-        /* This is sensible, but SUN OS 4.1 doesn't do it. */
-        if( precision<0 ) precision = -precision;
-#endif
-        c = *++fmt;
-      }else{
-        while( c>='0' && c<='9' ){
-          precision = precision*10 + c - '0';
-          c = *++fmt;
-        }
-      }
-      /* Limit the precision to prevent overflowing buf[] during conversion */
-      if( precision>etBUFSIZE-40 ) precision = etBUFSIZE-40;
-    }else{
-      precision = -1;
-    }
-    /* Get the conversion type modifier */
-    if( c=='l' ){
-      flag_long = 1;
-      c = *++fmt;
-    }else{
-      flag_long = 0;
-    }
-    /* Fetch the info entry for the field */
-    infop = 0;
-    for(idx=0; idx<etNINFO; idx++){
-      if( c==fmtinfo[idx].fmttype ){
-        infop = &fmtinfo[idx];
-        break;
-      }
-    }
-    /* No info entry found.  It must be an error. */
-    if( infop==0 ){
-      xtype = etERROR;
-    }else{
-      xtype = infop->type;
-    }
-    zExtra = 0;
-
-    /*
-    ** At this point, variables are initialized as follows:
-    **
-    **   flag_alternateform          TRUE if a '#' is present.
-    **   flag_plussign               TRUE if a '+' is present.
-    **   flag_leftjustify            TRUE if a '-' is present or if the
-    **                               field width was negative.
-    **   flag_zeropad                TRUE if the width began with 0.
-    **   flag_long                   TRUE if the letter 'l' (ell) prefixed
-    **                               the conversion character.
-    **   flag_blanksign              TRUE if a ' ' is present.
-    **   width                       The specified field width.  This is
-    **                               always non-negative.  Zero is the default.
-    **   precision                   The specified precision.  The default
-    **                               is -1.
-    **   xtype                       The class of the conversion.
-    **   infop                       Pointer to the appropriate info struct.
-    */
-    switch( xtype ){
-      case etORDINAL:
-      case etRADIX:
-        if( flag_long )  longvalue = va_arg(ap,long);
-        else             longvalue = va_arg(ap,int);
-#ifdef etCOMPATIBILITY
-        /* For the format %#x, the value zero is printed "0" not "0x0".
-        ** I think this is stupid. */
-        if( longvalue==0 ) flag_alternateform = 0;
-#else
-        /* More sensible: turn off the prefix for octal (to prevent "00"),
-        ** but leave the prefix for hex. */
-        if( longvalue==0 && infop->base==8 ) flag_alternateform = 0;
-#endif
-        if( infop->flag_signed ){
-          if( *(long*)&longvalue<0 ){
-            longvalue = -*(long*)&longvalue;
-            prefix = '-';
-          }else if( flag_plussign )  prefix = '+';
-          else if( flag_blanksign )  prefix = ' ';
-          else                       prefix = 0;
-        }else                        prefix = 0;
-        if( flag_zeropad && precision<width-(prefix!=0) ){
-          precision = width-(prefix!=0);
-        }
-        bufpt = &buf[etBUFSIZE];
-        if( xtype==etORDINAL ){
-          long a,b;
-          a = longvalue%10;
-          b = longvalue%100;
-          bufpt -= 2;
-          if( a==0 || a>3 || (b>10 && b<14) ){
-            bufpt[0] = 't';
-            bufpt[1] = 'h';
-          }else if( a==1 ){
-            bufpt[0] = 's';
-            bufpt[1] = 't';
-          }else if( a==2 ){
-            bufpt[0] = 'n';
-            bufpt[1] = 'd';
-          }else if( a==3 ){
-            bufpt[0] = 'r';
-            bufpt[1] = 'd';
-          }
-        }
-        {
-          register char *cset;      /* Use registers for speed */
-          register int base;
-          cset = infop->charset;
-          base = infop->base;
-          do{                                           /* Convert to ascii */
-            *(--bufpt) = cset[longvalue%base];
-            longvalue = longvalue/base;
-          }while( longvalue>0 );
-        }
-        length = (long)&buf[etBUFSIZE]-(long)bufpt;
-        for(idx=precision-length; idx>0; idx--){
-          *(--bufpt) = '0';                             /* Zero pad */
-        }
-        if( prefix ) *(--bufpt) = prefix;               /* Add sign */
-        if( flag_alternateform && infop->prefix ){      /* Add "0" or "0x" */
-          char *pre, x;
-          pre = infop->prefix;
-          if( *bufpt!=pre[0] ){
-            for(pre=infop->prefix; (x=(*pre))!=0; pre++) *(--bufpt) = x;
-          }
-        }
-        length = (long)&buf[etBUFSIZE]-(long)bufpt;
-        break;
-      case etFLOAT:
-      case etEXP:
-      case etGENERIC:
-        realvalue = va_arg(ap,double);
-#ifndef etNOFLOATINGPOINT
-        if( precision<0 ) precision = 6;         /* Set default precision */
-        if( precision>etBUFSIZE-10 ) precision = etBUFSIZE-10;
-        if( realvalue<0.0 ){
-          realvalue = -realvalue;
-          prefix = '-';
-        }else{
-          if( flag_plussign )          prefix = '+';
-          else if( flag_blanksign )    prefix = ' ';
-          else                         prefix = 0;
-        }
-        if( infop->type==etGENERIC && precision>0 ) precision--;
-        rounder = 0.0;
-#ifdef COMPATIBILITY
-        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
-        for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
-#else
-        /* It makes more sense to use 0.5 */
-        for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1);
-#endif
-        if( infop->type==etFLOAT ) realvalue += rounder;
-        /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
-        exp = 0;
-        if( realvalue>0.0 ){
-          int k = 0;
-          while( realvalue>=1e8 && k++<100 ){ realvalue *= 1e-8; exp+=8; }
-          while( realvalue>=10.0 && k++<100 ){ realvalue *= 0.1; exp++; }
-          while( realvalue<1e-8 && k++<100 ){ realvalue *= 1e8; exp-=8; }
-          while( realvalue<1.0 && k++<100 ){ realvalue *= 10.0; exp--; }
-          if( k>=100 ){
-            bufpt = "NaN";
-            length = 3;
-            break;
-          }
-        }
-        bufpt = buf;
-        /*
-        ** If the field type is etGENERIC, then convert to either etEXP
-        ** or etFLOAT, as appropriate.
-        */
-        flag_exp = xtype==etEXP;
-        if( xtype!=etFLOAT ){
-          realvalue += rounder;
-          if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
-        }
-        if( xtype==etGENERIC ){
-          flag_rtz = !flag_alternateform;
-          if( exp<-4 || exp>precision ){
-            xtype = etEXP;
-          }else{
-            precision = precision - exp;
-            xtype = etFLOAT;
-          }
-        }else{
-          flag_rtz = 0;
-        }
-        /*
-        ** The "exp+precision" test causes output to be of type etEXP if
-        ** the precision is too large to fit in buf[].
-        */
-        nsd = 0;
-        if( xtype==etFLOAT && exp+precision<etBUFSIZE-30 ){
-          flag_dp = (precision>0 || flag_alternateform);
-          if( prefix ) *(bufpt++) = prefix;         /* Sign */
-          if( exp<0 )  *(bufpt++) = '0';            /* Digits before "." */
-          else for(; exp>=0; exp--) *(bufpt++) = et_getdigit(&realvalue,&nsd);
-          if( flag_dp ) *(bufpt++) = '.';           /* The decimal point */
-          for(exp++; exp<0 && precision>0; precision--, exp++){
-            *(bufpt++) = '0';
-          }
-          while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd);
-          *(bufpt--) = 0;                           /* Null terminate */
-          if( flag_rtz && flag_dp ){     /* Remove trailing zeros and "." */
-            while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0;
-            if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0;
-          }
-          bufpt++;                            /* point to next free slot */
-        }else{    /* etEXP or etGENERIC */
-          flag_dp = (precision>0 || flag_alternateform);
-          if( prefix ) *(bufpt++) = prefix;   /* Sign */
-          *(bufpt++) = et_getdigit(&realvalue,&nsd);  /* First digit */
-          if( flag_dp ) *(bufpt++) = '.';     /* Decimal point */
-          while( (precision--)>0 ) *(bufpt++) = et_getdigit(&realvalue,&nsd);
-          bufpt--;                            /* point to last digit */
-          if( flag_rtz && flag_dp ){          /* Remove tail zeros */
-            while( bufpt>=buf && *bufpt=='0' ) *(bufpt--) = 0;
-            if( bufpt>=buf && *bufpt=='.' ) *(bufpt--) = 0;
-          }
-          bufpt++;                            /* point to next free slot */
-          if( exp || flag_exp ){
-            *(bufpt++) = infop->charset[0];
-            if( exp<0 ){ *(bufpt++) = '-'; exp = -exp; } /* sign of exp */
-            else       { *(bufpt++) = '+'; }
-            if( exp>=100 ){
-              *(bufpt++) = (exp/100)+'0';                /* 100's digit */
-              exp %= 100;
-            }
-            *(bufpt++) = exp/10+'0';                     /* 10's digit */
-            *(bufpt++) = exp%10+'0';                     /* 1's digit */
-          }
-        }
-        /* The converted number is in buf[] and zero terminated. Output it.
-        ** Note that the number is in the usual order, not reversed as with
-        ** integer conversions. */
-        length = (long)bufpt-(long)buf;
-        bufpt = buf;
-
-        /* Special case:  Add leading zeros if the flag_zeropad flag is
-        ** set and we are not left justified */
-        if( flag_zeropad && !flag_leftjustify && length < width){
-          int i;
-          int nPad = width - length;
-          for(i=width; i>=nPad; i--){
-            bufpt[i] = bufpt[i-nPad];
-          }
-          i = prefix!=0;
-          while( nPad-- ) bufpt[i++] = '0';
-          length = width;
-        }
-#endif
-        break;
-      case etSIZE:
-        *(va_arg(ap,int*)) = count;
-        length = width = 0;
-        break;
-      case etPERCENT:
-        buf[0] = '%';
-        bufpt = buf;
-        length = 1;
-        break;
-      case etCHARLIT:
-      case etCHARX:
-        c = buf[0] = (xtype==etCHARX ? va_arg(ap,int) : *++fmt);
-        if( precision>=0 ){
-          for(idx=1; idx<precision; idx++) buf[idx] = c;
-          length = precision;
-        }else{
-          length =1;
-        }
-        bufpt = buf;
-        break;
-      case etSTRING:
-        bufpt = va_arg(ap,char*);
-        if( bufpt==0 ) bufpt = "(null)";
-        length = strlen(bufpt);
-        if( precision>=0 && precision<length ) length = precision;
-        break;
-      case etSQLESCAPE:
-      case etSQLESCAPE2:
-        {
-          int i, j, n, c, isnull;
-          char *arg = va_arg(ap,char*);
-          isnull = arg==0;
-          if( isnull ) arg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
-          for(i=n=0; (c=arg[i])!=0; i++){
-            if( c=='\'' )  n++;
-          }
-          n += i + 1 + ((!isnull && xtype==etSQLESCAPE2) ? 2 : 0);
-          if( n>etBUFSIZE ){
-            bufpt = zExtra = sqliteMalloc( n );
-            if( bufpt==0 ) return -1;
-          }else{
-            bufpt = buf;
-          }
-          j = 0;
-          if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\'';
-          for(i=0; (c=arg[i])!=0; i++){
-            bufpt[j++] = c;
-            if( c=='\'' ) bufpt[j++] = c;
-          }
-          if( !isnull && xtype==etSQLESCAPE2 ) bufpt[j++] = '\'';
-          bufpt[j] = 0;
-          length = j;
-          if( precision>=0 && precision<length ) length = precision;
-        }
-        break;
-      case etERROR:
-        buf[0] = '%';
-        buf[1] = c;
-        errorflag = 0;
-        idx = 1+(c!=0);
-        (*func)(arg,"%",idx);
-        count += idx;
-        if( c==0 ) fmt--;
-        break;
-    }/* End switch over the format type */
-    /*
-    ** The text of the conversion is pointed to by "bufpt" and is
-    ** "length" characters long.  The field width is "width".  Do
-    ** the output.
-    */
-    if( !flag_leftjustify ){
-      register int nspace;
-      nspace = width-length;
-      if( nspace>0 ){
-        if( flag_center ){
-          nspace = nspace/2;
-          width -= nspace;
-          flag_leftjustify = 1;
-        }
-        count += nspace;
-        while( nspace>=etSPACESIZE ){
-          (*func)(arg,spaces,etSPACESIZE);
-          nspace -= etSPACESIZE;
-        }
-        if( nspace>0 ) (*func)(arg,spaces,nspace);
-      }
-    }
-    if( length>0 ){
-      (*func)(arg,bufpt,length);
-      count += length;
-    }
-    if( flag_leftjustify ){
-      register int nspace;
-      nspace = width-length;
-      if( nspace>0 ){
-        count += nspace;
-        while( nspace>=etSPACESIZE ){
-          (*func)(arg,spaces,etSPACESIZE);
-          nspace -= etSPACESIZE;
-        }
-        if( nspace>0 ) (*func)(arg,spaces,nspace);
-      }
-    }
-    if( zExtra ){
-      sqliteFree(zExtra);
-    }
-  }/* End for loop over the format string */
-  return errorflag ? -1 : count;
-} /* End of function */
-
-
-/* This structure is used to store state information about the
-** write to memory that is currently in progress.
-*/
-struct sgMprintf {
-  char *zBase;     /* A base allocation */
-  char *zText;     /* The string collected so far */
-  int  nChar;      /* Length of the string so far */
-  int  nAlloc;     /* Amount of space allocated in zText */
-};
-
-/* 
-** This function implements the callback from vxprintf. 
-**
-** This routine add nNewChar characters of text in zNewText to
-** the sgMprintf structure pointed to by "arg".
-*/
-static void mout(void *arg, char *zNewText, int nNewChar){
-  struct sgMprintf *pM = (struct sgMprintf*)arg;
-  if( pM->nChar + nNewChar + 1 > pM->nAlloc ){
-    pM->nAlloc = pM->nChar + nNewChar*2 + 1;
-    if( pM->zText==pM->zBase ){
-      pM->zText = sqliteMalloc(pM->nAlloc);
-      if( pM->zText && pM->nChar ) memcpy(pM->zText,pM->zBase,pM->nChar);
-    }else{
-      char *z = sqliteRealloc(pM->zText, pM->nAlloc);
-      if( z==0 ){
-        sqliteFree(pM->zText);
-        pM->nChar = 0;
-        pM->nAlloc = 0;
-      }
-      pM->zText = z;
-    }
-  }
-  if( pM->zText ){
-    memcpy(&pM->zText[pM->nChar], zNewText, nNewChar);
-    pM->nChar += nNewChar;
-    pM->zText[pM->nChar] = 0;
-  }
-}
-
-/*
-** sqlite_mprintf() works like printf(), but allocations memory to hold the
-** resulting string and returns a pointer to the allocated memory.  Use
-** sqliteFree() to release the memory allocated.
-*/
-char *sqliteMPrintf(const char *zFormat, ...){
-  va_list ap;
-  struct sgMprintf sMprintf;
-  char *zNew;
-  char zBuf[200];
-
-  sMprintf.nChar = 0;
-  sMprintf.nAlloc = sizeof(zBuf);
-  sMprintf.zText = zBuf;
-  sMprintf.zBase = zBuf;
-  va_start(ap,zFormat);
-  vxprintf(mout,&sMprintf,zFormat,ap);
-  va_end(ap);
-  sMprintf.zText[sMprintf.nChar] = 0;
-  return sqliteRealloc(sMprintf.zText, sMprintf.nChar+1);
-}
-
-/*
-** sqlite_mprintf() works like printf(), but allocations memory to hold the
-** resulting string and returns a pointer to the allocated memory.  Use
-** sqliteFree() to release the memory allocated.
-*/
-char *sqlite_mprintf(const char *zFormat, ...){
-  va_list ap;
-  struct sgMprintf sMprintf;
-  char *zNew;
-  char zBuf[200];
-
-  sMprintf.nChar = 0;
-  sMprintf.nAlloc = sizeof(zBuf);
-  sMprintf.zText = zBuf;
-  sMprintf.zBase = zBuf;
-  va_start(ap,zFormat);
-  vxprintf(mout,&sMprintf,zFormat,ap);
-  va_end(ap);
-  sMprintf.zText[sMprintf.nChar] = 0;
-  zNew = malloc( sMprintf.nChar+1 );
-  if( zNew ) strcpy(zNew,sMprintf.zText);
-  if( sMprintf.zText!=sMprintf.zBase ){
-    sqliteFree(sMprintf.zText);
-  }
-  return zNew;
-}
-
-/* This is the varargs version of sqlite_mprintf.  
-*/
-char *sqlite_vmprintf(const char *zFormat, va_list ap){
-  struct sgMprintf sMprintf;
-  char *zNew;
-  char zBuf[200];
-  sMprintf.nChar = 0;
-  sMprintf.zText = zBuf;
-  sMprintf.nAlloc = sizeof(zBuf);
-  sMprintf.zBase = zBuf;
-  vxprintf(mout,&sMprintf,zFormat,ap);
-  sMprintf.zText[sMprintf.nChar] = 0;
-  zNew = malloc( sMprintf.nChar+1 );
-  if( zNew ) strcpy(zNew,sMprintf.zText);
-  if( sMprintf.zText!=sMprintf.zBase ){
-    sqliteFree(sMprintf.zText);
-  }
-  return zNew;
-}
-
-/*
-** The following four routines implement the varargs versions of the
-** sqlite_exec() and sqlite_get_table() interfaces.  See the sqlite.h
-** header files for a more detailed description of how these interfaces
-** work.
-**
-** These routines are all just simple wrappers.
-*/
-int sqlite_exec_printf(
-  sqlite *db,                   /* An open database */
-  const char *sqlFormat,        /* printf-style format string for the SQL */
-  sqlite_callback xCallback,    /* Callback function */
-  void *pArg,                   /* 1st argument to callback function */
-  char **errmsg,                /* Error msg written here */
-  ...                           /* Arguments to the format string. */
-){
-  va_list ap;
-  int rc;
-
-  va_start(ap, errmsg);
-  rc = sqlite_exec_vprintf(db, sqlFormat, xCallback, pArg, errmsg, ap);
-  va_end(ap);
-  return rc;
-}
-int sqlite_exec_vprintf(
-  sqlite *db,                   /* An open database */
-  const char *sqlFormat,        /* printf-style format string for the SQL */
-  sqlite_callback xCallback,    /* Callback function */
-  void *pArg,                   /* 1st argument to callback function */
-  char **errmsg,                /* Error msg written here */
-  va_list ap                    /* Arguments to the format string. */
-){
-  char *zSql;
-  int rc;
-
-  zSql = sqlite_vmprintf(sqlFormat, ap);
-  rc = sqlite_exec(db, zSql, xCallback, pArg, errmsg);
-  free(zSql);
-  return rc;
-}
-int sqlite_get_table_printf(
-  sqlite *db,            /* An open database */
-  const char *sqlFormat, /* printf-style format string for the SQL */
-  char ***resultp,       /* Result written to a char *[]  that this points to */
-  int *nrow,             /* Number of result rows written here */
-  int *ncol,             /* Number of result columns written here */
-  char **errmsg,         /* Error msg written here */
-  ...                    /* Arguments to the format string */
-){
-  va_list ap;
-  int rc;
-
-  va_start(ap, errmsg);
-  rc = sqlite_get_table_vprintf(db, sqlFormat, resultp, nrow, ncol, errmsg, ap);
-  va_end(ap);
-  return rc;
-}
-int sqlite_get_table_vprintf(
-  sqlite *db,            /* An open database */
-  const char *sqlFormat, /* printf-style format string for the SQL */
-  char ***resultp,       /* Result written to a char *[]  that this points to */
-  int *nrow,             /* Number of result rows written here */
-  int *ncolumn,          /* Number of result columns written here */
-  char **errmsg,         /* Error msg written here */
-  va_list ap             /* Arguments to the format string */
-){
-  char *zSql;
-  int rc;
-
-  zSql = sqlite_vmprintf(sqlFormat, ap);
-  rc = sqlite_get_table(db, zSql, resultp, nrow, ncolumn, errmsg);
-  free(zSql);
-  return rc;
-}