Changeset 8d7bef2 for src/Parser/ParseNode.h

Timestamp:

Mar 20, 2018, 5:12:25 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

7e4b44db

Parents:

68f9c43

Message:

First compiling build of CFA-CC with GC

File:

• src/Parser/ParseNode.h (modified) (3 diffs)

src/Parser/ParseNode.h

@@ -124 +124 @@
 
         virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
-                os << expr.get() << std::endl;
+                os << expr << std::endl;
         }
         void printOneLine( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
 
         template<typename T>
-        bool isExpressionType() const { return nullptr != dynamic_cast<T>(expr.get()); }
-
-        Expression * build() const { return const_cast<ExpressionNode *>(this)->expr.release(); }
+        bool isExpressionType() const { return nullptr != dynamic_cast<T>(expr); }
+
+        Expression * build() const { return expr; }
   private:
         bool extension = false;
-        std::unique_ptr<Expression> expr;
+        Expression* expr;
 }; // ExpressionNode
 
@@ -352 +352 @@
 
         virtual StatementNode * clone() const final { assert( false ); return nullptr; }
-        Statement * build() const { return const_cast<StatementNode *>(this)->stmt.release(); }
+        Statement * build() const { return stmt; }
 
         virtual StatementNode * add_label( const std::string * name, DeclarationNode * attr = nullptr ) {
@@ -364 +364 @@
 
         virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
-                os << stmt.get() << std::endl;
+                os << stmt << std::endl;
         }
   private:
-        std::unique_ptr<Statement> stmt;
+        Statement* stmt;
 }; // StatementNode