Changeset 396ee0a for src/SynTree

Timestamp:

Feb 22, 2017, 2:42:11 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

131dbb3, 692de479

Parents:

0788b739 (diff), fc39193 (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

Location:

src/SynTree

Files:

• BaseSyntaxNode.h (added)
• Declaration.h (modified) (4 diffs)
• Expression.h (modified) (1 diff)
• FunctionDecl.cc (modified) (3 diffs)
• Initializer.h (modified) (1 diff)
• Mutator.cc (modified) (2 diffs)
• Mutator.h (modified) (1 diff)
• Statement.h (modified) (1 diff)
• Type.h (modified) (1 diff)
• Visitor.cc (modified) (2 diffs)
• Visitor.h (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:27:08 2017
-// Update Count     : 56
+// Last Modified On : Thu Feb 16 14:53:35 2017
+// Update Count     : 57
 //
 
@@ -17 +17 @@
 #define DECLARATION_H
 
+#include <string>
+
+#include "BaseSyntaxNode.h"
+#include "Mutator.h"
+#include "Visitor.h"
 #include "SynTree.h"
-#include "Visitor.h"
-#include "Mutator.h"
 #include "Parser/LinkageSpec.h"
 #include "Parser/ParseNode.h"
-#include <string>
-
-class Declaration {
+
+class Declaration : public BaseSyntaxNode {
   public:
         Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage );
@@ -138 +140 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
-        std::list< std::string >& get_oldIdents() { return oldIdents; }
-        std::list< Declaration* >& get_oldDecls() { return oldDecls; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -149 +149 @@
         FunctionType *type;
         CompoundStmt *statements;
-        std::list< std::string > oldIdents;
-        std::list< Declaration* > oldDecls;
 };
 

src/SynTree/Expression.h

@@ -19 +19 @@
 #include <map>
 #include <memory>
+
+#include "BaseSyntaxNode.h"
+#include "Constant.h"
+#include "Mutator.h"
 #include "SynTree.h"
 #include "Visitor.h"
-#include "Mutator.h"
-#include "Constant.h"
 #include "Common/UniqueName.h"
 
 /// Expression is the root type for all expressions
-class Expression {
+class Expression : public BaseSyntaxNode{
   public:
         Expression( Expression * _aname = nullptr );

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct  1 23:06:32 2016
-// Update Count     : 21
+// Last Modified On : Thu Feb 16 15:01:52 2017
+// Update Count     : 23
 //
 
@@ -44 +44 @@
         delete type;
         delete statements;
-        deleteAll( oldDecls );
 }
 
@@ -84 +83 @@
         } // if
 
-        if ( ! oldIdents.empty() ) {
-                os << string( indent + 2, ' ' ) << "with parameter names" << endl;
-                for ( std::list< std::string >::const_iterator i = oldIdents.begin(); i != oldIdents.end(); ++i ) {
-                        os << string( indent + 4, ' ' ) << *i << endl;
-                } // for
-        } // if
-
-        if ( ! oldDecls.empty() ) {
-                os << string( indent + 2, ' ' ) << "with parameter declarations" << endl;
-                printAll( oldDecls, os, indent + 4 );
-        } // if
         if ( statements ) {
                 os << string( indent + 2, ' ' ) << "with body " << endl;

src/SynTree/Initializer.h

@@ -17 +17 @@
 #define INITIALIZER_H
 
+#include <cassert>
+
+#include "BaseSyntaxNode.h"
+#include "Mutator.h"
 #include "SynTree.h"
+#include "Type.h"
 #include "Visitor.h"
-#include "Mutator.h"
-#include "Type.h"
-
-#include <cassert>
 
 const std::list<Expression*> noDesignators;
 
 // Initializer: base class for object initializers (provide default values)
-class Initializer {
+class Initializer : public BaseSyntaxNode {
   public:
         //      Initializer( std::string _name = std::string(""), int _pos = 0 );

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:22:56 2017
-// Update Count     : 20
+// Last Modified On : Thu Feb 16 15:02:23 2017
+// Update Count     : 21
 //
 
@@ -38 +38 @@
 DeclarationWithType *Mutator::mutate( FunctionDecl *functionDecl ) {
         functionDecl->set_functionType( maybeMutate( functionDecl->get_functionType(), *this ) );
-        mutateAll( functionDecl->get_oldDecls(), *this );
         functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
         return functionDecl;

src/SynTree/Mutator.h

@@ -139 +139 @@
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try

src/SynTree/Statement.h

@@ -17 +17 @@
 #define STATEMENT_H
 
+#include "BaseSyntaxNode.h"
+#include "Label.h"
+#include "Mutator.h"
 #include "SynTree.h"
+#include "Type.h"
 #include "Visitor.h"
-#include "Mutator.h"
 #include "Common/SemanticError.h"
-#include "Type.h"
-#include "Label.h"
-
-class Statement {
+
+class Statement : public BaseSyntaxNode {
   public:
         Statement( std::list<Label> labels );

src/SynTree/Type.h

@@ -17 +17 @@
 #define TYPE_H
 
+#include "BaseSyntaxNode.h"
+#include "Mutator.h"
 #include "SynTree.h"
 #include "Visitor.h"
-#include "Mutator.h"
 #include "Common/utility.h"
 
-class Type {
+class Type : public BaseSyntaxNode {
   public:
         struct Qualifiers {

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:19:22 2017
-// Update Count     : 22
+// Last Modified On : Thu Feb 16 15:01:25 2017
+// Update Count     : 23
 //
 
@@ -35 +35 @@
 void Visitor::visit( FunctionDecl *functionDecl ) {
         maybeAccept( functionDecl->get_functionType(), *this );
-        acceptAll( functionDecl->get_oldDecls(), *this );
         maybeAccept( functionDecl->get_statements(), *this );
 }

src/SynTree/Visitor.h

@@ -133 +133 @@
                         }
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -159 +160 @@
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );                       
                         errors.append( e );
                 } // try