Changes in src/Parser/ParseNode.h [ac71a86:8b7ee09]

File:

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

src/Parser/ParseNode.h

@@ -103 +103 @@
 //##############################################################################
 
-class ExpressionNode final : public ParseNode {
+class ExpressionNode : public ParseNode {
   public:
         ExpressionNode( Expression * expr = nullptr ) : expr( expr ) {}
@@ -114 +114 @@
         ExpressionNode *set_extension( bool exten ) { extension = exten; return this; }
 
-        void print( std::ostream &os, int indent = 0 ) const {}
-        void printOneLine( std::ostream &os, 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(); }
+        virtual void print( std::ostream &os, int indent = 0 ) const {}
+        virtual void printOneLine( std::ostream &os, int indent = 0 ) const {}
+
+        virtual Expression *build() const { return expr; }
   private:
         bool extension = false;
-        std::unique_ptr<Expression> expr;
+        Expression *expr;
 };
 
@@ -156 +151 @@
 };
 
-Expression *build_constantInteger( const std::string &str );
-Expression *build_constantFloat( const std::string &str );
-Expression *build_constantChar( const std::string &str );
-ConstantExpr *build_constantStr( const std::string &str );
+Expression *build_constantInteger( std::string &str );
+Expression *build_constantFloat( std::string &str );
+Expression *build_constantChar( std::string &str );
+ConstantExpr *build_constantStr( std::string &str );
 
 NameExpr *build_varref( const std::string *name, bool labelp = false );
@@ -309 +304 @@
 //##############################################################################
 
-class StatementNode final : public ParseNode {
+class StatementNode : public ParseNode {
   public:
         StatementNode() { stmt = nullptr; }
@@ -316 +311 @@
         virtual ~StatementNode() {}
 
-        virtual StatementNode *clone() const final { assert( false ); return nullptr; }
-        Statement *build() const { return const_cast<StatementNode*>(this)->stmt.release(); }
+        virtual StatementNode *clone() const { assert( false ); return nullptr; }
+        virtual Statement *build() const { return stmt; }
 
         virtual StatementNode *add_label( const std::string * name ) {
                 stmt->get_labels().emplace_back( *name );
-                delete name;
                 return this;
         }
@@ -330 +324 @@
         virtual void printList( std::ostream &os, int indent = 0 ) {}
   private:
-        std::unique_ptr<Statement> stmt;
+        Statement *stmt;
 }; // StatementNode