Changes in src/SynTree/Declaration.h [03e5d14:f326f99]

File:

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

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 15:39:02 2016
-// Update Count     : 33
+// Last Modified On : Mon Apr 11 16:55:12 2016
+// Update Count     : 36
 //
 
@@ -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:
-        // temporary - merge this into general GCC attributes
-        struct Attribute {
-                enum Type {
-                        NoAttribute, Constructor, Destructor,
-                } type;
-                enum Priority {
-                        // priorities 0-100 are reserved by gcc, so it's okay to use 100 an exceptional case
-                        Default = 100, High,
-                } priority;
-                Attribute(Type t = NoAttribute, Priority p = Default) : type(t), priority(p) {};
-        };
-
-        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute = Attribute() );
+        FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();
@@ -131 +128 @@
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
-        Attribute get_attribute() const { return attribute; }
-        void set_attribute( Attribute newValue ) { attribute = newValue; }
 
         virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
@@ -144 +139 @@
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
-        Attribute attribute;
 };