Skip to content

Commit 49f113a

Browse files
zloyuserzloyuser
authored
Arginfo added (#3)
1 parent a566845 commit 49f113a

File tree

4 files changed

+147
-159
lines changed

4 files changed

+147
-159
lines changed

‎Buffer.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -82,40 +82,40 @@ void Buffer::appendString(const std::string &str) noexcept {
8282
void Buffer::appendInt8(char val) noexcept {
8383
append<char>(val);
8484
}
85-
void Buffer::appendUInt8(unsigned char val) noexcept {
85+
void Buffer::appendUint8(unsigned char val) noexcept {
8686
append<unsigned char>(val);
8787
}
8888

8989
void Buffer::appendInt16(short val) noexcept {
9090
append<short>(val);
9191
}
92-
void Buffer::appendUInt16(unsigned short val) noexcept {
92+
void Buffer::appendUint16(unsigned short val) noexcept {
9393
append<unsigned short>(val);
9494
}
9595

9696
void Buffer::appendInt32(int val) noexcept {
9797
append<int>(val);
9898
}
99-
void Buffer::appendUInt32(unsigned int val) noexcept {
99+
void Buffer::appendUint32(unsigned int val) noexcept {
100100
append<unsigned int>(val);
101101
}
102102

103103
void Buffer::appendInt64(long long val) noexcept {
104104
append<long long>(val);
105105
}
106-
void Buffer::appendUInt64(unsigned long long val) noexcept {
106+
void Buffer::appendUint64(unsigned long long val) noexcept {
107107
append<unsigned long long>(val);
108108
}
109109

110110
void Buffer::appendFloat(float val) noexcept {
111111
union { float fnum; unsigned long inum; } u;
112112
u.fnum = val;
113-
appendUInt32(u.inum);
113+
appendUint32(u.inum);
114114
}
115115
void Buffer::appendDouble(double val) noexcept {
116116
union { double fnum; unsigned long long inum; } u;
117117
u.fnum = val;
118-
appendUInt64(u.inum);
118+
appendUint64(u.inum);
119119
}
120120

121121
/************************* READING *************************/
@@ -151,28 +151,28 @@ std::string Buffer::readString(unsigned long long size, unsigned long long offse
151151
char Buffer::readInt8(unsigned long long offset) const {
152152
return read<char>(offset);
153153
}
154-
unsigned char Buffer::readUInt8(unsigned long long offset) const {
154+
unsigned char Buffer::readUint8(unsigned long long offset) const {
155155
return read<unsigned char>(offset);
156156
}
157157

158158
short Buffer::readInt16(unsigned long long offset) const {
159159
return read<short>(offset);
160160
}
161-
unsigned short Buffer::readUInt16(unsigned long long offset) const {
161+
unsigned short Buffer::readUint16(unsigned long long offset) const {
162162
return read<unsigned short>(offset);
163163
}
164164

165165
int Buffer::readInt32(unsigned long long offset) const {
166166
return read<int>(offset);
167167
}
168-
unsigned int Buffer::readUInt32(unsigned long long offset) const {
168+
unsigned int Buffer::readUint32(unsigned long long offset) const {
169169
return read<unsigned int>(offset);
170170
}
171171

172172
long long Buffer::readInt64(unsigned long long offset) const {
173173
return read<long long>(offset);
174174
}
175-
unsigned long long Buffer::readUInt64(unsigned long long offset) const {
175+
unsigned long long Buffer::readUint64(unsigned long long offset) const {
176176
return read<unsigned long long>(offset);
177177
}
178178

@@ -220,28 +220,28 @@ std::string Buffer::consumeString(unsigned long long size) {
220220
char Buffer::consumeInt8() {
221221
return consume<char>();
222222
}
223-
unsigned char Buffer::consumeUInt8() {
223+
unsigned char Buffer::consumeUint8() {
224224
return consume<unsigned char>();
225225
}
226226

227227
short Buffer::consumeInt16() {
228228
return consume<short>();
229229
}
230-
unsigned short Buffer::consumeUInt16() {
230+
unsigned short Buffer::consumeUint16() {
231231
return consume<unsigned short>();
232232
}
233233

234234
int Buffer::consumeInt32() {
235235
return consume<int>();
236236
}
237-
unsigned int Buffer::consumeUInt32() {
237+
unsigned int Buffer::consumeUint32() {
238238
return consume<unsigned int>();
239239
}
240240

241241
long long Buffer::consumeInt64() {
242242
return consume<long long>();
243243
}
244-
unsigned long long Buffer::consumeUInt64() {
244+
unsigned long long Buffer::consumeUint64() {
245245
return consume<unsigned long long>();
246246
}
247247

‎Buffer.hpp

+14-15
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ class Buffer {
2121

2222
void clear() noexcept;
2323
void write(char * str, long length) noexcept;
24+
void merge(const Buffer&) noexcept;
2425
void discard(unsigned long long n);
2526

2627
unsigned long long size() const noexcept;
2728
bool empty() const noexcept;
2829

29-
void merge(const Buffer&) noexcept;
30-
31-
std::string flush() noexcept;
3230
std::string bytes() const noexcept;
31+
std::string flush() noexcept;
3332

3433
/************************** Writing ***************************/
3534

@@ -40,16 +39,16 @@ class Buffer {
4039
void appendBoolean(bool) noexcept;
4140

4241
void appendInt8(char) noexcept;
43-
void appendUInt8(unsigned char) noexcept;
42+
void appendUint8(unsigned char) noexcept;
4443

4544
void appendInt16(short) noexcept;
46-
void appendUInt16(unsigned short) noexcept;
45+
void appendUint16(unsigned short) noexcept;
4746

4847
void appendInt32(int) noexcept;
49-
void appendUInt32(unsigned int) noexcept;
48+
void appendUint32(unsigned int) noexcept;
5049

5150
void appendInt64(long long) noexcept;
52-
void appendUInt64(unsigned long long) noexcept;
51+
void appendUint64(unsigned long long) noexcept;
5352

5453
void appendFloat(float) noexcept;
5554
void appendDouble(double) noexcept;
@@ -63,16 +62,16 @@ class Buffer {
6362
bool readBoolean(unsigned long long offset) const;
6463

6564
char readInt8(unsigned long long offset) const;
66-
unsigned char readUInt8(unsigned long long offset) const;
65+
unsigned char readUint8(unsigned long long offset) const;
6766

6867
short readInt16(unsigned long long offset) const;
69-
unsigned short readUInt16(unsigned long long offset) const;
68+
unsigned short readUint16(unsigned long long offset) const;
7069

7170
int readInt32(unsigned long long offset) const;
72-
unsigned int readUInt32(unsigned long long offset) const;
71+
unsigned int readUint32(unsigned long long offset) const;
7372

7473
long long readInt64(unsigned long long offset) const;
75-
unsigned long long readUInt64(unsigned long long offset) const;
74+
unsigned long long readUint64(unsigned long long offset) const;
7675

7776
float readFloat(unsigned long long offset) const;
7877
double readDouble(unsigned long long offset) const;
@@ -86,16 +85,16 @@ class Buffer {
8685
bool consumeBool();
8786

8887
char consumeInt8();
89-
unsigned char consumeUInt8();
88+
unsigned char consumeUint8();
9089

9190
short consumeInt16();
92-
unsigned short consumeUInt16();
91+
unsigned short consumeUint16();
9392

9493
int consumeInt32();
95-
unsigned int consumeUInt32();
94+
unsigned int consumeUint32();
9695

9796
long long consumeInt64();
98-
unsigned long long consumeUInt64();
97+
unsigned long long consumeUint64();
9998

10099
float consumeFloat();
101100
double consumeDouble();

‎arginfo.h

+47-15
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,70 @@
1111
#define EXT_BUFFER_ARGINFO_H
1212

1313
ZEND_BEGIN_ARG_INFO_EX(arginfo_construct, 0, 0, 0)
14+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 0, "")
1415
ZEND_END_ARG_INFO();
1516

16-
ZEND_BEGIN_ARG_INFO_EX(arginfo_empty, 0, 0, 0)
17+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_toString, 0, 0, IS_STRING, 0)
1718
ZEND_END_ARG_INFO();
1819

19-
ZEND_BEGIN_ARG_INFO_EX(arginfo_bool, 0, 0, 0)
20-
ZEND_ARG_TYPE_INFO(0, value, _IS_BOOL, 0)
20+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_bytes, 0, 0, IS_STRING, 0)
2121
ZEND_END_ARG_INFO();
2222

23-
ZEND_BEGIN_ARG_INFO_EX(arginfo_int, 0, 0, 0)
24-
ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
23+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_flush, 0, 0, IS_STRING, 0)
2524
ZEND_END_ARG_INFO();
2625

27-
ZEND_BEGIN_ARG_INFO_EX(arginfo_float, 0, 0, 0)
28-
ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0)
26+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_size, 0, 0, IS_LONG, 0)
27+
ZEND_END_ARG_INFO();
28+
29+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_empty, 0, 0, _IS_BOOL, 0)
2930
ZEND_END_ARG_INFO();
3031

31-
ZEND_BEGIN_ARG_INFO_EX(arginfo_string, 0, 0, 0)
32-
ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
32+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_append, 0, 1, "PHPinnacle\\Buffer\\ByteBuffer", 0)
33+
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
34+
ZEND_END_ARG_INFO();
35+
36+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_read, 0, 1, IS_STRING, 0)
37+
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
38+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, 0)
39+
ZEND_END_ARG_INFO();
40+
41+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_consume, 0, 1, IS_STRING, 0)
42+
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
43+
ZEND_END_ARG_INFO();
44+
45+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_discard, 0, 1, "PHPinnacle\\Buffer\\ByteBuffer", 0)
46+
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
3347
ZEND_END_ARG_INFO();
3448

35-
ZEND_BEGIN_ARG_INFO_EX(arginfo_offset, 0, 0, 0)
36-
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
49+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_slice, 0, 1, "PHPinnacle\\Buffer\\ByteBuffer", 0)
50+
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
51+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, 0)
3752
ZEND_END_ARG_INFO();
3853

39-
ZEND_BEGIN_ARG_INFO_EX(arginfo_read, 0, 0, 0)
54+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_shift, 0, 1, "PHPinnacle\\Buffer\\ByteBuffer", 0)
4055
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
41-
ZEND_ARG_TYPE_INFO(0, offset, IS_LONG, 0)
4256
ZEND_END_ARG_INFO();
4357

44-
ZEND_BEGIN_ARG_INFO_EX(arginfo_count, 0, 0, 0)
45-
ZEND_ARG_TYPE_INFO(0, arginfo_count, IS_LONG, 0)
58+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_append_int, 0, 1, "PHPinnacle\\Buffer\\ByteBuffer", 0)
59+
ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
60+
ZEND_END_ARG_INFO();
61+
62+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_read_int, 0, 0, IS_LONG, 0)
63+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, 0)
64+
ZEND_END_ARG_INFO();
65+
66+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_consume_int, 0, 0, IS_LONG, 0)
67+
ZEND_END_ARG_INFO();
68+
69+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_append_float, 0, 1, "PHPinnacle\\Buffer\\ByteBuffer", 0)
70+
ZEND_ARG_TYPE_INFO(0, value, IS_DOUBLE, 0)
71+
ZEND_END_ARG_INFO();
72+
73+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_read_float, 0, 0, IS_DOUBLE, 0)
74+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, offset, IS_LONG, 0, 0)
75+
ZEND_END_ARG_INFO();
76+
77+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_consume_float, 0, 0, IS_DOUBLE, 0)
4678
ZEND_END_ARG_INFO();
4779

4880
#endif

0 commit comments

Comments
 (0)