|
112
|
1 # HG changeset patch
|
|
|
2 # User trass3r
|
|
|
3 # Date 1283292718 -7200
|
|
|
4 # Node ID e6e22eceb1e7da03f765df9369851a6491d1b2ad
|
|
|
5 # Parent a5c1086667193606d10002efa031b316a5727450
|
|
|
6 2.036 patch
|
|
|
7
|
|
|
8 diff -r a5c108666719 -r e6e22eceb1e7 src/dmd/class.c
|
|
|
9 --- a/src/dmd/class.c Mon Aug 30 20:49:59 2010 +0200
|
|
|
10 +++ b/src/dmd/class.c Wed Sep 01 00:11:58 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::_alignof || 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 a5c108666719 -r e6e22eceb1e7 src/dmd/dsymbol.c
|
|
|
21 --- a/src/dmd/dsymbol.c Mon Aug 30 20:49:59 2010 +0200
|
|
|
22 +++ b/src/dmd/dsymbol.c Wed Sep 01 00:11:58 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::_alignof || ident == Id::mangleof)
|
|
|
29 error(".%s property cannot be redefined", ident->toChars());
|
|
|
30 }
|
|
|
31 return 1;
|
|
|
32 diff -r a5c108666719 -r e6e22eceb1e7 src/dmd/expression.c
|
|
|
33 --- a/src/dmd/expression.c Mon Aug 30 20:49:59 2010 +0200
|
|
|
34 +++ b/src/dmd/expression.c Wed Sep 01 00:11:58 2010 +0200
|
|
|
35 @@ -5747,7 +5747,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::_alignof && ident != Id::offsetof &&
|
|
|
41 ident != Id::mangleof && ident != Id::stringof)
|
|
|
42 { /* Rewrite:
|
|
|
43 * p.ident
|
|
|
44 diff -r a5c108666719 -r e6e22eceb1e7 src/dmd/idgen.c
|
|
|
45 --- a/src/dmd/idgen.c Mon Aug 30 20:49:59 2010 +0200
|
|
|
46 +++ b/src/dmd/idgen.c Wed Sep 01 00:11:58 2010 +0200
|
|
|
47 @@ -45,7 +45,7 @@
|
|
|
48 { "init" },
|
|
|
49 { "size" },
|
|
|
50 { "__sizeof", "sizeof" },
|
|
|
51 - { "alignof" },
|
|
|
52 + { "_alignof", "alignof" },
|
|
|
53 { "mangleof" },
|
|
|
54 { "stringof" },
|
|
|
55 { "tupleof" },
|
|
|
56 diff -r a5c108666719 -r e6e22eceb1e7 src/dmd/mtype.c
|
|
|
57 --- a/src/dmd/mtype.c Mon Aug 30 20:49:59 2010 +0200
|
|
|
58 +++ b/src/dmd/mtype.c Wed Sep 01 00:11:58 2010 +0200
|
|
|
59 @@ -1266,7 +1266,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::_alignof)
|
|
|
65 {
|
|
|
66 e = new IntegerExp(loc, alignsize(), Type::tsize_t);
|
|
|
67 }
|
|
|
68 @@ -5895,7 +5895,7 @@
|
|
|
69 if (!s)
|
|
|
70 {
|
|
|
71 if (ident != Id::__sizeof &&
|
|
|
72 - ident != Id::alignof &&
|
|
|
73 + ident != Id::_alignof &&
|
|
|
74 ident != Id::init &&
|
|
|
75 ident != Id::mangleof &&
|
|
|
76 ident != Id::stringof &&
|
|
|
77 @@ -6386,7 +6386,7 @@
|
|
|
78 {
|
|
|
79
|
|
|
80 if (ident != Id::__sizeof &&
|
|
|
81 - ident != Id::alignof &&
|
|
|
82 + ident != Id::_alignof &&
|
|
|
83 ident != Id::init &&
|
|
|
84 ident != Id::mangleof &&
|
|
|
85 ident != Id::stringof &&
|
|
|
86 diff -r a5c108666719 -r e6e22eceb1e7 src/druntime/src/compiler/dmd/win32.mak
|
|
|
87 --- a/src/druntime/src/compiler/dmd/win32.mak Mon Aug 30 20:49:59 2010 +0200
|
|
|
88 +++ b/src/druntime/src/compiler/dmd/win32.mak Wed Sep 01 00:11:58 2010 +0200
|
|
|
89 @@ -163,8 +163,8 @@
|
|
|
90
|
|
|
91 # Patterns - asm
|
|
|
92
|
|
|
93 -minit.obj : minit.asm
|
|
|
94 - $(CC) -c $**
|
|
|
95 +#minit.obj : minit.asm
|
|
|
96 +# $(CC) -c $**
|
|
|
97
|
|
|
98 # Rulez |
