Changes in src/SynTree/Declaration.h [58dd019:2c57025]

File:

• src/SynTree/Declaration.h (modified) (8 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 : Tue Dec 13 13:37:33 2016
-// Update Count     : 49
+// Last Modified On : Thu Aug 18 23:50:24 2016
+// Update Count     : 40
 //
 
@@ -69 +69 @@
 
         std::string get_mangleName() const { return mangleName; }
-        DeclarationWithType * set_mangleName( std::string newValue ) { mangleName = newValue; return this; }
+        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; }
-        DeclarationWithType * set_scopeLevel( int newValue ) { scopeLevel = newValue; return this; }
-
-        ConstantExpr *get_asmName() const { return asmName; }
-        DeclarationWithType * set_asmName( ConstantExpr *newValue ) { asmName = newValue; return this; }
+        void set_scopeLevel( int newValue ) { scopeLevel = newValue; }
 
         std::list< Attribute * >& get_attributes() { return attributes; }
@@ -90 +87 @@
         // 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
+        // need to remember the scope level at which the variable was declared, so that
+        // shadowed identifiers can be accessed
         int scopeLevel = 0;
 
-        ConstantExpr *asmName;
         std::list< Attribute * > attributes;
 };
@@ -109 +106 @@
         Initializer *get_init() const { return init; }
         void set_init( Initializer *newValue ) { init = newValue; }
-
         Expression *get_bitfieldWidth() const { return bitfieldWidth; }
         void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }
@@ -180 +176 @@
   public:
         enum Kind { Any, Dtype, Ftype };
+        /// Data extracted from a type decl
+        struct Data {
+                TypeDecl::Kind kind;
+                bool isComplete;
+                Data() : kind( (TypeDecl::Kind)-1 ), isComplete( false ) {}
+                Data( TypeDecl * typeDecl ) : Data( typeDecl->get_kind(), typeDecl->isComplete() ) {}
+                Data( Kind kind, bool isComplete ) : kind( kind ), isComplete( isComplete ) {}
+                bool operator==(const Data & other) const { return kind == other.kind && isComplete == other.isComplete; }
+                bool operator!=(const Data & other) const { return !(*this == other);}
+        };
 
         TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind );
@@ -186 +192 @@
         Kind get_kind() const { return kind; }
 
+        bool isComplete() const { return kind == Any || sized; }
+        bool get_sized() const { return sized; }
+        TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }
+
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -192 +202 @@
         virtual std::string typeString() const;
         Kind kind;
+        bool sized;
 };
 
@@ -284 +295 @@
 
 std::ostream & operator<<( std::ostream & out, const Declaration * decl );
+std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );
 
 #endif // DECLARATION_H