Changeset f849c8e for src/Parser

Timestamp:

Oct 28, 2016, 1:11:12 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4b1afb6

Parents:

837f999 (diff), 0ebac75 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Makefile.am
src/Makefile.in

File:

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

src/Parser/ParseNode.h

@@ -109 +109 @@
         ExpressionNode * set_extension( bool exten ) { extension = exten; return this; }
 
-        void print( std::ostream &os, int indent = 0 ) const {}
+        virtual void print( std::ostream &os, int indent = 0 ) const override {}
         void printOneLine( std::ostream &os, int indent = 0 ) const {}
 
@@ -187 +187 @@
 //##############################################################################
 
-class TypeData;
+struct TypeData;
 
 class DeclarationNode : public ParseNode {
@@ -271 +271 @@
         }
 
-        void print( std::ostream &os, int indent = 0 ) const;
-        void printList( std::ostream &os, int indent = 0 ) const;
+        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual void printList( std::ostream &os, int indent = 0 ) const override;
 
         Declaration * build() const;
@@ -345 +345 @@
         virtual StatementNode * append_last_case( StatementNode * );
 
-        virtual void print( std::ostream &os, int indent = 0 ) {}
-        virtual void printList( std::ostream &os, int indent = 0 ) {}
+        virtual void print( std::ostream &os, int indent = 0 ) const override {}
+        virtual void printList( std::ostream &os, int indent = 0 ) const override {}
   private:
         std::unique_ptr<Statement> stmt;