Changes in src/Parser/ParseNode.h [6d539f83:25bca42]

File:

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

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 30 09:19:17 2018
-// Update Count     : 831
+// Last Modified On : Wed Jun  6 16:17:18 2018
+// Update Count     : 843
 //
 
@@ -77 +77 @@
 
         ParseNode * next = nullptr;
-        std::string * name = nullptr;
+        const std::string * name = nullptr;
         CodeLocation location = yylloc;
 }; // ParseNode
@@ -87 +87 @@
         InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode * des = nullptr );
         InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode * des = nullptr );
+        InitializerNode( bool isDelete );
         ~InitializerNode();
         virtual InitializerNode * clone() const { assert( false ); return nullptr; }
@@ -97 +98 @@
         InitializerNode * set_maybeConstructed( bool value ) { maybeConstructed = value; return this; }
         bool get_maybeConstructed() const { return maybeConstructed; }
+
+        bool get_isDelete() const { return isDelete; }
 
         InitializerNode * next_init() const { return kids; }
@@ -110 +113 @@
         InitializerNode * kids;
         bool maybeConstructed;
+        bool isDelete;
 }; // InitializerNode
 
@@ -167 +171 @@
 };
 
-Expression * build_constantInteger( std::string &str );
-Expression * build_constantFloat( std::string &str );
-Expression * build_constantChar( std::string &str );
-Expression * build_constantStr( std::string &str );
+Expression * build_constantInteger( std::string & str ); // these 4 routines modify the string
+Expression * build_constantFloat( std::string & str );
+Expression * build_constantChar( std::string & str );
+Expression * build_constantStr( std::string & str );
 Expression * build_field_name_FLOATING_FRACTIONconstant( const std::string & str );
 Expression * build_field_name_FLOATING_DECIMALconstant( const std::string & str );
@@ -226 +230 @@
         static DeclarationNode * newBuiltinType( BuiltinType );
         static DeclarationNode * newForall( DeclarationNode * );
-        static DeclarationNode * newFromTypedef( std::string * );
-        static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body );
+        static DeclarationNode * newFromTypedef( const std::string * );
+        static DeclarationNode * newFunction( const std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );
-        static DeclarationNode * newEnum( std::string * name, DeclarationNode * constants, bool body );
-        static DeclarationNode * newEnumConstant( std::string * name, ExpressionNode * constant );
-        static DeclarationNode * newName( std::string * );
-        static DeclarationNode * newFromTypeGen( std::string *, ExpressionNode * params );
-        static DeclarationNode * newTypeParam( TypeClass, std::string * );
+        static DeclarationNode * newEnum( const std::string * name, DeclarationNode * constants, bool body );
+        static DeclarationNode * newEnumConstant( const std::string * name, ExpressionNode * constant );
+        static DeclarationNode * newName( const std::string * );
+        static DeclarationNode * newFromTypeGen( const std::string *, ExpressionNode * params );
+        static DeclarationNode * newTypeParam( TypeClass, const std::string * );
         static DeclarationNode * newTrait( const std::string * name, DeclarationNode * params, DeclarationNode * asserts );
         static DeclarationNode * newTraitUse( const std::string * name, ExpressionNode * params );
-        static DeclarationNode * newTypeDecl( std::string * name, DeclarationNode * typeParams );
+        static DeclarationNode * newTypeDecl( const std::string * name, DeclarationNode * typeParams );
         static DeclarationNode * newPointer( DeclarationNode * qualifiers, OperKinds kind );
         static DeclarationNode * newArray( ExpressionNode * size, DeclarationNode * qualifiers, bool isStatic );
@@ -243 +247 @@
         static DeclarationNode * newTuple( DeclarationNode * members );
         static DeclarationNode * newTypeof( ExpressionNode * expr );
-        static DeclarationNode * newAttr( std::string *, ExpressionNode * expr ); // @ attributes
-        static DeclarationNode * newAttr( std::string *, DeclarationNode * type ); // @ attributes
-        static DeclarationNode * newAttribute( std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
+        static DeclarationNode * newAttr( const std::string *, ExpressionNode * expr ); // @ attributes
+        static DeclarationNode * newAttr( const std::string *, DeclarationNode * type ); // @ attributes
+        static DeclarationNode * newAttribute( const std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
         static DeclarationNode * newStaticAssert( ExpressionNode * condition, Expression * message );
@@ -399 +403 @@
 };
 
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init );
 Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();
-Statement * build_while( ExpressionNode * ctl, StatementNode * stmt, bool kind = false );
+Statement * build_while( IfCtl * ctl, StatementNode * stmt );
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_for( ForCtl * forctl, StatementNode * stmt );
 Statement * build_branch( BranchStmt::Type kind );