diff dmd/import.h @ 1587:def7a1d494fd

Merge DMD 1.051
author Christian Kamm <kamm incasoftware de>
date Fri, 06 Nov 2009 23:58:01 +0100
parents e83ba4ae4878
children
line wrap: on
line diff
--- a/dmd/import.h	Fri Nov 06 21:51:41 2009 +0100
+++ b/dmd/import.h	Fri Nov 06 23:58:01 2009 +0100
@@ -1,67 +1,68 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2007 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#ifndef DMD_IMPORT_H
-#define DMD_IMPORT_H
-
-#ifdef __DMC__
-#pragma once
-#endif /* __DMC__ */
-
-#include "dsymbol.h"
-
-
-struct Identifier;
-struct Scope;
-struct OutBuffer;
-struct Module;
-struct Package;
-struct AliasDeclaration;
-#ifdef _DH
-struct HdrGenState;
-#endif
-
-struct Import : Dsymbol
-{
-    Array *packages;		// array of Identifier's representing packages
-    Identifier *id;		// module Identifier
-    Identifier *aliasId;
-    int isstatic;		// !=0 if static import
-    enum PROT protection;
-
-    // Pairs of alias=name to bind into current namespace
-    Array names;
-    Array aliases;
-
-    Array aliasdecls;		// AliasDeclarations for names/aliases
-
-    Module *mod;
-    Package *pkg;		// leftmost package/module
-
-    Import(Loc loc, Array *packages, Identifier *id, Identifier *aliasId,
-	int isstatic);
-    void addAlias(Identifier *name, Identifier *alias);
-
-    const char *kind();
-    enum PROT prot();
-    Dsymbol *syntaxCopy(Dsymbol *s);	// copy only syntax trees
-    void load(Scope *sc);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
-    Dsymbol *toAlias();
-    int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-    int overloadInsert(Dsymbol *s);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    Import *isImport() { return this; }
-};
-
-#endif /* DMD_IMPORT_H */
+
+// Compiler implementation of the D programming language
+// Copyright (c) 1999-2007 by Digital Mars
+// All Rights Reserved
+// written by Walter Bright
+// http://www.digitalmars.com
+// License for redistribution is by either the Artistic License
+// in artistic.txt, or the GNU General Public License in gnu.txt.
+// See the included readme.txt for details.
+
+#ifndef DMD_IMPORT_H
+#define DMD_IMPORT_H
+
+#ifdef __DMC__
+#pragma once
+#endif /* __DMC__ */
+
+#include "dsymbol.h"
+
+
+struct Identifier;
+struct Scope;
+struct OutBuffer;
+struct Module;
+struct Package;
+struct AliasDeclaration;
+#ifdef _DH
+struct HdrGenState;
+#endif
+
+struct Import : Dsymbol
+{
+    Array *packages;		// array of Identifier's representing packages
+    Identifier *id;		// module Identifier
+    Identifier *aliasId;
+    int isstatic;		// !=0 if static import
+    enum PROT protection;
+
+    // Pairs of alias=name to bind into current namespace
+    Array names;
+    Array aliases;
+
+    Array aliasdecls;		// AliasDeclarations for names/aliases
+
+    Module *mod;
+    Package *pkg;		// leftmost package/module
+
+    Import(Loc loc, Array *packages, Identifier *id, Identifier *aliasId,
+	int isstatic);
+    void addAlias(Identifier *name, Identifier *alias);
+
+    const char *kind();
+    enum PROT prot();
+    Dsymbol *syntaxCopy(Dsymbol *s);	// copy only syntax trees
+    void load(Scope *sc);
+    void importAll(Scope *sc);
+    void semantic(Scope *sc);
+    void semantic2(Scope *sc);
+    Dsymbol *toAlias();
+    int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
+    Dsymbol *search(Loc loc, Identifier *ident, int flags);
+    int overloadInsert(Dsymbol *s);
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+
+    Import *isImport() { return this; }
+};
+
+#endif /* DMD_IMPORT_H */