Expose Objective-C class names to tab completion.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 692be9b52c5f8df7e7549efc39ace21f27cf3e4c..24b356418841b41cded8075e1a5d183b6549fc56 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -117,6 +117,34 @@ enum CYFlags {
     CYNoBF =         (CYNoBrace | CYNoFunction),
 };
 
+_finline CYFlags operator ~(CYFlags rhs) {
+    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
+    return lhs = lhs | rhs;
+}
+
+_finline CYFlags CYLeft(CYFlags flags) {
+    return flags & ~(CYNoDangle | CYNoInteger);
+}
+
+_finline CYFlags CYRight(CYFlags flags) {
+    return flags & ~CYNoBF;
+}
+
+_finline CYFlags CYCenter(CYFlags flags) {
+    return CYLeft(CYRight(flags));
+}
+
 struct CYStatement :
     CYNext<CYStatement>
 {
@@ -303,6 +331,7 @@ struct CYScope {
     CYIdentifierValueSet identifiers_;
 
     CYScope(CYScopeType type, CYContext &context, CYStatement *&statements);
+    virtual ~CYScope();
 
     void Close();
 
@@ -354,7 +383,7 @@ struct CYContext {
     void ReplaceAll(Type_ *&values) {
         Type_ **last(&values);
         CYForEach (next, values) {
-            Replace(*last);
+            Replace(*last = next);
             last = &(*last)->next_;
         }
     }