Changeset ac71a86 for src/Parser/ParseNode.h

Timestamp:

Aug 19, 2016, 12:57:05 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

04cdd9b, 2037f82

Parents:

8b7ee09

Message:

removed more memory leaks from the system

File:

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

src/Parser/ParseNode.h

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