diff gen/irstate.h @ 31:2841234d2aea trunk

[svn r35] * Attributes on struct fields/methods now work * Updated object.d to 1.021 * Added -novalidate command line option. this is sometimes useful when debugging as it may let you read the .ll even if it's invalid.
author lindquist
date Thu, 04 Oct 2007 16:44:07 +0200
parents 37a4fdab33fc
children 8b0e809563df
line wrap: on
line diff
--- a/gen/irstate.h	Thu Oct 04 14:15:54 2007 +0200
+++ b/gen/irstate.h	Thu Oct 04 16:44:07 2007 +0200
@@ -41,7 +41,7 @@
 {
     typedef std::vector<const llvm::Type*> TypeVector;
     typedef std::vector<llvm::Constant*> ConstantVector;
-    typedef std::vector<llvm::PATypeHolder> PATypeHolderVector;
+    typedef std::vector<FuncDeclaration*> FuncDeclVec;
 
 public:
     IRStruct();
@@ -52,6 +52,8 @@
     TypeVector fields;
     ConstantVector inits;
     llvm::PATypeHolder recty;
+    FuncDeclVec funcs;
+    bool queueFuncs;
 };
 
 // represents the module
@@ -79,13 +81,6 @@
     typedef std::vector<ClassDeclaration*> ClassDeclVec;
     ClassDeclVec classes;
 
-    typedef std::vector<FuncDeclaration*> FuncDeclVec;
-    typedef std::vector<FuncDeclVec> ClassMethodVec;
-    ClassMethodVec classmethods;
-
-    typedef std::vector<bool> BoolVec;
-    BoolVec queueClassMethods;
-
     // D main function
     bool emitMain;
     llvm::Function* mainFunc;
@@ -115,6 +110,7 @@
     LvalVec arrays;
 
     // keeping track of the declaration for the current function body
+    typedef std::vector<FuncDeclaration*> FuncDeclVec;
     FuncDeclVec funcdecls;
 };