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

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index d8539399fb9c13a016ce5cb7c63284a7390741f5..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>
 
@@ -303,6 +303,7 @@ struct CYScope {
     CYIdentifierValueSet identifiers_;
 
     CYScope(CYScopeType type, CYContext &context, CYStatement *&statements);
+    virtual ~CYScope();
 
     void Close();
 
@@ -354,7 +355,7 @@ struct CYContext {
     void ReplaceAll(Type_ *&values) {
         Type_ **last(&values);
         CYForEach (next, values) {
-            Replace(*last);
+            Replace(*last = next);
             last = &(*last)->next_;
         }
     }
@@ -1841,4 +1842,4 @@ CYAssignment_("&=", BitwiseAnd)
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 
-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/