Changeset 2514607d for src/Parser/ParseNode.h

Timestamp:

Jul 23, 2018, 6:00:57 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e68b3a8

Parents:

cbdf565 (diff), c29c342 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ParseNode.h (modified) (11 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 : Wed Jun  6 16:17:18 2018
-// Update Count     : 843
+// Last Modified On : Fri Jul 20 14:56:30 2018
+// Update Count     : 850
 //
 
@@ -68 +68 @@
         }
 
-        virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
-        virtual void printList( std::ostream &os, int indent = 0 ) const {
+        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
+        virtual void printList( std::ostream & os, int indent = 0 ) const {
                 print( os, indent );
                 if ( next ) next->print( os, indent );
@@ -103 +103 @@
         InitializerNode * next_init() const { return kids; }
 
-        void print( std::ostream &os, int indent = 0 ) const;
+        void print( std::ostream & os, int indent = 0 ) const;
         void printOneLine( std::ostream & ) const;
 
@@ -127 +127 @@
         ExpressionNode * set_extension( bool exten ) { extension = exten; return this; }
 
-        virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
-                os << expr.get() << std::endl;
-        }
-        void printOneLine( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
+        virtual void print( std::ostream & os, __attribute__((unused)) int indent = 0 ) const override {
+                os << expr.get();
+        }
+        void printOneLine( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
 
         template<typename T>
@@ -290 +290 @@
         }
 
-        virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override;
-        virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override;
+        virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override;
+        virtual void printList( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override;
 
         Declaration * build() const;
@@ -303 +303 @@
         bool get_extension() const { return extension; }
         DeclarationNode * set_extension( bool exten ) { extension = exten; return this; }
+
+        bool get_inLine() const { return inLine; }
+        DeclarationNode * set_inLine( bool inL ) { inLine = inL; return this; }
   public:
         DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); }
@@ -327 +330 @@
         StaticAssert_t assert;
 
-        BuiltinType builtin;
-
-        TypeData * type;
-
+        BuiltinType builtin = NoBuiltinType;
+
+        TypeData * type = nullptr;
+
+        bool inLine = false;
         Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;
 
-        ExpressionNode * bitfieldWidth;
+        ExpressionNode * bitfieldWidth = nullptr;
         std::unique_ptr<ExpressionNode> enumeratorValue;
-        bool hasEllipsis;
+        bool hasEllipsis = false;
         LinkageSpec::Spec linkage;
-        Expression * asmName;
+        Expression * asmName = nullptr;
         std::list< Attribute * > attributes;
-        InitializerNode * initializer;
+        InitializerNode * initializer = nullptr;
         bool extension = false;
         std::string error;
-        StatementNode * asmStmt;
+        StatementNode * asmStmt = nullptr;
 
         static UniqueName anonymous;
@@ -377 +381 @@
         virtual StatementNode * append_last_case( StatementNode * );
 
-        virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
+        virtual void print( std::ostream & os, __attribute__((unused)) int indent = 0 ) const override {
                 os << stmt.get() << std::endl;
         }
@@ -435 +439 @@
 
 template< typename SynTreeType, typename NodeType, template< typename, typename...> class Container, typename... Args >
-void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > &outputList ) {
+void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > & outputList ) {
         SemanticErrorException errors;
         std::back_insert_iterator< Container< SynTreeType *, Args... > > out( outputList );
@@ -449 +453 @@
                                 assertf(false, "buildList unknown type");
                         } // if
-                } catch( SemanticErrorException &e ) {
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
@@ -460 +464 @@
 
 // in DeclarationNode.cc
-void buildList( const DeclarationNode * firstNode, std::list< Declaration * > &outputList );
-void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList );
-void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > &outputList );
+void buildList( const DeclarationNode * firstNode, std::list< Declaration * > & outputList );
+void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > & outputList );
+void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > & outputList );
 
 template< typename SynTreeType, typename NodeType >
-void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > &outputList ) {
+void buildMoveList( const NodeType * firstNode, std::list< SynTreeType * > & outputList ) {
         buildList( firstNode, outputList );
         delete firstNode;