Changeset 1f690b3 for src

Timestamp:

Oct 11, 2018, 2:48:06 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

90cfc16, 9507ce3

Parents:

2b3d6ff (diff), 7b61ce8 (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

Files:

• CodeTools/ResolvProtoDump.cc (modified) (9 diffs)
• SynTree/Constant.cc (modified) (3 diffs)
• SynTree/Constant.h (modified) (2 diffs)

src/CodeTools/ResolvProtoDump.cc

@@ -204 +204 @@
                 /// ensures type inst names are uppercase
                 static void ti_name( const std::string& name, std::stringstream& ss ) {
+                        // replace built-in wide character types with named types
+                        if ( name == "char16_t" || name == "char32_t" || name == "wchar_t" ) {
+                                ss << "#" << name;
+                                return;
+                        }
+
+                        // strip leading underscore
                         unsigned i = 0;
                         while ( i < name.size() && name[i] == '_' ) { ++i; }
@@ -210 +217 @@
                                 return;
                         }
-                        ss << (char)std::toupper( static_cast<unsigned char>(name[i]) )
-                           << (name.c_str() + i + 1);
+
+                        std::string stripped = name.substr(i);
+                        // strip trailing "_generic_" from autogen names (avoids some user-generation issues)
+                        char generic[] = "_generic_"; size_t n_generic = sizeof(generic) - 1;
+                        if ( stripped.size() >= n_generic 
+                                        && stripped.substr( stripped.size() - n_generic ) == generic ) {
+                                stripped.resize( stripped.size() - n_generic );
+                        }
+
+                        // uppercase first character
+                        ss << (char)std::toupper( static_cast<unsigned char>(stripped[0]) )
+                           << (stripped.c_str() + 1);
                 }
 
@@ -304 +321 @@
                         }
 
-                        // TODO support VarArgsType
+                        // TODO support variable args for functions
+                        void previsit( VarArgsType* ) {
+                                // only include varargs for top level (argument type)
+                                if ( depth == 0 ) { ss << "#$varargs"; }
+                        }
 
                         // replace 0 and 1 with int
@@ -397 +418 @@
                         }
 
+                        /// Handle already-resolved variables as type constants
+                        void previsit( VariableExpr* expr ) {
+                                PassVisitor<TypePrinter> tyPrinter{ closed, ss };
+                                expr->var->get_type()->accept( tyPrinter );
+                                visit_children = false;
+                        }
+
                         /// Calls handled as calls
                         void previsit( UntypedExpr* expr ) {
@@ -426 +454 @@
                         }
 
-                        /// Already-resolved calls skipped
-                        void previsit( ApplicationExpr* ) {
+                        /// Already-resolved calls reduced to their type constant
+                        void previsit( ApplicationExpr* expr ) {
+                                PassVisitor<TypePrinter> tyPrinter{ closed, ss };
+                                expr->result->accept( tyPrinter );
                                 visit_children = false;
                         }
@@ -532 +562 @@
                                 for ( Initializer* it : li->initializers ) {
                                         build( it, ss );
-                                        ss << ' ';
                                 }
                         }
@@ -539 +568 @@
                 /// Adds an object initializer to the list of expressions
                 void build( const std::string& name, Initializer* init, std::stringstream& ss ) {
-                        ss << "$constructor( ";
+                        ss << "$constructor( &";
                         rp_name( name, ss );
-                        ss << "() ";
+                        ss << ' ';
                         build( init, ss );
                         ss << ')';
@@ -676 +705 @@
                 }
 
+                void previsit( AsmStmt* ) {
+                        // skip asm statements
+                        visit_children = false;
+                }
+
                 void previsit( Expression* expr ) {
                         std::stringstream ss;
@@ -686 +720 @@
                 /// Print non-prelude global declarations for resolv proto
                 void printGlobals() const {
-                        std::cout << "#ptr<T> $addr T" << std::endl;  // &?
+                        std::cout << "#$ptr<T> $addr T" << std::endl;  // &?
                         int i = (int)BasicType::SignedInt;
                         std::cout << i << " $and " << i << ' ' << i << std::endl;  // ?&&?

src/SynTree/Constant.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 14:50:00 2017
-// Update Count     : 29
+// Last Modified On : Fri Spt 28 14:49:00 2018
+// Update Count     : 30
 //
 
@@ -19 +19 @@
 
 #include "Constant.h"
+#include "Expression.h" // for ConstantExpr
 #include "Type.h"    // for BasicType, Type, Type::Qualifiers, PointerType
 
@@ -48 +49 @@
 Constant Constant::from_double( double d ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ), d );
+}
+
+Constant Constant::from_string( std::string const & str ) {
+        return Constant(
+                new ArrayType(
+                        noQualifiers,
+                        new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
+                        new ConstantExpr( Constant::from_int( str.size() + 1 /* \0 */ )),
+                        false, false ),
+                std::string("\"") + str + "\"", (unsigned long long int)0 );
 }
 

src/SynTree/Constant.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 : Sat Jul 22 09:54:46 2017
-// Update Count     : 17
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Spt 28 14:48:00 2018
+// Update Count     : 18
 //
 
@@ -51 +51 @@
         /// generates a floating point constant of the given double
         static Constant from_double( double d );
+        /// generates an array of chars constant of the given string
+        static Constant from_string( std::string const & s );
 
         /// generates a null pointer value for the given type. void * if omitted.