Changeset cd6a6ff for src/SynTree

Timestamp:

Dec 3, 2020, 10:44:40 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1db306a

Parents:

b37515b

Message:

Improved coverage of deterministic_output to be much finer grain.

Location:

src/SynTree

Files:

• Expression.cc (modified) (1 diff)
• NamedTypeDecl.cc (modified) (2 diffs)
• ReferenceToType.cc (modified) (2 diffs)
• Type.cc (modified) (1 diff)
• Type.h (modified) (1 diff)

src/SynTree/Expression.cc

@@ -72 +72 @@
 
         if ( result ) {
-                if (!deterministic_output) {
-                        os << std::endl << indent << "with resolved type:" << std::endl;
-                        os << (indent+1);
-                        result->print( os, indent+1 );
-                }
+                os << std::endl << indent << "with resolved type:" << std::endl;
+                os << (indent+1);
+                result->print( os, indent+1 );
         }
 

src/SynTree/NamedTypeDecl.cc

@@ -22 +22 @@
 #include "LinkageSpec.h"         // for Spec, Cforall, linkageName
 #include "Type.h"                // for Type, Type::StorageClasses
+#include "CompilationState.h"
 
 NamedTypeDecl::NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *base )
@@ -41 +42 @@
         using namespace std;
 
-        if ( name != "" ) os << name << ": ";
+        if ( ! name.empty() ) {
+                if( deterministic_output && isUnboundType(name) ) os << "[unbound]:";
+                else os << name << ": ";
+        }
 
         if ( linkage != LinkageSpec::Cforall ) {

src/SynTree/ReferenceToType.cc

@@ -24 +24 @@
 #include "Type.h"             // for TypeInstType, StructInstType, UnionInstType
 #include "TypeSubstitution.h" // for TypeSubstitution
+#include "CompilationState.h"
 
 class Attribute;
@@ -205 +206 @@
 
         Type::print( os, indent );
-        os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type)";
+        os << "instance of " << typeString() << " ";
+        const auto & name_ = get_name();
+        if( deterministic_output && isUnboundType(name) ) os << "[unbound]";
+        else os << name;
+        os << " (" << ( isFtype ? "" : "not" ) << " function type)";
         if ( ! parameters.empty() ) {
                 os << endl << indent << "... with parameters" << endl;

src/SynTree/Type.cc

@@ -156 +156 @@
 const Type::Qualifiers noQualifiers;
 
+bool isUnboundType(const Type * type) {
+        if (auto typeInst = dynamic_cast<const TypeInstType *>(type)) {
+                // xxx - look for a type name produced by renameTyVars.
+
+                // TODO: once TypeInstType representation is updated, it should properly check
+                // if the context id is filled. this is a temporary hack for now
+                return isUnboundType(typeInst->name);
+        }
+        return false;
+}
+
+bool isUnboundType(const std::string & tname) {
+        // xxx - look for a type name produced by renameTyVars.
+
+        // TODO: once TypeInstType representation is updated, it should properly check
+        // if the context id is filled. this is a temporary hack for now
+        if (std::count(tname.begin(), tname.end(), '_') >= 3) {
+                return true;
+        }
+        return false;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Type.h

@@ -733 +733 @@
 };
 
+
+bool isUnboundType(const Type * type);
+bool isUnboundType(const std::string & tname);
+
 // Local Variables: //
 // tab-width: 4 //