Mercurial > projects > ddmd

comparison dmd2035.patch @ 80:d0f297f8650b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added probably needed dmd patch to the 2.035 branch
author Trass3r
date Mon, 30 Aug 2010 12:16:44 +0200
parents
children
comparison
equal deleted inserted replaced
79:43073c7c7769 80:d0f297f8650b
1 # HG changeset patch
2 # User trass3r
3 # Date 1283163123 -7200
4 # Node ID 1ca9dcaadc045a9856c1c554fb2f871081df12a0
5 # Parent e5248fb387cb8381af2c9ec786bd08a86d90a3a7
6 fix
7
8 diff -r e5248fb387cb -r 1ca9dcaadc04 class.c
9 --- a/class.c Sat Aug 28 17:24:54 2010 +0200
10 +++ b/class.c Mon Aug 30 12:12:03 2010 +0200
11 @@ -61,7 +61,7 @@
12 if (id)
13 { // Look for special class names
14
15 - if (id == Id::__sizeof || id == Id::alignof || id == Id::mangleof)
16 + if (id == Id::__sizeof || id == Id::__xalignof || id == Id::mangleof)
17 error("illegal class name");
18
19 // BUG: What if this is the wrong TypeInfo, i.e. it is nested?
20 diff -r e5248fb387cb -r 1ca9dcaadc04 dsymbol.c
21 --- a/dsymbol.c Sat Aug 28 17:24:54 2010 +0200
22 +++ b/dsymbol.c Mon Aug 30 12:12:03 2010 +0200
23 @@ -488,7 +488,7 @@
24 }
25 if (sd->isAggregateDeclaration() || sd->isEnumDeclaration())
26 {
27 - if (ident == Id::__sizeof || ident == Id::alignof || ident == Id::mangleof)
28 + if (ident == Id::__sizeof || ident == Id::__xalignof || ident == Id::mangleof)
29 error(".%s property cannot be redefined", ident->toChars());
30 }
31 return 1;
32 diff -r e5248fb387cb -r 1ca9dcaadc04 expression.c
33 --- a/expression.c Sat Aug 28 17:24:54 2010 +0200
34 +++ b/expression.c Mon Aug 30 12:12:03 2010 +0200
35 @@ -5714,7 +5714,7 @@
36 }
37 else if (t1b->ty == Tpointer &&
38 ident != Id::init && ident != Id::__sizeof &&
39 - ident != Id::alignof && ident != Id::offsetof &&
40 + ident != Id::__xalignof && ident != Id::offsetof &&
41 ident != Id::mangleof && ident != Id::stringof)
42 { /* Rewrite:
43 * p.ident
44 diff -r e5248fb387cb -r 1ca9dcaadc04 idgen.c
45 --- a/idgen.c Sat Aug 28 17:24:54 2010 +0200
46 +++ b/idgen.c Mon Aug 30 12:12:03 2010 +0200
47 @@ -45,7 +45,7 @@
48 { "init" },
49 { "size" },
50 { "__sizeof", "sizeof" },
51 - { "alignof" },
52 + { "__xalignof", "alignof" },
53 { "mangleof" },
54 { "stringof" },
55 { "tupleof" },
56 diff -r e5248fb387cb -r 1ca9dcaadc04 mtype.c
57 --- a/mtype.c Sat Aug 28 17:24:54 2010 +0200
58 +++ b/mtype.c Mon Aug 30 12:12:03 2010 +0200
59 @@ -1303,7 +1303,7 @@
60 error(loc, ".size property should be replaced with .sizeof");
61 e = new ErrorExp();
62 }
63 - else if (ident == Id::alignof)
64 + else if (ident == Id::__xalignof)
65 {
66 e = new IntegerExp(loc, alignsize(), Type::tsize_t);
67 }
68 @@ -5807,7 +5807,7 @@
69 if (!s)
70 {
71 if (ident != Id::__sizeof &&
72 - ident != Id::alignof &&
73 + ident != Id::__xalignof &&
74 ident != Id::init &&
75 ident != Id::mangleof &&
76 ident != Id::stringof &&
77 @@ -6298,7 +6298,7 @@
78 {
79
80 if (ident != Id::__sizeof &&
81 - ident != Id::alignof &&
82 + ident != Id::__xalignof &&
83 ident != Id::init &&
84 ident != Id::mangleof &&
85 ident != Id::stringof &&