Merge branch 'master' into gsoc2017-php7-classes-via-c-api

This commit is contained in:
Olly Betts 2021-03-31 04:53:40 +13:00
commit 904f5a65d8
10 changed files with 100 additions and 47 deletions

View file

@ -30,7 +30,6 @@ PHP Options (available with -php7)\n\
*/
#define SWIG_PTR "_cPtr"
static int constructors = 0;
static String *NOTCLASS = NewString("Not a class");
static Node *classnode = 0;
static String *module = 0;
@ -46,7 +45,6 @@ static File *f_h = 0;
static File *f_phpcode = 0;
static File *f_directors = 0;
static File *f_directors_h = 0;
static String *phpfilename = 0;
static String *s_header;
static String *s_wrappers;
@ -360,7 +358,6 @@ public:
/* PHP module file */
filen = NewStringEmpty();
Printv(filen, SWIG_output_directory(), module, ".php", NIL);
phpfilename = NewString(filen);
f_phpcode = NewFile(filen, "w", SWIG_output_files());
if (!f_phpcode) {
@ -2357,7 +2354,6 @@ public:
* ------------------------------------------------------------ */
virtual int classHandler(Node *n) {
constructors = 0;
current_class = n;
String *symname = Getattr(n, "sym:name");
String *baseClassExtend = NULL;
@ -2535,7 +2531,6 @@ public:
* ------------------------------------------------------------ */
virtual int constructorHandler(Node *n) {
constructors++;
if (Swig_directorclass(n)) {
String *name = GetChar(Swig_methodclass(n), "name");
String *ctype = GetChar(Swig_methodclass(n), "classtype");