Support SO variable even when not Mach.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 12a5afd85b27d1b76b6cc68c3f26a48364bc5ae4..aad1d478db2ec111ddf7ab8121897a40a8eb519a 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -19,11 +19,8 @@
 **/
 /* }}} */
 
-#ifndef CYPARSER_HPP
-#define CYPARSER_HPP
-
-// XXX: wtf is this here?!
-#define CYPA 16
+#ifndef CYCRIPT_PARSER_HPP
+#define CYCRIPT_PARSER_HPP
 
 #include <iostream>
 
@@ -36,30 +33,13 @@
 #include <cstdlib>
 
 #include "location.hh"
+
+#include "List.hpp"
 #include "Pooling.hpp"
 #include "Options.hpp"
 
 class CYContext;
 
-template <typename Type_>
-struct CYNext {
-    Type_ *next_;
-
-    CYNext() :
-        next_(NULL)
-    {
-    }
-
-    CYNext(Type_ *next) :
-        next_(next)
-    {
-    }
-
-    void SetNext(Type_ *next) {
-        next_ = next;
-    }
-};
-
 struct CYThing {
     virtual ~CYThing() {
     }
@@ -146,9 +126,7 @@ struct CYStatement :
     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 
-    CYStatement *ReplaceAll(CYContext &context);
     virtual CYStatement *Collapse(CYContext &context);
-
     virtual CYStatement *Replace(CYContext &context) = 0;
 
   private:
@@ -372,6 +350,15 @@ struct CYContext {
     virtual ~CYContext() {
     }
 
+    template <typename Type_>
+    void ReplaceAll(Type_ *&values) {
+        Type_ **last(&values);
+        CYForEach (next, values) {
+            Replace(*last = next);
+            last = &(*last)->next_;
+        }
+    }
+
     template <typename Type_>
     void Replace(Type_ *&value) {
         for (;;) if (value == NULL)
@@ -419,10 +406,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
-        CYStatement *last(statement);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(statements_);
+        CYSetLast(statement, statements_);
         statements_ = statement;
     }
 
@@ -586,8 +570,9 @@ struct CYExpression :
     }
 
 #define CYPrecedence(value) \
+    static const unsigned Precedence_ = value; \
     virtual unsigned Precedence() const { \
-        return value; \
+        return Precedence_; \
     }
 
 #define CYRightHand(value) \
@@ -606,10 +591,7 @@ struct CYCompound :
     }
 
     void AddPrev(CYExpression *expression) {
-        CYExpression *last(expression);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(expressions_);
+        CYSetLast(expression, expressions_);
         expressions_ = expression;
     }
 
@@ -1859,4 +1841,4 @@ CYAssignment_("&=", BitwiseAnd)
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 
-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/