Skip to content

Commit 2fe521b

Browse files
matyhtfmatyhtf
committed
separate
1 parent 059693f commit 2fe521b

File tree

3 files changed

+65
-41
lines changed

3 files changed

+65
-41
lines changed

‎include/phpx.h

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,47 +1079,47 @@ static inline Variant _call(zval *object, zval *func)
10791079
return retval;
10801080
}
10811081

1082-
Variant call(Variant &func, Array &args)
1082+
static Variant call(Variant &func, Array &args)
10831083
{
10841084
func.addRef();
10851085
return _call(NULL, func.ptr(), args);
10861086
}
10871087

1088-
Variant call(Variant &func)
1088+
static Variant call(Variant &func)
10891089
{
10901090
func.addRef();
10911091
return _call(nullptr, func.ptr());
10921092
}
10931093

1094-
Variant call(const char *func, Array &args)
1094+
static Variant call(const char *func, Array &args)
10951095
{
10961096
Variant _func(func);
10971097
return _call(NULL, _func.ptr(), args);
10981098
}
10991099

1100-
Variant exec(const char *func)
1100+
static Variant exec(const char *func)
11011101
{
11021102
Variant _func(func);
11031103
Array args;
11041104
return _call(NULL, _func.ptr(), args);
11051105
}
11061106
/*generator*/
1107-
Variant exec(const char *func, Variant v1)
1107+
static Variant exec(const char *func, Variant v1)
11081108
{
11091109
Variant _func(func);
11101110
Array args;
11111111
args.append(v1.ptr());
11121112
return _call(NULL, _func.ptr(), args);
11131113
}
1114-
Variant exec(const char *func, Variant v1, Variant v2)
1114+
static Variant exec(const char *func, Variant v1, Variant v2)
11151115
{
11161116
Variant _func(func);
11171117
Array args;
11181118
args.append(v1.ptr());
11191119
args.append(v2.ptr());
11201120
return _call(NULL, _func.ptr(), args);
11211121
}
1122-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3)
1122+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3)
11231123
{
11241124
Variant _func(func);
11251125
Array args;
@@ -1128,7 +1128,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3)
11281128
args.append(v3.ptr());
11291129
return _call(NULL, _func.ptr(), args);
11301130
}
1131-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4)
1131+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4)
11321132
{
11331133
Variant _func(func);
11341134
Array args;
@@ -1138,7 +1138,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4)
11381138
args.append(v4.ptr());
11391139
return _call(NULL, _func.ptr(), args);
11401140
}
1141-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5)
1141+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5)
11421142
{
11431143
Variant _func(func);
11441144
Array args;
@@ -1149,7 +1149,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, V
11491149
args.append(v5.ptr());
11501150
return _call(NULL, _func.ptr(), args);
11511151
}
1152-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6)
1152+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6)
11531153
{
11541154
Variant _func(func);
11551155
Array args;
@@ -1161,7 +1161,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, V
11611161
args.append(v6.ptr());
11621162
return _call(NULL, _func.ptr(), args);
11631163
}
1164-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7)
1164+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7)
11651165
{
11661166
Variant _func(func);
11671167
Array args;
@@ -1174,7 +1174,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, V
11741174
args.append(v7.ptr());
11751175
return _call(NULL, _func.ptr(), args);
11761176
}
1177-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8)
1177+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8)
11781178
{
11791179
Variant _func(func);
11801180
Array args;
@@ -1188,7 +1188,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, V
11881188
args.append(v8.ptr());
11891189
return _call(NULL, _func.ptr(), args);
11901190
}
1191-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9)
1191+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9)
11921192
{
11931193
Variant _func(func);
11941194
Array args;
@@ -1203,7 +1203,7 @@ Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, V
12031203
args.append(v9.ptr());
12041204
return _call(NULL, _func.ptr(), args);
12051205
}
1206-
Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9, Variant v10)
1206+
static Variant exec(const char *func, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9, Variant v10)
12071207
{
12081208
Variant _func(func);
12091209
Array args;
@@ -1226,7 +1226,7 @@ static inline zend_class_entry *getClassEntry(const char *name)
12261226
return zend_lookup_class(class_name.ptr());
12271227
}
12281228

1229-
void throwException(const char *name, const char *message, int code = 0)
1229+
static void throwException(const char *name, const char *message, int code = 0)
12301230
{
12311231
zend_class_entry *ce = getClassEntry(name);
12321232
if (ce == NULL)
@@ -1237,7 +1237,7 @@ void throwException(const char *name, const char *message, int code = 0)
12371237
zend_throw_exception(ce, message, code TSRMLS_CC);
12381238
}
12391239

1240-
Variant global(const char *name)
1240+
static Variant global(const char *name)
12411241
{
12421242
zend_string *key = zend_string_init(name, strlen(name), 0);
12431243
zval *var = zend_hash_find_ind(&EG(symbol_table), key);
@@ -1494,7 +1494,7 @@ class Object: public Variant
14941494
}
14951495
};
14961496

1497-
Object create(const char *name, Array &args)
1497+
static Object create(const char *name, Array &args)
14981498
{
14991499
zend_class_entry *ce = getClassEntry(name);
15001500
Object object;
@@ -1513,7 +1513,7 @@ Object create(const char *name, Array &args)
15131513
return object;
15141514
}
15151515

1516-
Object create(const char *name)
1516+
static Object create(const char *name)
15171517
{
15181518
Object object;
15191519
zend_class_entry *ce = getClassEntry(name);
@@ -1555,7 +1555,7 @@ extern map<const char *, function_t, strCmp> function_map;
15551555
extern void _exec_function(zend_execute_data *data, zval *return_value);
15561556
extern void _exec_method(zend_execute_data *data, zval *return_value);
15571557

1558-
Variant constant(const char *name)
1558+
static Variant constant(const char *name)
15591559
{
15601560
zend_string *_name = zend_string_init(name, strlen(name), 0);
15611561
zval *val = zend_get_constant_ex(_name, NULL, ZEND_FETCH_CLASS_SILENT);
@@ -2044,16 +2044,7 @@ class Extension
20442044
extern unordered_map<string, Extension*> _name_to_extension;
20452045
extern unordered_map<int, Extension*> _module_number_to_extension;
20462046

2047-
Extension::Extension(const char *name, const char *version)
2048-
{
2049-
module.name = name;
2050-
module.version = version;
2051-
this->name = name;
2052-
this->version = version;
2053-
_name_to_extension[name] = this;
2054-
}
2055-
2056-
Object newObject(const char *name)
2047+
static Object newObject(const char *name)
20572048
{
20582049
Object object;
20592050
zend_class_entry *ce = getClassEntry(name);
@@ -2075,7 +2066,7 @@ Object newObject(const char *name)
20752066
}
20762067

20772068
/*generator*/
2078-
Object newObject(const char *name, Variant v1)
2069+
static Object newObject(const char *name, Variant v1)
20792070
{
20802071
Object object;
20812072
zend_class_entry *ce = getClassEntry(name);
@@ -2097,7 +2088,7 @@ Object newObject(const char *name, Variant v1)
20972088
object.call("__construct", args);
20982089
return object;
20992090
}
2100-
Object newObject(const char *name, Variant v1, Variant v2)
2091+
static Object newObject(const char *name, Variant v1, Variant v2)
21012092
{
21022093
Object object;
21032094
zend_class_entry *ce = getClassEntry(name);
@@ -2121,7 +2112,7 @@ Object newObject(const char *name, Variant v1, Variant v2)
21212112
object.call("__construct", args);
21222113
return object;
21232114
}
2124-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3)
2115+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3)
21252116
{
21262117
Object object;
21272118
zend_class_entry *ce = getClassEntry(name);
@@ -2147,7 +2138,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3)
21472138
object.call("__construct", args);
21482139
return object;
21492140
}
2150-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4)
2141+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4)
21512142
{
21522143
Object object;
21532144
zend_class_entry *ce = getClassEntry(name);
@@ -2175,7 +2166,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v
21752166
object.call("__construct", args);
21762167
return object;
21772168
}
2178-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5)
2169+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5)
21792170
{
21802171
Object object;
21812172
zend_class_entry *ce = getClassEntry(name);
@@ -2205,7 +2196,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v
22052196
object.call("__construct", args);
22062197
return object;
22072198
}
2208-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6)
2199+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6)
22092200
{
22102201
Object object;
22112202
zend_class_entry *ce = getClassEntry(name);
@@ -2237,7 +2228,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v
22372228
object.call("__construct", args);
22382229
return object;
22392230
}
2240-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7)
2231+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7)
22412232
{
22422233
Object object;
22432234
zend_class_entry *ce = getClassEntry(name);
@@ -2271,7 +2262,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v
22712262
object.call("__construct", args);
22722263
return object;
22732264
}
2274-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8)
2265+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8)
22752266
{
22762267
Object object;
22772268
zend_class_entry *ce = getClassEntry(name);
@@ -2307,7 +2298,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v
23072298
object.call("__construct", args);
23082299
return object;
23092300
}
2310-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9)
2301+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9)
23112302
{
23122303
Object object;
23132304
zend_class_entry *ce = getClassEntry(name);
@@ -2345,7 +2336,7 @@ Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v
23452336
object.call("__construct", args);
23462337
return object;
23472338
}
2348-
Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9, Variant v10)
2339+
static Object newObject(const char *name, Variant v1, Variant v2, Variant v3, Variant v4, Variant v5, Variant v6, Variant v7, Variant v8, Variant v9, Variant v10)
23492340
{
23502341
Object object;
23512342
zend_class_entry *ce = getClassEntry(name);

‎script/gen.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
$out = '';
1818
for ($i = 1; $i <= $maxArgc; $i++)
1919
{
20-
$out .= "\n".'Variant exec(const char *func, ';
20+
$out .= "\n".'static Variant exec(const char *func, ';
2121
$list = [];
2222
for ($j = 1; $j <= $i; $j++)
2323
{
@@ -59,7 +59,7 @@
5959
$out = '';
6060
for ($i = 1; $i <= $maxArgc; $i++)
6161
{
62-
$out .= "\nObject newObject(const char *name, ";
62+
$out .= "\nstatic Object newObject(const char *name, ";
6363
$list = [];
6464
for ($j = 1; $j <= $i; $j++)
6565
{

‎src/extension.cc

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| Swoole |
4+
+----------------------------------------------------------------------+
5+
| This source file is subject to version 2.0 of the Apache license, |
6+
| that is bundled with this package in the file LICENSE, and is |
7+
| available through the world-wide-web at the following url: |
8+
| http://www.apache.org/licenses/LICENSE-2.0.html |
9+
| If you did not receive a copy of the Apache2.0 license and are unable|
10+
| to obtain it through the world-wide-web, please send a note to |
11+
| [email protected] so we can mail you a copy immediately. |
12+
+----------------------------------------------------------------------+
13+
| Author: Tianfeng Han <[email protected]> |
14+
+----------------------------------------------------------------------+
15+
*/
16+
17+
#include "phpx.h"
18+
19+
using namespace std;
20+
21+
namespace php
22+
{
23+
24+
Extension::Extension(const char *name, const char *version)
25+
{
26+
module.name = name;
27+
module.version = version;
28+
this->name = name;
29+
this->version = version;
30+
_name_to_extension[name] = this;
31+
}
32+
33+
}

0 commit comments

Comments
 (0)