Changeset 6250a312 for src/SynTree

Timestamp:

May 10, 2017, 5:00:47 PM (9 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, stuck-waitfor-destruct, with_gc

Children:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (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:

• BaseSyntaxNode.h (modified) (1 diff)
• Declaration.h (modified) (1 diff)
• PointerType.cc (modified) (2 diffs)
• SynTree.h (modified) (1 diff)
• Type.h (modified) (1 diff)
• TypeDecl.cc (modified) (1 diff)
• Visitor.h (modified) (2 diffs)

src/SynTree/BaseSyntaxNode.h

@@ -18 +18 @@
 
 #include "Common/utility.h"
+#include "Visitor.h"
 
 class BaseSyntaxNode {
   public:
         CodeLocation location;
+
+        virtual void accept( Visitor & v ) = 0; // temporary -- needs to be here so that BaseSyntaxNode is polymorphic and can be dynamic_cast
 };
 

src/SynTree/Declaration.h

@@ -204 +204 @@
 
         virtual std::string typeString() const;
+        virtual std::string genTypeString() const;
 
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }

src/SynTree/PointerType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PointerType.cc -- 
+// PointerType.cc --
 //
 // Author           : Richard C. Bilson
@@ -38 +38 @@
 void PointerType::print( std::ostream &os, int indent ) const {
         Type::print( os, indent );
-        os << "pointer to ";
-        if ( isStatic ) {
-                os << "static ";
-        } // if
-        if ( isVarLen ) {
-                os << "variable length array of ";
-        } else if ( dimension ) {
-                os << "array of ";
-                dimension->print( os, indent );
-        } // if
+        if ( ! is_array() ) {
+                os << "pointer to ";
+        } else {
+                os << "decayed ";
+                if ( isStatic ) {
+                        os << "static ";
+                } // if
+                if ( isVarLen ) {
+                        os << "variable length array of ";
+                } else if ( dimension ) {
+                        os << "array of ";
+                        dimension->print( os, indent );
+                        os << " ";
+                } // if
+        }
         if ( base ) {
                 base->print( os, indent );

src/SynTree/SynTree.h

@@ -21 +21 @@
 #include <map>
 #include <iostream>
+
+class BaseSyntaxNode;
 
 class Declaration;

src/SynTree/Type.h

@@ -247 +247 @@
         void set_isStatic( bool newValue ) { isStatic = newValue; }
 
+        bool is_array() const { return isStatic || isVarLen || dimension; }
+
         virtual PointerType *clone() const { return new PointerType( *this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }

src/SynTree/TypeDecl.cc

@@ -29 +29 @@
 }
 
+std::string TypeDecl::genTypeString() const {
+        static const std::string kindNames[] = { "otype", "dtype", "ftype", "ttype" };
+        return kindNames[ kind ];
+}
+
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data ) {
   return os << data.kind << ", " << data.isComplete;

src/SynTree/Visitor.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 14:23:24 2017
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May  3 08:58:00 2017
 // Update Count     : 10
 //
@@ -26 +26 @@
         virtual ~Visitor();
   public:
+        // visit: Default implementation of all functions visits the children
+    // of the given syntax node, but performs no other action.
+
         virtual void visit( ObjectDecl *objectDecl );
         virtual void visit( FunctionDecl *functionDecl );