Force Fink's PATH (but only when required).

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index ebcbb7f8f577b48ca154d52427d1f18fd0e4598d..b126d5a5fee8e4578a3d84300fb6189597d5b419 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -19,8 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#ifndef CYPARSER_HPP
-#define CYPARSER_HPP
+#ifndef CYCRIPT_PARSER_HPP
+#define CYCRIPT_PARSER_HPP

 
 #include <iostream>
 
 
 #include <iostream>
 


@@ -33,33 +33,13 @@
 #include <cstdlib>
 
 #include "location.hh"
 #include <cstdlib>
 
 #include "location.hh"

+
+#include "List.hpp"

 #include "Pooling.hpp"
 #include "Options.hpp"
 
 class CYContext;
 
 #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;
-    }
-};
-
-#define CYForEach(value, list) \
-    for (__typeof__(*list) *value(list); value != NULL; value = value->next_)
-

 struct CYThing {
     virtual ~CYThing() {
     }
 struct CYThing {
     virtual ~CYThing() {
     }


@@ -323,6 +303,7 @@ struct CYScope {
     CYIdentifierValueSet identifiers_;
 
     CYScope(CYScopeType type, CYContext &context, CYStatement *&statements);
     CYIdentifierValueSet identifiers_;
 
     CYScope(CYScopeType type, CYContext &context, CYStatement *&statements);

+    virtual ~CYScope();

 
     void Close();
 
 
     void Close();
 


@@ -374,7 +355,7 @@ struct CYContext {
     void ReplaceAll(Type_ *&values) {
         Type_ **last(&values);
         CYForEach (next, values) {
     void ReplaceAll(Type_ *&values) {
         Type_ **last(&values);
         CYForEach (next, values) {

-            Replace(*last);
+            Replace(*last = next);

             last = &(*last)->next_;
         }
     }
             last = &(*last)->next_;
         }
     }


@@ -426,10 +407,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
     }
 
     void AddPrev(CYStatement *statement) {

-        CYStatement *last(statement);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(statements_);
+        CYSetLast(statement, statements_);

         statements_ = statement;
     }
 
         statements_ = statement;
     }
 


@@ -614,10 +592,7 @@ struct CYCompound :
     }
 
     void AddPrev(CYExpression *expression) {
     }
 
     void AddPrev(CYExpression *expression) {

-        CYExpression *last(expression);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(expressions_);
+        CYSetLast(expression, expressions_);

         expressions_ = expression;
     }
 
         expressions_ = expression;
     }
 


@@ -1867,4 +1842,4 @@ CYAssignment_("&=", BitwiseAnd)
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 

-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/