# HG changeset patch # User Trass3r # Date 1283163404 -7200 # Node ID d0f297f8650b2d614d200947173c4830ca23f4d3 # Parent 43073c7c77698e15350fd281b4a4a605826c5b92 added probably needed dmd patch to the 2.035 branch diff -r 43073c7c7769 -r d0f297f8650b dmd2035.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dmd2035.patch Mon Aug 30 12:16:44 2010 +0200 @@ -0,0 +1,85 @@ +# HG changeset patch +# User trass3r +# Date 1283163123 -7200 +# Node ID 1ca9dcaadc045a9856c1c554fb2f871081df12a0 +# Parent e5248fb387cb8381af2c9ec786bd08a86d90a3a7 +fix + +diff -r e5248fb387cb -r 1ca9dcaadc04 class.c +--- a/class.c Sat Aug 28 17:24:54 2010 +0200 ++++ b/class.c Mon Aug 30 12:12:03 2010 +0200 +@@ -61,7 +61,7 @@ + if (id) + { // Look for special class names + +- if (id == Id::__sizeof || id == Id::alignof || id == Id::mangleof) ++ if (id == Id::__sizeof || id == Id::__xalignof || id == Id::mangleof) + error("illegal class name"); + + // BUG: What if this is the wrong TypeInfo, i.e. it is nested? +diff -r e5248fb387cb -r 1ca9dcaadc04 dsymbol.c +--- a/dsymbol.c Sat Aug 28 17:24:54 2010 +0200 ++++ b/dsymbol.c Mon Aug 30 12:12:03 2010 +0200 +@@ -488,7 +488,7 @@ + } + if (sd->isAggregateDeclaration() || sd->isEnumDeclaration()) + { +- if (ident == Id::__sizeof || ident == Id::alignof || ident == Id::mangleof) ++ if (ident == Id::__sizeof || ident == Id::__xalignof || ident == Id::mangleof) + error(".%s property cannot be redefined", ident->toChars()); + } + return 1; +diff -r e5248fb387cb -r 1ca9dcaadc04 expression.c +--- a/expression.c Sat Aug 28 17:24:54 2010 +0200 ++++ b/expression.c Mon Aug 30 12:12:03 2010 +0200 +@@ -5714,7 +5714,7 @@ + } + else if (t1b->ty == Tpointer && + ident != Id::init && ident != Id::__sizeof && +- ident != Id::alignof && ident != Id::offsetof && ++ ident != Id::__xalignof && ident != Id::offsetof && + ident != Id::mangleof && ident != Id::stringof) + { /* Rewrite: + * p.ident +diff -r e5248fb387cb -r 1ca9dcaadc04 idgen.c +--- a/idgen.c Sat Aug 28 17:24:54 2010 +0200 ++++ b/idgen.c Mon Aug 30 12:12:03 2010 +0200 +@@ -45,7 +45,7 @@ + { "init" }, + { "size" }, + { "__sizeof", "sizeof" }, +- { "alignof" }, ++ { "__xalignof", "alignof" }, + { "mangleof" }, + { "stringof" }, + { "tupleof" }, +diff -r e5248fb387cb -r 1ca9dcaadc04 mtype.c +--- a/mtype.c Sat Aug 28 17:24:54 2010 +0200 ++++ b/mtype.c Mon Aug 30 12:12:03 2010 +0200 +@@ -1303,7 +1303,7 @@ + error(loc, ".size property should be replaced with .sizeof"); + e = new ErrorExp(); + } +- else if (ident == Id::alignof) ++ else if (ident == Id::__xalignof) + { + e = new IntegerExp(loc, alignsize(), Type::tsize_t); + } +@@ -5807,7 +5807,7 @@ + if (!s) + { + if (ident != Id::__sizeof && +- ident != Id::alignof && ++ ident != Id::__xalignof && + ident != Id::init && + ident != Id::mangleof && + ident != Id::stringof && +@@ -6298,7 +6298,7 @@ + { + + if (ident != Id::__sizeof && +- ident != Id::alignof && ++ ident != Id::__xalignof && + ident != Id::init && + ident != Id::mangleof && + ident != Id::stringof &&