Add a valueOf to Instance.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index cdeff501547b454cc71e26e8e7b283c8207c5c30..f48e81bff435c3400645a8665117ad6714fb116b 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -50,6 +50,7 @@
 #include <map>
 #include <set>
 
 #include <map>
 #include <set>
 

+#include <cstdio>

 #include <cstdlib>
 
 #include "location.hh"
 #include <cstdlib>
 
 #include "location.hh"


@@ -244,11 +245,13 @@ struct CYIdentifier :
 {
     CYIdentifier *replace_;
     size_t offset_;
 {
     CYIdentifier *replace_;
     size_t offset_;

+    size_t usage_;

 
     CYIdentifier(const char *word) :
         CYWord(word),
         replace_(NULL),
 
     CYIdentifier(const char *word) :
         CYWord(word),
         replace_(NULL),

-        offset_(0)
+        offset_(0),
+        usage_(0)

     {
     }
 
     {
     }
 


@@ -311,14 +314,19 @@ enum CYIdentifierFlags {
 
 typedef std::set<const char *, CYCStringLess> CYCStringSet;
 typedef std::set<CYIdentifier *, CYIdentifierValueLess> CYIdentifierValueSet;
 
 typedef std::set<const char *, CYCStringLess> CYCStringSet;
 typedef std::set<CYIdentifier *, CYIdentifierValueLess> CYIdentifierValueSet;

-typedef std::set<CYIdentifier *> CYIdentifierAddressSet;
-typedef std::vector<CYIdentifier *> CYIdentifierAddressVector;

 typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap;
 
 typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap;
 

+struct CYIdentifierUsage {
+    CYIdentifier *identifier_;
+    size_t usage_;
+};
+
+typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector;
+

 struct CYScope {
     CYScope *parent_;
 struct CYScope {
     CYScope *parent_;

-    CYIdentifierAddressFlagsMap internal_;

 
 

+    CYIdentifierAddressFlagsMap internal_;

     CYIdentifierValueSet identifiers_;
 
     CYScope() :
     CYIdentifierValueSet identifiers_;
 
     CYScope() :


@@ -326,6 +334,9 @@ struct CYScope {
     {
     }
 
     {
     }
 

+    virtual ~CYScope() {
+    }
+

     void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags);
     virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier);
     void Merge(CYContext &context, CYIdentifier *identifier);
     void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags);
     virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier);
     void Merge(CYContext &context, CYIdentifier *identifier);


@@ -333,11 +344,9 @@ struct CYScope {
 };
 
 struct CYProgram :
 };
 
 struct CYProgram :

-    CYScope,

     CYThing
 {
     CYStatement *statements_;
     CYThing
 {
     CYStatement *statements_;

-    CYIdentifierAddressVector rename_;

 
     CYProgram(CYStatement *statements) :
         statements_(statements)
 
     CYProgram(CYStatement *statements) :
         statements_(statements)


@@ -348,22 +357,22 @@ struct CYProgram :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYContext :
-    CYScope
-{
+struct CYContext {

     apr_pool_t *pool_;
     CYOptions &options_;
     CYScope *scope_;
     apr_pool_t *pool_;
     CYOptions &options_;
     CYScope *scope_;

-    CYProgram *program_;
+    CYIdentifierUsageVector rename_;

 
     CYContext(apr_pool_t *pool, CYOptions &options) :
         pool_(pool),
         options_(options),
 
     CYContext(apr_pool_t *pool, CYOptions &options) :
         pool_(pool),
         options_(options),

-        scope_(this),
-        program_(NULL)
+        scope_(NULL)

     {
     }
 
     {
     }
 

+    virtual ~CYContext() {
+    }
+

     template <typename Type_>
     void Replace(Type_ *&value) {
         for (;;) if (value == NULL)
     template <typename Type_>
     void Replace(Type_ *&value) {
         for (;;) if (value == NULL)


@@ -382,11 +391,9 @@ struct CYBlock :
     CYThing
 {
     CYStatement *statements_;
     CYThing
 {
     CYStatement *statements_;

-    CYScope *scope_;

 
 

-    CYBlock(CYStatement *statements, CYScope *scope = NULL) :
-        statements_(statements),
-        scope_(scope)
+    CYBlock(CYStatement *statements) :
+        statements_(statements)

     {
     }
 
     {
     }
 


@@ -1359,9 +1366,7 @@ struct CYWhile :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYFunction :
-    CYScope
-{
+struct CYFunction {

     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;


@@ -1369,7 +1374,7 @@ struct CYFunction :
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
         parameters_(parameters),
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
         parameters_(parameters),

-        code_(statements, this)
+        code_(statements)

     {
     }
 
     {
     }