Changeset 982832e for src/SynTree

Timestamp:

Sep 13, 2017, 2:44:01 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ba54f7d, c935c3a

Parents:

e3e16bc (diff), 7dc09294 (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:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• BasicType.cc (modified) (2 diffs)
• Declaration.h (modified) (2 diffs)
• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• ObjectDecl.cc (modified) (1 diff)
• Statement.cc (modified) (1 diff)
• Statement.h (modified) (1 diff)
• Type.cc (modified) (3 diffs)

src/SynTree/BasicType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  1 17:12:15 2017
-// Update Count     : 8
+// Last Modified On : Mon Sep 11 12:52:05 2017
+// Update Count     : 9
 //
 
@@ -25 +25 @@
 
 void BasicType::print( std::ostream &os, int indent ) const {
-        static const char *kindNames[] = {      
-                "_Bool", "char", "signed char", "unsigned char", "short signed int", "short unsigned int",
-                "signed int", "unsigned int", "long signed int", "long unsigned int", "long long signed int",
-                "long long unsigned int", "float", "double", "long double", "float _Complex", "double _Complex",
-                "long double _Complex", "float _Imaginary", "double _Imaginary", "long double _Imaginary"
-        };
-
         Type::print( os, indent );
-        os << kindNames[ kind ];
+        os << BasicType::typeNames[ kind ];
 }
 

src/SynTree/Declaration.h

@@ -136 +136 @@
         Expression *get_bitfieldWidth() const { return bitfieldWidth; }
         void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }
+
+        static ObjectDecl * newObject( const std::string & name, Type * type, Initializer * init );
 
         virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
@@ -230 +232 @@
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
 

src/SynTree/Mutator.cc

@@ -78 +78 @@
 }
 
-TypeDecl * Mutator::mutate( TypeDecl *typeDecl ) {
+Declaration * Mutator::mutate( TypeDecl *typeDecl ) {
         handleNamedTypeDecl( typeDecl );
         typeDecl->set_init( maybeMutate( typeDecl->get_init(), *this ) );

src/SynTree/Mutator.h

@@ -31 +31 @@
         virtual Declaration* mutate( EnumDecl *aggregateDecl );
         virtual Declaration* mutate( TraitDecl *aggregateDecl );
-        virtual TypeDecl* mutate( TypeDecl *typeDecl );
+        virtual Declaration* mutate( TypeDecl *typeDecl );
         virtual Declaration* mutate( TypedefDecl *typeDecl );
         virtual AsmDecl* mutate( AsmDecl *asmDecl );

src/SynTree/ObjectDecl.cc

@@ -38 +38 @@
         delete init;
         delete bitfieldWidth;
+}
+
+ObjectDecl * ObjectDecl::newObject( const std::string & name, Type * type, Initializer * init ) {
+        return new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, 0, type, init );
 }
 

src/SynTree/Statement.cc

@@ -472 +472 @@
 }
 
-NullStmt::NullStmt( std::list<Label> labels ) : CompoundStmt( labels ) {}
-NullStmt::NullStmt() : CompoundStmt( std::list<Label>() ) {}
+NullStmt::NullStmt( std::list<Label> labels ) : Statement( labels ) {}
+NullStmt::NullStmt() : Statement( std::list<Label>() ) {}
 
 void NullStmt::print( std::ostream &os, __attribute__((unused)) int indent ) const {

src/SynTree/Statement.h

@@ -67 +67 @@
 };
 
-class NullStmt : public CompoundStmt {
+class NullStmt : public Statement {
   public:
         NullStmt();

src/SynTree/Type.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  2 11:11:00 2017
-// Update Count     : 29
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Sep 11 13:21:25 2017
+// Update Count     : 37
 //
 #include "Type.h"
@@ -26 +26 @@
         "_Bool",
         "char",
-        "char",
+        "signed char",
         "unsigned char",
-        "short",
-        "short unsigned",
-        "int",
+        "signed short int",
+        "unsigned short int",
+        "signed int",
         "unsigned int",
-        "long int",
-        "long unsigned int",
-        "long long int",
-        "long long unsigned int",
+        "signed long int",
+        "unsigned long int",
+        "signed long long int",
+        "unsigned long long int",
         "float",
         "double",
@@ -65 +65 @@
 
 Type * Type::stripDeclarator() {
-        Type * type = this;
-        while ( Type * at = InitTweak::getPointerBase( type ) ) {
-                type = at;
-        }
+        Type * type, * at;
+        for ( type = this; (at = InitTweak::getPointerBase( type )); type = at );
         return type;
 }
 
 Type * Type::stripReferences() {
-        Type * type = this;
-        while ( ReferenceType * ref = dynamic_cast<ReferenceType *>( type ) ) {
-                type = ref->get_base();
-        }
+        Type * type;
+        ReferenceType * ref;
+        for ( type = this; (ref = dynamic_cast<ReferenceType *>( type )); type = ref->get_base() );
         return type;
 }