Some directories of dooom.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 73a605ca136808787bdb2ec243c89f0ab6a3502b..f48e81bff435c3400645a8665117ad6714fb116b 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -50,6 +50,7 @@
 #include <map>
 #include <set>
 
+#include <cstdio>
 #include <cstdlib>
 
 #include "location.hh"
@@ -324,8 +325,8 @@ typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector;
 
 struct CYScope {
     CYScope *parent_;
-    CYIdentifierAddressFlagsMap internal_;
 
+    CYIdentifierAddressFlagsMap internal_;
     CYIdentifierValueSet identifiers_;
 
     CYScope() :
@@ -343,11 +344,9 @@ struct CYScope {
 };
 
 struct CYProgram :
-    CYScope,
     CYThing
 {
     CYStatement *statements_;
-    CYIdentifierUsageVector rename_;
 
     CYProgram(CYStatement *statements) :
         statements_(statements)
@@ -358,19 +357,16 @@ struct CYProgram :
     virtual void Output(CYOutput &out) const;
 };
 
-struct CYContext :
-    CYScope
-{
+struct CYContext {
     apr_pool_t *pool_;
     CYOptions &options_;
     CYScope *scope_;
-    CYProgram *program_;
+    CYIdentifierUsageVector rename_;
 
     CYContext(apr_pool_t *pool, CYOptions &options) :
         pool_(pool),
         options_(options),
-        scope_(this),
-        program_(NULL)
+        scope_(NULL)
     {
     }
 
@@ -395,11 +391,9 @@ struct CYBlock :
     CYThing
 {
     CYStatement *statements_;
-    CYScope *scope_;
 
-    CYBlock(CYStatement *statements, CYScope *scope = NULL) :
-        statements_(statements),
-        scope_(scope)
+    CYBlock(CYStatement *statements) :
+        statements_(statements)
     {
     }
 
@@ -1372,9 +1366,7 @@ struct CYWhile :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYFunction :
-    CYScope
-{
+struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;
@@ -1382,7 +1374,7 @@ struct CYFunction :
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
         parameters_(parameters),
-        code_(statements, this)
+        code_(statements)
     {
     }