Changes in src/Parser/ParseNode.h [8d7bef2:9a705dc8]

File:

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

src/Parser/ParseNode.h

@@ -124 +124 @@
 
         virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
-                os << expr << std::endl;
+                os << expr.get() << 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); }
-
-        Expression * build() const { return expr; }
+        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;
 }; // ExpressionNode
 
@@ -179 +179 @@
 
 Expression * build_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
+Expression * build_keyword_cast( KeywordCastExpr::Target target, ExpressionNode * expr_node );
 Expression * build_virtual_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
 Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member );
@@ -246 +247 @@
         static DeclarationNode * newAttribute( std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
+        static DeclarationNode * newStaticAssert( ExpressionNode * condition, Expression * message );
 
         DeclarationNode();
@@ -313 +315 @@
         Attr_t attr;
 
+        struct StaticAssert_t {
+                ExpressionNode * condition;
+                Expression * message;
+        };
+        StaticAssert_t assert;
+
         BuiltinType builtin;
 
@@ -352 +360 @@
 
         virtual StatementNode * clone() const final { assert( false ); return nullptr; }
-        Statement * build() const { return stmt; }
+        Statement * build() const { return const_cast<StatementNode *>(this)->stmt.release(); }
 
         virtual StatementNode * add_label( const std::string * name, DeclarationNode * attr = nullptr ) {
@@ -364 +372 @@
 
         virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
-                os << stmt << std::endl;
+                os << stmt.get() << std::endl;
         }
   private:
-        Statement* stmt;
+        std::unique_ptr<Statement> stmt;
 }; // StatementNode
 
@@ -392 +400 @@
 
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
-Statement * build_switch( ExpressionNode * ctl, StatementNode * stmt );
+Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();