Changeset 97f65d5 for src/SynTree

Timestamp:

Feb 15, 2017, 8:13:49 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

e6512c8

Parents:

aa9ee19 (diff), 3149e7e (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:/u/cforall/software/cfa/cfa-cc

Location:

src/SynTree

Files:

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

src/SynTree/Declaration.h

@@ -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 );

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/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.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.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