Merge DMD r243: some harmonization with D2 dmd --- dmd/aggregate.h | 24 ++++- dmd/attrib.c | 63 ++++++---- dmd/attrib.h | 10 +- dmd/declaration.h | 5 +- dmd/func.c | 337 ++++++++++++++++++++++------------------------------- dmd/mars.c | 2 +- dmd/mars.h | 7 + dmd/mtype.h | 13 ++- dmd/parse.c | 32 ++++- dmd/parse.h | 14 ++- dmd/scope.h | 2 +- 11 files changed, 263 insertions(+), 246 deletions(-)

--- a/dmd/scope.h	Mon Dec 28 02:23:54 2009 +0000
+++ b/dmd/scope.h	Wed Jan 06 15:18:19 2010 -0300
@@ -88,7 +88,7 @@
     enum PROT protection;	// protection for class members
     int explicitProtection;	// set if in an explicit protection attribute
 
-    unsigned stc;		// storage class
+    StorageClass stc;		// storage class
 
     unsigned flags;
 #define SCOPEctor	1	// constructor type