Changeset f80e0218 for src/SynTree/Declaration.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/SynTree/Declaration.h (modified) (7 diffs)

src/SynTree/Declaration.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Declaration.h -- 
+// Declaration.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:28:11 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 06 16:26:12 2016
 // Update Count     : 33
 //
@@ -22 +22 @@
 #include "Parser/LinkageSpec.h"
 #include "Parser/ParseNode.h"
+#include <string>
 
 class Declaration {
@@ -67 +68 @@
         void set_mangleName( std::string newValue ) { mangleName = newValue; }
 
+        std::string get_scopedMangleName() const { return mangleName + "_" + std::to_string(scopeLevel); }
+
+        int get_scopeLevel() const { return scopeLevel; }
+        void set_scopeLevel( int newValue ) { scopeLevel = newValue; }
+
         virtual DeclarationWithType *clone() const = 0;
         virtual DeclarationWithType *acceptMutator( Mutator &m ) = 0;
@@ -75 +81 @@
         // this represents the type with all types and typedefs expanded it is generated by SymTab::Validate::Pass2
         std::string mangleName;
+        // need to remember the scope level at which the variable was declared, so that
+        // shadowed identifiers can be accessed
+        int scopeLevel = 0;
 };
 
@@ -106 +115 @@
         typedef DeclarationWithType Parent;
   public:
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -119 +128 @@
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
+        std::list< Attribute * >& get_attributes() { return attributes; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -130 +140 @@
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
+        std::list< Attribute * > attributes;
 };