Changeset 312029a for src/SynTree

Timestamp:

Dec 11, 2019, 8:52:38 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

737c98a

Parents:

98d6965d

Message:

move enum Aggregate from DeclarationNode to AggregateDecl, add control-keyword field-dereference to replace control-keyword cast

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (3 diffs)
• Declaration.cc (modified) (2 diffs)
• Declaration.h (modified) (12 diffs)
• Expression.cc (modified) (4 diffs)
• Expression.h (modified) (3 diffs)
• FunctionDecl.cc (modified) (2 diffs)
• NamedTypeDecl.cc (modified) (2 diffs)
• TypeDecl.cc (modified) (3 diffs)

src/SynTree/AggregateDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 23:56:39 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  4 14:22:00 2017
-// Update Count     : 22
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 16:31:55 2019
+// Update Count     : 29
 //
 
@@ -21 +21 @@
 #include "Common/utility.h"      // for printAll, cloneAll, deleteAll
 #include "Declaration.h"         // for AggregateDecl, TypeDecl, Declaration
+#include "Initializer.h"
 #include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
 #include "Type.h"                // for Type, Type::StorageClasses
 
+
+// These must harmonize with the corresponding AggregateDecl::Aggregate enumerations.
+static const char * aggregateNames[] = { "struct", "union", "enum", "exception", "trait", "generator", "coroutine", "monitor", "thread", "NoAggregateName" };
+
+const char * AggregateDecl::aggrString( AggregateDecl::Aggregate aggr ) {
+        return aggregateNames[aggr];
+}
 
 AggregateDecl::AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes, LinkageSpec::Spec linkage ) : Parent( name, Type::StorageClasses(), linkage ), body( false ), attributes( attributes ) {
@@ -78 +86 @@
 }
 
-std::string StructDecl::typeString() const { return "struct"; }
+const char * StructDecl::typeString() const { return aggrString( kind ); }
 
-std::string UnionDecl::typeString() const { return "union"; }
+const char * UnionDecl::typeString() const { return aggrString( Union ); }
 
-std::string EnumDecl::typeString() const { return "enum"; }
+const char * EnumDecl::typeString() const { return aggrString( Enum ); }
 
-std::string TraitDecl::typeString() const { return "trait"; }
+const char * TraitDecl::typeString() const { return aggrString( Trait ); }
 
 bool EnumDecl::valueOf( Declaration * enumerator, long long int & value ) {

src/SynTree/Declaration.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 14:38:00 2017
-// Update Count     : 25
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 16:39:56 2019
+// Update Count     : 36
 //
 
@@ -24 +24 @@
 #include "SynTree/Statement.h"       // for AsmStmt
 #include "SynTree/SynTree.h"         // for UniqueId
+#include "SynTree/Expression.h"
 #include "Type.h"                    // for Type, Type::StorageClasses
 
+// To canonicalize declarations
 static UniqueId lastUniqueId = 0;
 

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr May  2 10:47:00 2019
-// Update Count     : 135
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 16:48:20 2019
+// Update Count     : 149
 //
 
@@ -25 +25 @@
 #include "Mutator.h"             // for Mutator
 #include "Parser/LinkageSpec.h"  // for Spec, Cforall
-#include "Parser/ParseNode.h"    // for DeclarationNode, DeclarationNode::Ag...
 #include "SynTree.h"             // for UniqueId
 #include "SynTree/Type.h"        // for Type, Type::StorageClasses, Type::Fu...
@@ -194 +193 @@
         std::list< DeclarationWithType* >& get_assertions() { return assertions; }
 
-        virtual std::string typeString() const = 0;
+        virtual const char * typeString() const = 0;
 
         virtual NamedTypeDecl *clone() const override = 0;
@@ -237 +236 @@
         TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }
 
-        virtual std::string typeString() const override;
-        virtual std::string genTypeString() const;
+        virtual const char * typeString() const override;
+        virtual const char * genTypeString() const;
 
         virtual TypeDecl *clone() const override { return new TypeDecl( *this ); }
@@ -257 +256 @@
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 
-        virtual std::string typeString() const override;
+        virtual const char * typeString() const override;
 
         virtual TypedefDecl *clone() const override { return new TypedefDecl( *this ); }
@@ -269 +268 @@
         typedef Declaration Parent;
   public:
+        enum Aggregate { Struct, Union, Enum, Exception, Trait, Generator, Coroutine, Monitor, Thread, NoAggregate };
+        static const char * aggrString( Aggregate aggr );
+
         std::list<Declaration*> members;
         std::list<TypeDecl*> parameters;
@@ -291 +293 @@
         virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
   protected:
-        virtual std::string typeString() const = 0;
+        virtual const char * typeString() const = 0;
 };
 
@@ -297 +299 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
+        StructDecl( const std::string &name, Aggregate kind = Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
         StructDecl( const StructDecl &other ) : Parent( other ), kind( other.kind ) {}
 
-        bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
-        bool is_monitor() { return kind == DeclarationNode::Monitor; }
-        bool is_thread() { return kind == DeclarationNode::Thread; }
+        bool is_coroutine() { return kind == Coroutine; }
+        bool is_monitor() { return kind == Monitor; }
+        bool is_thread() { return kind == Thread; }
 
         virtual StructDecl *clone() const override { return new StructDecl( *this ); }
@@ -308 +310 @@
         virtual void accept( Visitor & v ) const override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        DeclarationNode::Aggregate kind;
-  private:
-        virtual std::string typeString() const override;
+        Aggregate kind;
+  private:
+        virtual const char * typeString() const override;
 };
 
@@ -324 +326 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        virtual std::string typeString() const override;
+        virtual const char * typeString() const override;
 };
 
@@ -341 +343 @@
   private:
         std::unordered_map< std::string, long long int > enumValues;
-        virtual std::string typeString() const override;
+        virtual const char * typeString() const override;
 };
 
@@ -357 +359 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        virtual std::string typeString() const override;
+        virtual const char * typeString() const override;
 };
 

src/SynTree/Expression.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 15 13:43:00 2019
-// Update Count     : 64
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 07:55:15 2019
+// Update Count     : 70
 //
 
@@ -22 +22 @@
 
 #include "Common/utility.h"          // for maybeClone, cloneAll, deleteAll
-#include "Declaration.h"             // for ObjectDecl, DeclarationWithType
 #include "Expression.h"              // for Expression, ImplicitCopyCtorExpr
 #include "InitTweak/InitTweak.h"     // for getCallArg, getPointerBase
@@ -294 +293 @@
 }
 
-KeywordCastExpr::KeywordCastExpr( Expression * arg, Target target ) : Expression(), arg(arg), target( target ) {
+KeywordCastExpr::KeywordCastExpr( Expression * arg, AggregateDecl::Aggregate target ) : Expression(), arg(arg), target( target ) {
 }
 
@@ -304 +303 @@
 }
 
-const std::string & KeywordCastExpr::targetString() const {
-        static const std::string targetStrs[] = {
-                "coroutine", "thread", "monitor"
-        };
-        static_assert(
-                (sizeof(targetStrs) / sizeof(targetStrs[0])) == ((unsigned long)NUMBER_OF_TARGETS),
-                "Each KeywordCastExpr::Target should have a corresponding string representation"
-        );
-        return targetStrs[(unsigned long)target];
+const char * KeywordCastExpr::targetString() const {
+        return AggregateDecl::aggrString( target );
 }
 

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 15 13:46:00 2019
-// Update Count     : 54
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 16:50:19 2019
+// Update Count     : 60
 //
 
@@ -28 +28 @@
 #include "Label.h"                // for Label
 #include "Mutator.h"              // for Mutator
+#include "Declaration.h"          // for Aggregate
 #include "SynTree.h"              // for UniqueId
 #include "Visitor.h"              // for Visitor
@@ -229 +230 @@
 public:
         Expression * arg;
-        enum Target {
-                Coroutine, Thread, Monitor, NUMBER_OF_TARGETS
-        };
         struct Concrete {
                 std::string field;
                 std::string getter;
         };
-        Target target;
+        AggregateDecl::Aggregate target;
         Concrete concrete_target;
 
-        KeywordCastExpr( Expression * arg, Target target );
+        KeywordCastExpr( Expression * arg, AggregateDecl::Aggregate target );
         KeywordCastExpr( const KeywordCastExpr & other );
         virtual ~KeywordCastExpr();
 
-        const std::string & targetString() const;
+        const char * targetString() const;
 
         virtual KeywordCastExpr * clone() const override { return new KeywordCastExpr( * this ); }

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:33:41 2017
-// Update Count     : 74
+// Last Modified On : Sat Dec  7 17:40:09 2019
+// Update Count     : 75
 //
 
@@ -23 +23 @@
 #include "Common/utility.h"      // for maybeClone, printAll
 #include "Declaration.h"         // for FunctionDecl, FunctionDecl::Parent
+#include "Expression.h"
 #include "Parser/LinkageSpec.h"  // for Spec, linkageName, Cforall
 #include "Statement.h"           // for CompoundStmt

src/SynTree/NamedTypeDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 13:28:00 2017
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 08:26:17 2019
+// Update Count     : 15
 //
 
@@ -78 +78 @@
 }
 
-std::string TypedefDecl::typeString() const { return "typedef"; }
+const char * TypedefDecl::typeString() const { return "typedef"; }
 
 // Local Variables: //

src/SynTree/TypeDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 14:35:00 2017
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Dec 11 17:56:30 2019
+// Update Count     : 10
 //
 
@@ -18 +18 @@
 
 #include "Common/utility.h"  // for maybeClone
+#include "Parser/ParseNode.h"
 #include "Declaration.h"     // for TypeDecl, TypeDecl::Data, TypeDecl::Kind...
 #include "Type.h"            // for Type, Type::StorageClasses
@@ -31 +32 @@
 }
 
-std::string TypeDecl::typeString() const {
-        static const std::string kindNames[] = { "object type", "function type", "tuple type" };
+const char * TypeDecl::typeString() const {
+        static const char * kindNames[] = { "sized object type", "sized function type", "sized tuple type" };
         assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "typeString: kindNames is out of sync." );
         assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
-        return (isComplete() ? "sized " : "") + kindNames[ kind ];
+        return isComplete() ? kindNames[ kind ] : &kindNames[ kind ][ sizeof("sized") ]; // sizeof includes '\0'
 }
 
-std::string TypeDecl::genTypeString() const {
-        static const std::string kindNames[] = { "dtype", "ftype", "ttype" };
+const char * TypeDecl::genTypeString() const {
+        static const char * kindNames[] = { "dtype", "ftype", "ttype" };
         assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "genTypeString: kindNames is out of sync." );
         assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );