Skip to content

Commit 1978caa

Browse files
jmikolajmikola
committed
Revise object macros for use within expressions
1 parent aa931f3 commit 1978caa

File tree

1 file changed

+98
-98
lines changed

1 file changed

+98
-98
lines changed

‎php_phongo_classes.h

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -22,109 +22,109 @@
2222
#if PHP_VERSION_ID >= 70000
2323
# include "php_phongo_structs-7.h"
2424

25-
# define Z_COMMAND_OBJ_P(zv) php_command_fetch_object(Z_OBJ_P(zv));
26-
# define Z_CURSOR_OBJ_P(zv) php_cursor_fetch_object(Z_OBJ_P(zv));
27-
# define Z_CURSORID_OBJ_P(zv) php_cursorid_fetch_object(Z_OBJ_P(zv));
28-
# define Z_MANAGER_OBJ_P(zv) php_manager_fetch_object(Z_OBJ_P(zv));
29-
# define Z_QUERY_OBJ_P(zv) php_query_fetch_object(Z_OBJ_P(zv));
30-
# define Z_READCONCERN_OBJ_P(zv) php_readconcern_fetch_object(Z_OBJ_P(zv));
31-
# define Z_READPREFERENCE_OBJ_P(zv) php_readpreference_fetch_object(Z_OBJ_P(zv));
32-
# define Z_SERVER_OBJ_P(zv) php_server_fetch_object(Z_OBJ_P(zv));
33-
# define Z_BULKWRITE_OBJ_P(zv) php_bulkwrite_fetch_object(Z_OBJ_P(zv));
34-
# define Z_WRITECONCERN_OBJ_P(zv) php_writeconcern_fetch_object(Z_OBJ_P(zv));
35-
# define Z_WRITECONCERNERROR_OBJ_P(zv) php_writeconcernerror_fetch_object(Z_OBJ_P(zv));
36-
# define Z_WRITEERROR_OBJ_P(zv) php_writeerror_fetch_object(Z_OBJ_P(zv));
37-
# define Z_WRITERESULT_OBJ_P(zv) php_writeresult_fetch_object(Z_OBJ_P(zv));
38-
# define Z_BINARY_OBJ_P(zv) php_binary_fetch_object(Z_OBJ_P(zv));
39-
# define Z_INT32_OBJ_P(zv) php_int32_fetch_object(Z_OBJ_P(zv));
40-
# define Z_INT64_OBJ_P(zv) php_int64_fetch_object(Z_OBJ_P(zv));
41-
# define Z_JAVASCRIPT_OBJ_P(zv) php_javascript_fetch_object(Z_OBJ_P(zv));
42-
# define Z_LOG_OBJ_P(zv) php_log_fetch_object(Z_OBJ_P(zv));
43-
# define Z_MAXKEY_OBJ_P(zv) php_maxkey_fetch_object(Z_OBJ_P(zv));
44-
# define Z_MINKEY_OBJ_P(zv) php_minkey_fetch_object(Z_OBJ_P(zv));
45-
# define Z_OBJECTID_OBJ_P(zv) php_objectid_fetch_object(Z_OBJ_P(zv));
46-
# define Z_REGEX_OBJ_P(zv) php_regex_fetch_object(Z_OBJ_P(zv));
47-
# define Z_TIMESTAMP_OBJ_P(zv) php_timestamp_fetch_object(Z_OBJ_P(zv));
48-
# define Z_UTCDATETIME_OBJ_P(zv) php_utcdatetime_fetch_object(Z_OBJ_P(zv));
49-
50-
# define Z_OBJ_COMMAND(zo) php_command_fetch_object(zo);
51-
# define Z_OBJ_CURSOR(zo) php_cursor_fetch_object(zo);
52-
# define Z_OBJ_CURSORID(zo) php_cursorid_fetch_object(zo);
53-
# define Z_OBJ_MANAGER(zo) php_manager_fetch_object(zo);
54-
# define Z_OBJ_QUERY(zo) php_query_fetch_object(zo);
55-
# define Z_OBJ_READCONCERN(zo) php_readconcern_fetch_object(zo);
56-
# define Z_OBJ_READPREFERENCE(zo) php_readpreference_fetch_object(zo);
57-
# define Z_OBJ_SERVER(zo) php_server_fetch_object(zo);
58-
# define Z_OBJ_BULKWRITE(zo) php_bulkwrite_fetch_object(zo);
59-
# define Z_OBJ_WRITECONCERN(zo) php_writeconcern_fetch_object(zo);
60-
# define Z_OBJ_WRITECONCERNERROR(zo) php_writeconcernerror_fetch_object(zo);
61-
# define Z_OBJ_WRITEERROR(zo) php_writeerror_fetch_object(zo);
62-
# define Z_OBJ_WRITERESULT(zo) php_writeresult_fetch_object(zo);
63-
# define Z_OBJ_BINARY(zo) php_binary_fetch_object(zo);
64-
# define Z_OBJ_INT32(zo) php_int32_fetch_object(zo);
65-
# define Z_OBJ_INT64(zo) php_int64_fetch_object(zo);
66-
# define Z_OBJ_JAVASCRIPT(zo) php_javascript_fetch_object(zo);
67-
# define Z_OBJ_LOG(zo) php_log_fetch_object(zo);
68-
# define Z_OBJ_MAXKEY(zo) php_maxkey_fetch_object(zo);
69-
# define Z_OBJ_MINKEY(zo) php_minkey_fetch_object(zo);
70-
# define Z_OBJ_OBJECTID(zo) php_objectid_fetch_object(zo);
71-
# define Z_OBJ_REGEX(zo) php_regex_fetch_object(zo);
72-
# define Z_OBJ_TIMESTAMP(zo) php_timestamp_fetch_object(zo);
73-
# define Z_OBJ_UTCDATETIME(zo) php_utcdatetime_fetch_object(zo);
25+
# define Z_COMMAND_OBJ_P(zv) (php_command_fetch_object(Z_OBJ_P(zv)))
26+
# define Z_CURSOR_OBJ_P(zv) (php_cursor_fetch_object(Z_OBJ_P(zv)))
27+
# define Z_CURSORID_OBJ_P(zv) (php_cursorid_fetch_object(Z_OBJ_P(zv)))
28+
# define Z_MANAGER_OBJ_P(zv) (php_manager_fetch_object(Z_OBJ_P(zv)))
29+
# define Z_QUERY_OBJ_P(zv) (php_query_fetch_object(Z_OBJ_P(zv)))
30+
# define Z_READCONCERN_OBJ_P(zv) (php_readconcern_fetch_object(Z_OBJ_P(zv)))
31+
# define Z_READPREFERENCE_OBJ_P(zv) (php_readpreference_fetch_object(Z_OBJ_P(zv)))
32+
# define Z_SERVER_OBJ_P(zv) (php_server_fetch_object(Z_OBJ_P(zv)))
33+
# define Z_BULKWRITE_OBJ_P(zv) (php_bulkwrite_fetch_object(Z_OBJ_P(zv)))
34+
# define Z_WRITECONCERN_OBJ_P(zv) (php_writeconcern_fetch_object(Z_OBJ_P(zv)))
35+
# define Z_WRITECONCERNERROR_OBJ_P(zv) (php_writeconcernerror_fetch_object(Z_OBJ_P(zv)))
36+
# define Z_WRITEERROR_OBJ_P(zv) (php_writeerror_fetch_object(Z_OBJ_P(zv)))
37+
# define Z_WRITERESULT_OBJ_P(zv) (php_writeresult_fetch_object(Z_OBJ_P(zv)))
38+
# define Z_BINARY_OBJ_P(zv) (php_binary_fetch_object(Z_OBJ_P(zv)))
39+
# define Z_INT32_OBJ_P(zv) (php_int32_fetch_object(Z_OBJ_P(zv)))
40+
# define Z_INT64_OBJ_P(zv) (php_int64_fetch_object(Z_OBJ_P(zv)))
41+
# define Z_JAVASCRIPT_OBJ_P(zv) (php_javascript_fetch_object(Z_OBJ_P(zv)))
42+
# define Z_LOG_OBJ_P(zv) (php_log_fetch_object(Z_OBJ_P(zv)))
43+
# define Z_MAXKEY_OBJ_P(zv) (php_maxkey_fetch_object(Z_OBJ_P(zv)))
44+
# define Z_MINKEY_OBJ_P(zv) (php_minkey_fetch_object(Z_OBJ_P(zv)))
45+
# define Z_OBJECTID_OBJ_P(zv) (php_objectid_fetch_object(Z_OBJ_P(zv)))
46+
# define Z_REGEX_OBJ_P(zv) (php_regex_fetch_object(Z_OBJ_P(zv)))
47+
# define Z_TIMESTAMP_OBJ_P(zv) (php_timestamp_fetch_object(Z_OBJ_P(zv)))
48+
# define Z_UTCDATETIME_OBJ_P(zv) (php_utcdatetime_fetch_object(Z_OBJ_P(zv)))
49+
50+
# define Z_OBJ_COMMAND(zo) (php_command_fetch_object(zo))
51+
# define Z_OBJ_CURSOR(zo) (php_cursor_fetch_object(zo))
52+
# define Z_OBJ_CURSORID(zo) (php_cursorid_fetch_object(zo))
53+
# define Z_OBJ_MANAGER(zo) (php_manager_fetch_object(zo))
54+
# define Z_OBJ_QUERY(zo) (php_query_fetch_object(zo))
55+
# define Z_OBJ_READCONCERN(zo) (php_readconcern_fetch_object(zo))
56+
# define Z_OBJ_READPREFERENCE(zo) (php_readpreference_fetch_object(zo))
57+
# define Z_OBJ_SERVER(zo) (php_server_fetch_object(zo))
58+
# define Z_OBJ_BULKWRITE(zo) (php_bulkwrite_fetch_object(zo))
59+
# define Z_OBJ_WRITECONCERN(zo) (php_writeconcern_fetch_object(zo))
60+
# define Z_OBJ_WRITECONCERNERROR(zo) (php_writeconcernerror_fetch_object(zo))
61+
# define Z_OBJ_WRITEERROR(zo) (php_writeerror_fetch_object(zo))
62+
# define Z_OBJ_WRITERESULT(zo) (php_writeresult_fetch_object(zo))
63+
# define Z_OBJ_BINARY(zo) (php_binary_fetch_object(zo))
64+
# define Z_OBJ_INT32(zo) (php_int32_fetch_object(zo))
65+
# define Z_OBJ_INT64(zo) (php_int64_fetch_object(zo))
66+
# define Z_OBJ_JAVASCRIPT(zo) (php_javascript_fetch_object(zo))
67+
# define Z_OBJ_LOG(zo) (php_log_fetch_object(zo))
68+
# define Z_OBJ_MAXKEY(zo) (php_maxkey_fetch_object(zo))
69+
# define Z_OBJ_MINKEY(zo) (php_minkey_fetch_object(zo))
70+
# define Z_OBJ_OBJECTID(zo) (php_objectid_fetch_object(zo))
71+
# define Z_OBJ_REGEX(zo) (php_regex_fetch_object(zo))
72+
# define Z_OBJ_TIMESTAMP(zo) (php_timestamp_fetch_object(zo))
73+
# define Z_OBJ_UTCDATETIME(zo) (php_utcdatetime_fetch_object(zo))
7474

7575
#else
7676

7777
# include "php_phongo_structs-5.h"
7878

79-
# define Z_COMMAND_OBJ_P(zv) (php_phongo_command_t *)zend_object_store_get_object(zv TSRMLS_CC);
80-
# define Z_CURSOR_OBJ_P(zv) (php_phongo_cursor_t *)zend_object_store_get_object(zv TSRMLS_CC);
81-
# define Z_CURSORID_OBJ_P(zv) (php_phongo_cursorid_t *)zend_object_store_get_object(zv TSRMLS_CC);
82-
# define Z_MANAGER_OBJ_P(zv) (php_phongo_manager_t *)zend_object_store_get_object(zv TSRMLS_CC);
83-
# define Z_QUERY_OBJ_P(zv) (php_phongo_query_t *)zend_object_store_get_object(zv TSRMLS_CC);
84-
# define Z_READCONCERN_OBJ_P(zv) (php_phongo_readconcern_t *)zend_object_store_get_object(zv TSRMLS_CC);
85-
# define Z_READPREFERENCE_OBJ_P(zv) (php_phongo_readpreference_t *)zend_object_store_get_object(zv TSRMLS_CC);
86-
# define Z_SERVER_OBJ_P(zv) (php_phongo_server_t *)zend_object_store_get_object(zv TSRMLS_CC);
87-
# define Z_BULKWRITE_OBJ_P(zv) (php_phongo_bulkwrite_t *)zend_object_store_get_object(zv TSRMLS_CC);
88-
# define Z_WRITECONCERN_OBJ_P(zv) (php_phongo_writeconcern_t *)zend_object_store_get_object(zv TSRMLS_CC);
89-
# define Z_WRITECONCERNERROR_OBJ_P(zv) (php_phongo_writeconcernerror_t *)zend_object_store_get_object(zv TSRMLS_CC);
90-
# define Z_WRITEERROR_OBJ_P(zv) (php_phongo_writeerror_t *)zend_object_store_get_object(zv TSRMLS_CC);
91-
# define Z_WRITERESULT_OBJ_P(zv) (php_phongo_writeresult_t *)zend_object_store_get_object(zv TSRMLS_CC);
92-
# define Z_BINARY_OBJ_P(zv) (php_phongo_binary_t *)zend_object_store_get_object(zv TSRMLS_CC);
93-
# define Z_INT32_OBJ_P(zv) (php_phongo_int32_t *)zend_object_store_get_object(zv TSRMLS_CC);
94-
# define Z_INT64_OBJ_P(zv) (php_phongo_int64_t *)zend_object_store_get_object(zv TSRMLS_CC);
95-
# define Z_JAVASCRIPT_OBJ_P(zv) (php_phongo_javascript_t *)zend_object_store_get_object(zv TSRMLS_CC);
96-
# define Z_LOG_OBJ_P(zv) (php_phongo_log_t *)zend_object_store_get_object(zv TSRMLS_CC);
97-
# define Z_MAXKEY_OBJ_P(zv) (php_phongo_maxkey_t *)zend_object_store_get_object(zv TSRMLS_CC);
98-
# define Z_MINKEY_OBJ_P(zv) (php_phongo_minkey_t *)zend_object_store_get_object(zv TSRMLS_CC);
99-
# define Z_OBJECTID_OBJ_P(zv) (php_phongo_objectid_t *)zend_object_store_get_object(zv TSRMLS_CC);
100-
# define Z_REGEX_OBJ_P(zv) (php_phongo_regex_t *)zend_object_store_get_object(zv TSRMLS_CC);
101-
# define Z_TIMESTAMP_OBJ_P(zv) (php_phongo_timestamp_t *)zend_object_store_get_object(zv TSRMLS_CC);
102-
# define Z_UTCDATETIME_OBJ_P(zv) (php_phongo_utcdatetime_t *)zend_object_store_get_object(zv TSRMLS_CC);
103-
104-
# define Z_OBJ_COMMAND(zo) (php_phongo_command_t *)zo;
105-
# define Z_OBJ_CURSOR(zo) (php_phongo_cursor_t *)zo;
106-
# define Z_OBJ_CURSORID(zo) (php_phongo_cursorid_t *)zo;
107-
# define Z_OBJ_MANAGER(zo) (php_phongo_manager_t *)zo;
108-
# define Z_OBJ_QUERY(zo) (php_phongo_query_t *)zo;
109-
# define Z_OBJ_READCONCERN(zo) (php_phongo_readconcern_t *)zo;
110-
# define Z_OBJ_READPREFERENCE(zo) (php_phongo_readpreference_t *)zo;
111-
# define Z_OBJ_SERVER(zo) (php_phongo_server_t *)zo;
112-
# define Z_OBJ_BULKWRITE(zo) (php_phongo_bulkwrite_t *)zo;
113-
# define Z_OBJ_WRITECONCERN(zo) (php_phongo_writeconcern_t *)zo;
114-
# define Z_OBJ_WRITECONCERNERROR(zo) (php_phongo_writeconcernerror_t *)zo;
115-
# define Z_OBJ_WRITEERROR(zo) (php_phongo_writeerror_t *)zo;
116-
# define Z_OBJ_WRITERESULT(zo) (php_phongo_writeresult_t *)zo;
117-
# define Z_OBJ_BINARY(zo) (php_phongo_binary_t *)zo;
118-
# define Z_OBJ_INT32(zo) (php_phongo_int32_t *)zo;
119-
# define Z_OBJ_INT64(zo) (php_phongo_int64_t *)zo;
120-
# define Z_OBJ_JAVASCRIPT(zo) (php_phongo_javascript_t *)zo;
121-
# define Z_OBJ_LOG(zo) (php_phongo_log_t *)zo;
122-
# define Z_OBJ_MAXKEY(zo) (php_phongo_maxkey_t *)zo;
123-
# define Z_OBJ_MINKEY(zo) (php_phongo_minkey_t *)zo;
124-
# define Z_OBJ_OBJECTID(zo) (php_phongo_objectid_t *)zo;
125-
# define Z_OBJ_REGEX(zo) (php_phongo_regex_t *)zo;
126-
# define Z_OBJ_TIMESTAMP(zo) (php_phongo_timestamp_t *)zo;
127-
# define Z_OBJ_UTCDATETIME(zo) (php_phongo_utcdatetime_t *)zo;
79+
# define Z_COMMAND_OBJ_P(zv) ((php_phongo_command_t *)zend_object_store_get_object(zv TSRMLS_CC))
80+
# define Z_CURSOR_OBJ_P(zv) ((php_phongo_cursor_t *)zend_object_store_get_object(zv TSRMLS_CC))
81+
# define Z_CURSORID_OBJ_P(zv) ((php_phongo_cursorid_t *)zend_object_store_get_object(zv TSRMLS_CC))
82+
# define Z_MANAGER_OBJ_P(zv) ((php_phongo_manager_t *)zend_object_store_get_object(zv TSRMLS_CC))
83+
# define Z_QUERY_OBJ_P(zv) ((php_phongo_query_t *)zend_object_store_get_object(zv TSRMLS_CC))
84+
# define Z_READCONCERN_OBJ_P(zv) ((php_phongo_readconcern_t *)zend_object_store_get_object(zv TSRMLS_CC))
85+
# define Z_READPREFERENCE_OBJ_P(zv) ((php_phongo_readpreference_t *)zend_object_store_get_object(zv TSRMLS_CC))
86+
# define Z_SERVER_OBJ_P(zv) ((php_phongo_server_t *)zend_object_store_get_object(zv TSRMLS_CC))
87+
# define Z_BULKWRITE_OBJ_P(zv) ((php_phongo_bulkwrite_t *)zend_object_store_get_object(zv TSRMLS_CC))
88+
# define Z_WRITECONCERN_OBJ_P(zv) ((php_phongo_writeconcern_t *)zend_object_store_get_object(zv TSRMLS_CC))
89+
# define Z_WRITECONCERNERROR_OBJ_P(zv) ((php_phongo_writeconcernerror_t *)zend_object_store_get_object(zv TSRMLS_CC))
90+
# define Z_WRITEERROR_OBJ_P(zv) ((php_phongo_writeerror_t *)zend_object_store_get_object(zv TSRMLS_CC))
91+
# define Z_WRITERESULT_OBJ_P(zv) ((php_phongo_writeresult_t *)zend_object_store_get_object(zv TSRMLS_CC))
92+
# define Z_BINARY_OBJ_P(zv) ((php_phongo_binary_t *)zend_object_store_get_object(zv TSRMLS_CC))
93+
# define Z_INT32_OBJ_P(zv) ((php_phongo_int32_t *)zend_object_store_get_object(zv TSRMLS_CC))
94+
# define Z_INT64_OBJ_P(zv) ((php_phongo_int64_t *)zend_object_store_get_object(zv TSRMLS_CC))
95+
# define Z_JAVASCRIPT_OBJ_P(zv) ((php_phongo_javascript_t *)zend_object_store_get_object(zv TSRMLS_CC))
96+
# define Z_LOG_OBJ_P(zv) ((php_phongo_log_t *)zend_object_store_get_object(zv TSRMLS_CC))
97+
# define Z_MAXKEY_OBJ_P(zv) ((php_phongo_maxkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
98+
# define Z_MINKEY_OBJ_P(zv) ((php_phongo_minkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
99+
# define Z_OBJECTID_OBJ_P(zv) ((php_phongo_objectid_t *)zend_object_store_get_object(zv TSRMLS_CC))
100+
# define Z_REGEX_OBJ_P(zv) ((php_phongo_regex_t *)zend_object_store_get_object(zv TSRMLS_CC))
101+
# define Z_TIMESTAMP_OBJ_P(zv) ((php_phongo_timestamp_t *)zend_object_store_get_object(zv TSRMLS_CC))
102+
# define Z_UTCDATETIME_OBJ_P(zv) ((php_phongo_utcdatetime_t *)zend_object_store_get_object(zv TSRMLS_CC))
103+
104+
# define Z_OBJ_COMMAND(zo) ((php_phongo_command_t *)zo)
105+
# define Z_OBJ_CURSOR(zo) ((php_phongo_cursor_t *)zo)
106+
# define Z_OBJ_CURSORID(zo) ((php_phongo_cursorid_t *)zo)
107+
# define Z_OBJ_MANAGER(zo) ((php_phongo_manager_t *)zo)
108+
# define Z_OBJ_QUERY(zo) ((php_phongo_query_t *)zo)
109+
# define Z_OBJ_READCONCERN(zo) ((php_phongo_readconcern_t *)zo)
110+
# define Z_OBJ_READPREFERENCE(zo) ((php_phongo_readpreference_t *)zo)
111+
# define Z_OBJ_SERVER(zo) ((php_phongo_server_t *)zo)
112+
# define Z_OBJ_BULKWRITE(zo) ((php_phongo_bulkwrite_t *)zo)
113+
# define Z_OBJ_WRITECONCERN(zo) ((php_phongo_writeconcern_t *)zo)
114+
# define Z_OBJ_WRITECONCERNERROR(zo) ((php_phongo_writeconcernerror_t *)zo)
115+
# define Z_OBJ_WRITEERROR(zo) ((php_phongo_writeerror_t *)zo)
116+
# define Z_OBJ_WRITERESULT(zo) ((php_phongo_writeresult_t *)zo)
117+
# define Z_OBJ_BINARY(zo) ((php_phongo_binary_t *)zo)
118+
# define Z_OBJ_INT32(zo) ((php_phongo_int32_t *)zo)
119+
# define Z_OBJ_INT64(zo) ((php_phongo_int64_t *)zo)
120+
# define Z_OBJ_JAVASCRIPT(zo) ((php_phongo_javascript_t *)zo)
121+
# define Z_OBJ_LOG(zo) ((php_phongo_log_t *)zo)
122+
# define Z_OBJ_MAXKEY(zo) ((php_phongo_maxkey_t *)zo)
123+
# define Z_OBJ_MINKEY(zo) ((php_phongo_minkey_t *)zo)
124+
# define Z_OBJ_OBJECTID(zo) ((php_phongo_objectid_t *)zo)
125+
# define Z_OBJ_REGEX(zo) ((php_phongo_regex_t *)zo)
126+
# define Z_OBJ_TIMESTAMP(zo) ((php_phongo_timestamp_t *)zo)
127+
# define Z_OBJ_UTCDATETIME(zo) ((php_phongo_utcdatetime_t *)zo)
128128
#endif
129129

130130
typedef struct {

0 commit comments

Comments
 (0)