 |
Changeset 3896
- Timestamp:
- 08/19/08 20:48:07
(4 months ago)
- Author:
- keinfarbton
- Message:
Typeinfo changes for DMD 2.018
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r2693 |
r3896 |
|
| 17 | 17 | } |
|---|
| 18 | 18 | |
|---|
| 19 | | override int equals(in void *p1, in void *p2) |
|---|
| | 19 | override bool equals(in void *p1, in void *p2) |
|---|
| 20 | 20 | { |
|---|
| 21 | 21 | Object[] s1 = *cast(Object[]*)p1; |
|---|
| r3724 |
r3896 |
|
| 52 | 52 | } |
|---|
| 53 | 53 | |
|---|
| 54 | | override int equals(in void *p1, in void *p2) |
|---|
| | 54 | override bool equals(in void *p1, in void *p2) |
|---|
| 55 | 55 | { |
|---|
| 56 | 56 | cdouble[] s1 = *cast(cdouble[]*)p1; |
|---|
| … | … | |
| 62 | 62 | for (size_t u = 0; u < len; u++) |
|---|
| 63 | 63 | { |
|---|
| 64 | | int c = TypeInfo_r._equals(s1[u], s2[u]); |
|---|
| 65 | | if (c == 0) |
|---|
| | 64 | auto c = TypeInfo_r._equals(s1[u], s2[u]); |
|---|
| | 65 | if (!c) |
|---|
| 66 | 66 | return 0; |
|---|
| 67 | 67 | } |
|---|
| r3724 |
r3896 |
|
| 50 | 50 | } |
|---|
| 51 | 51 | |
|---|
| 52 | | override int equals(in void *p1, in void *p2) |
|---|
| | 52 | override bool equals(in void *p1, in void *p2) |
|---|
| 53 | 53 | { |
|---|
| 54 | 54 | cfloat[] s1 = *cast(cfloat[]*)p1; |
|---|
| … | … | |
| 60 | 60 | for (size_t u = 0; u < len; u++) |
|---|
| 61 | 61 | { |
|---|
| 62 | | int c = TypeInfo_q._equals(s1[u], s2[u]); |
|---|
| | 62 | auto c = TypeInfo_q._equals(s1[u], s2[u]); |
|---|
| 63 | 63 | if (c == 0) |
|---|
| 64 | 64 | return 0; |
|---|
| r3724 |
r3896 |
|
| 53 | 53 | } |
|---|
| 54 | 54 | |
|---|
| 55 | | override int equals(in void *p1, in void *p2) |
|---|
| | 55 | override bool equals(in void *p1, in void *p2) |
|---|
| 56 | 56 | { |
|---|
| 57 | 57 | creal[] s1 = *cast(creal[]*)p1; |
|---|
| … | … | |
| 63 | 63 | for (size_t u = 0; u < len; u++) |
|---|
| 64 | 64 | { |
|---|
| 65 | | int c = TypeInfo_c._equals(s1[u], s2[u]); |
|---|
| | 65 | auto c = TypeInfo_c._equals(s1[u], s2[u]); |
|---|
| 66 | 66 | if (c == 0) |
|---|
| 67 | 67 | return 0; |
|---|
| r3724 |
r3896 |
|
| 50 | 50 | } |
|---|
| 51 | 51 | |
|---|
| 52 | | override int equals(in void *p1, in void *p2) |
|---|
| | 52 | override bool equals(in void *p1, in void *p2) |
|---|
| 53 | 53 | { |
|---|
| 54 | 54 | double[] s1 = *cast(double[]*)p1; |
|---|
| … | … | |
| 60 | 60 | for (size_t u = 0; u < len; u++) |
|---|
| 61 | 61 | { |
|---|
| 62 | | int c = TypeInfo_d._equals(s1[u], s2[u]); |
|---|
| 63 | | if (c == 0) |
|---|
| | 62 | auto c = TypeInfo_d._equals(s1[u], s2[u]); |
|---|
| | 63 | if (!c) |
|---|
| 64 | 64 | return 0; |
|---|
| 65 | 65 | } |
|---|
| r3724 |
r3896 |
|
| 49 | 49 | } |
|---|
| 50 | 50 | |
|---|
| 51 | | override int equals(in void *p1, in void *p2) |
|---|
| | 51 | override bool equals(in void *p1, in void *p2) |
|---|
| 52 | 52 | { |
|---|
| 53 | 53 | float[] s1 = *cast(float[]*)p1; |
|---|
| … | … | |
| 59 | 59 | for (size_t u = 0; u < len; u++) |
|---|
| 60 | 60 | { |
|---|
| 61 | | int c = TypeInfo_f._equals(s1[u], s2[u]); |
|---|
| 62 | | if (c == 0) |
|---|
| | 61 | auto c = TypeInfo_f._equals(s1[u], s2[u]); |
|---|
| | 62 | if (!c) |
|---|
| 63 | 63 | return 0; |
|---|
| 64 | 64 | } |
|---|
| r3724 |
r3896 |
|
| 52 | 52 | } |
|---|
| 53 | 53 | |
|---|
| 54 | | override int equals(in void *p1, in void *p2) |
|---|
| | 54 | override bool equals(in void *p1, in void *p2) |
|---|
| 55 | 55 | { |
|---|
| 56 | 56 | byte[] s1 = *cast(byte[]*)p1; |
|---|
| r3725 |
r3896 |
|
| 27 | 27 | } |
|---|
| 28 | 28 | |
|---|
| 29 | | override int equals(in void *p1, in void *p2) |
|---|
| | 29 | override bool equals(in void *p1, in void *p2) |
|---|
| 30 | 30 | { |
|---|
| 31 | 31 | int[] s1 = *cast(int[]*)p1; |
|---|
| r3724 |
r3896 |
|
| 27 | 27 | } |
|---|
| 28 | 28 | |
|---|
| 29 | | override int equals(in void *p1, in void *p2) |
|---|
| | 29 | override bool equals(in void *p1, in void *p2) |
|---|
| 30 | 30 | { |
|---|
| 31 | 31 | long[] s1 = *cast(long[]*)p1; |
|---|
| r3724 |
r3896 |
|
| 51 | 51 | } |
|---|
| 52 | 52 | |
|---|
| 53 | | override int equals(in void *p1, in void *p2) |
|---|
| | 53 | override bool equals(in void *p1, in void *p2) |
|---|
| 54 | 54 | { |
|---|
| 55 | 55 | real[] s1 = *cast(real[]*)p1; |
|---|
| … | … | |
| 61 | 61 | for (size_t u = 0; u < len; u++) |
|---|
| 62 | 62 | { |
|---|
| 63 | | int c = TypeInfo_e._equals(s1[u], s2[u]); |
|---|
| 64 | | if (c == 0) |
|---|
| 65 | | return 0; |
|---|
| | 63 | bool c = TypeInfo_e._equals(s1[u], s2[u]); |
|---|
| | 64 | if (c == false) |
|---|
| | 65 | return false; |
|---|
| 66 | 66 | } |
|---|
| 67 | 67 | return 1; |
|---|
| r3724 |
r3896 |
|
| 40 | 40 | } |
|---|
| 41 | 41 | |
|---|
| 42 | | override int equals(in void *p1, in void *p2) |
|---|
| | 42 | override bool equals(in void *p1, in void *p2) |
|---|
| 43 | 43 | { |
|---|
| 44 | 44 | short[] s1 = *cast(short[]*)p1; |
|---|
| r3725 |
r3896 |
|
| 34 | 34 | } |
|---|
| 35 | 35 | |
|---|
| 36 | | override int equals(in void *p1, in void *p2) |
|---|
| | 36 | override bool equals(in void *p1, in void *p2) |
|---|
| 37 | 37 | { |
|---|
| 38 | 38 | Object o1 = *cast(Object*)p1; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(byte *)p1 == *cast(byte *)p2; |
|---|
| r3724 |
r3896 |
|
| 14 | 14 | } |
|---|
| 15 | 15 | |
|---|
| 16 | | static int _equals(cdouble f1, cdouble f2) |
|---|
| | 16 | static bool _equals(cdouble f1, cdouble f2) |
|---|
| 17 | 17 | { |
|---|
| 18 | 18 | return f1 == f2; |
|---|
| … | … | |
| 35 | 35 | } |
|---|
| 36 | 36 | |
|---|
| 37 | | override int equals(in void *p1, in void *p2) |
|---|
| | 37 | override bool equals(in void *p1, in void *p2) |
|---|
| 38 | 38 | { |
|---|
| 39 | 39 | return _equals(*cast(cdouble *)p1, *cast(cdouble *)p2); |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | static int _equals(cfloat f1, cfloat f2) |
|---|
| | 15 | static bool _equals(cfloat f1, cfloat f2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return f1 == f2; |
|---|
| … | … | |
| 34 | 34 | } |
|---|
| 35 | 35 | |
|---|
| 36 | | override int equals(in void *p1, in void *p2) |
|---|
| | 36 | override bool equals(in void *p1, in void *p2) |
|---|
| 37 | 37 | { |
|---|
| 38 | 38 | return _equals(*cast(cfloat *)p1, *cast(cfloat *)p2); |
|---|
| r3724 |
r3896 |
|
| 11 | 11 | } |
|---|
| 12 | 12 | |
|---|
| 13 | | override int equals(in void *p1, in void *p2) |
|---|
| | 13 | override bool equals(in void *p1, in void *p2) |
|---|
| 14 | 14 | { |
|---|
| 15 | 15 | return *cast(char *)p1 == *cast(char *)p2; |
|---|
| r3724 |
r3896 |
|
| 15 | 15 | } |
|---|
| 16 | 16 | |
|---|
| 17 | | static int _equals(creal f1, creal f2) |
|---|
| | 17 | static bool _equals(creal f1, creal f2) |
|---|
| 18 | 18 | { |
|---|
| 19 | 19 | return f1 == f2; |
|---|
| … | … | |
| 36 | 36 | } |
|---|
| 37 | 37 | |
|---|
| 38 | | override int equals(in void *p1, in void *p2) |
|---|
| | 38 | override bool equals(in void *p1, in void *p2) |
|---|
| 39 | 39 | { |
|---|
| 40 | 40 | return _equals(*cast(creal *)p1, *cast(creal *)p2); |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(dchar *)p1 == *cast(dchar *)p2; |
|---|
| r2693 |
r3896 |
|
| 14 | 14 | } |
|---|
| 15 | 15 | |
|---|
| 16 | | override int equals(in void *p1, in void *p2) |
|---|
| | 16 | override bool equals(in void *p1, in void *p2) |
|---|
| 17 | 17 | { |
|---|
| 18 | 18 | return *cast(dg *)p1 == *cast(dg *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | static int _equals(double f1, double f2) |
|---|
| | 15 | static bool _equals(double f1, double f2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return f1 == f2 || |
|---|
| … | … | |
| 33 | 33 | } |
|---|
| 34 | 34 | |
|---|
| 35 | | override int equals(in void *p1, in void *p2) |
|---|
| | 35 | override bool equals(in void *p1, in void *p2) |
|---|
| 36 | 36 | { |
|---|
| 37 | 37 | return _equals(*cast(double *)p1, *cast(double *)p2); |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | static int _equals(float f1, float f2) |
|---|
| | 15 | static bool _equals(float f1, float f2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return f1 == f2 || |
|---|
| … | … | |
| 33 | 33 | } |
|---|
| 34 | 34 | |
|---|
| 35 | | override int equals(in void *p1, in void *p2) |
|---|
| | 35 | override bool equals(in void *p1, in void *p2) |
|---|
| 36 | 36 | { |
|---|
| 37 | 37 | return _equals(*cast(float *)p1, *cast(float *)p2); |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(uint *)p1 == *cast(uint *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(long *)p1 == *cast(long *)p2; |
|---|
| r2693 |
r3896 |
|
| 11 | 11 | } |
|---|
| 12 | 12 | |
|---|
| 13 | | override int equals(in void *p1, in void *p2) |
|---|
| | 13 | override bool equals(in void *p1, in void *p2) |
|---|
| 14 | 14 | { |
|---|
| 15 | 15 | return *cast(void* *)p1 == *cast(void* *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | static int _equals(real f1, real f2) |
|---|
| | 15 | static bool _equals(real f1, real f2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return f1 == f2 || |
|---|
| … | … | |
| 33 | 33 | } |
|---|
| 34 | 34 | |
|---|
| 35 | | override int equals(in void *p1, in void *p2) |
|---|
| | 35 | override bool equals(in void *p1, in void *p2) |
|---|
| 36 | 36 | { |
|---|
| 37 | 37 | return _equals(*cast(real *)p1, *cast(real *)p2); |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(short *)p1 == *cast(short *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(ubyte *)p1 == *cast(ubyte *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(uint *)p1 == *cast(uint *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(ulong *)p1 == *cast(ulong *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(ushort *)p1 == *cast(ushort *)p2; |
|---|
| r3724 |
r3896 |
|
| 13 | 13 | } |
|---|
| 14 | 14 | |
|---|
| 15 | | override int equals(in void *p1, in void *p2) |
|---|
| | 15 | override bool equals(in void *p1, in void *p2) |
|---|
| 16 | 16 | { |
|---|
| 17 | 17 | return *cast(byte *)p1 == *cast(byte *)p2; |
|---|
| r3724 |
r3896 |
|
| 12 | 12 | } |
|---|
| 13 | 13 | |
|---|
| 14 | | override int equals(in void *p1, in void *p2) |
|---|
| | 14 | override bool equals(in void *p1, in void *p2) |
|---|
| 15 | 15 | { |
|---|
| 16 | 16 | return *cast(wchar *)p1 == *cast(wchar *)p2; |
|---|
Download in other formats:
|
 |