fix compile warning. fix macro compat.

Author: drswinghead

Makefile

@@ -28,6 +28,6 @@ all:
 	# $(PHPEXE) -d extension=./hello.so examples/hello.php
 
 clean:
-	rm -f ../../pkg/linux_amd64/zend.a
-	rm -f ../../pkg/linux_amd64/phpgo.a
+	rm -f $(GOPATH)/pkg/linux_amd64/zend.a
+	rm -f $(GOPATH)/pkg/linux_amd64/phpgo.a
 	rm -f hello.so

phpgo/extension.c

@@ -199,8 +199,16 @@ static void* phpgo_function_conv_arg(int cbid, int idx, char ch, int zty, zval *
         goapi_new_value(GT_Int64, (uint64_t)arg, &rv);
     } else if (ch == 'b') {
         convert_to_boolean_ex(conv_zarg);
+#ifdef ZEND_ENGINE_3
+        if (Z_TYPE_P(conv_zarg) == IS_TRUE) {
+            goapi_new_value(GT_Bool, (uint64_t)1, &rv);
+        } else {
+            goapi_new_value(GT_Bool, (uint64_t)0, &rv);
+        }
+#else
         zend_bool arg = (zend_bool)Z_BVAL_P(macro_zarg);
         goapi_new_value(GT_Bool, (uint64_t)arg, &rv);
+#endif
     } else if (ch == 'd') {
         convert_to_double_ex(conv_zarg);
         double arg = (double)Z_DVAL_P(macro_zarg);
@@ -215,12 +223,15 @@ static void* phpgo_function_conv_arg(int cbid, int idx, char ch, int zty, zval *
             char *arg = Z_STRVAL_P(macro_zarg);
             goapi_new_value(GT_String, (uint64_t)arg, &rv);
 #ifdef ZEND_ENGINE_3
-        } else if (Z_TYPE_P(macro_zarg) == _IS_BOOL) {
+        } else if (Z_TYPE_P(macro_zarg) == IS_TRUE) {
+            goapi_new_value(GT_Bool, (uint64_t)1, &rv);
+        } else if (Z_TYPE_P(macro_zarg) == IS_FALSE) {
+            goapi_new_value(GT_Bool, (uint64_t)0, &rv);
 #else
         } else if (Z_TYPE_P(macro_zarg) == IS_BOOL) {
-#endif
             zend_bool arg = (zend_bool)Z_BVAL_P(macro_zarg);
             goapi_new_value(GT_Bool, (uint64_t)arg, &rv);
+#endif
         } else if (Z_TYPE_P(macro_zarg) == IS_DOUBLE) {
             double* parg = calloc(1, sizeof(double));
             *parg = (double)Z_DVAL_P(macro_zarg);
@@ -409,7 +420,7 @@ static void phpgo_method_conv_args(int cbid, phpgo_callback_info* cbi, int suppl
 static void phpgo_function_reutrn_php_array(void *p0, zval *return_value) {
     array_init(return_value);
 
-    goapi_set_php_array(p0, &return_value);
+    goapi_set_php_array(p0, (void**)&return_value);
 }
 
 // go类型的返回值转换为PHP类型的变量值
@@ -436,6 +447,12 @@ static int phpgo_function_conv_ret(int cbid, phpgo_callback_info* cbi, void *p0,
         free((double*)rv);
         break;
 #ifdef ZEND_ENGINE_3
+    case IS_TRUE:
+        RETVAL_TRUE;
+        break;
+    case IS_FALSE:
+        RETVAL_FALSE;
+        break;
     case _IS_BOOL:
 #else
     case IS_BOOL:

readme.md

@@ -73,7 +73,7 @@ manual:
 - [ ] namespace support
 - [ ] multiple extension support
 - [ ] class member access support
-- [ ] unlimited function/method/class count support
+- [x] unlimited function/method/class count support
 
 
 Contributing

zend/clog.c

@@ -18,7 +18,7 @@ void dlog_set_level(int id, enum clog_level level)
     }
     #warning "defined log level"
 #else
-#warning "not defined log level"
+// #warning "not defined log level"
     clog_set_level(id, CLOG_DEBUG);
 #endif
 }

zend/compat.c

@@ -17,11 +17,19 @@ ZEND_API void zend_register_double_constant_compat(const char *name, size_t name
 
 ZEND_API void zend_register_bool_constant_compat(const char *name, size_t name_len, zend_bool bval, int flags, int module_number)
 {
+#ifdef ZEND_ENGINE_3
     zend_register_bool_constant(name, name_len, bval, flags, module_number);
+#else
+    zend_register_long_constant(name, name_len, bval, flags, module_number);
+#endif
 }
 
 ZEND_API void zend_register_null_constant_compat(const char *name, size_t name_len, int flags, int module_number)
 {
+#ifdef ZEND_ENGINE_3
     zend_register_null_constant(name, name_len, flags, module_number);
+#else
+    zend_register_stringl_constant(name, name_len, NULL, 0, flags, module_number);
+#endif
 }
 

zend/compat.h

@@ -6,6 +6,7 @@
 #include <zend_modules.h>
 
 #ifdef ZEND_ENGINE_3
+// #define Z_BVAL_P(zv) Z_LVAL_P(zv)
 /*
 #define Z_BVAL_PP(zv) Z_LVAL_P(*(zv))
 #define Z_LVAL_PP(zv) Z_LVAL_P(*(zv))

zend/goapi.h

@@ -70,5 +70,54 @@ typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
 
 /* End of boilerplate cgo prologue.  */
 
+///////////
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//// put goapi.go's export function here
+
+extern void goapi_array_new(GoInt p0, void** p1);
+
+extern void goapi_array_push(void* p0, void* p1, void** p2);
+
+extern void goapi_map_new(void** p0);
+
+extern void goapi_map_add(void* p0, void* p1, void* p2);
+
+extern void goapi_map_get(void* p0, void* p1, void** p2);
+
+extern void goapi_map_del(void* p0, void* p1);
+
+extern GoUint8 goapi_map_has(void* p0, void* p1);
+
+extern void goapi_chan_new(GoInt p0, GoInt p1, void** p2);
+
+extern void goapi_chan_read(void* p0, void** p1);
+
+extern void goapi_chan_write(void* p0, void* p1);
+
+extern void goapi_chan_close(void* p0);
+
+extern void goapi_type(GoInt p0, void** p1);
+
+extern void goapi_typeof(void* p0, void** p1);
+
+extern GoInt goapi_typeid(void* p0);
+
+extern void goapi_new(GoInt p0, void** p1);
+
+extern void goapi_new_value(GoInt p0, GoUintptr p1, void** p2);
+
+extern void goapi_set_value(void* p0, GoUintptr p1, void** p2);
+
+extern void goapi_set_php_array(void* p0, void** p1);
+
+extern GoUintptr goapi_get_value(void* p0);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif