Changeset 7d7ef6f

Timestamp:

Feb 17, 2022, 2:35:23 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

a556492

Parents:

51b8582

Message:

Revereted some changes and added a fix to get around the current issue (traits can't refer to traits with the same polymorphic arguments).

Files:

• libcfa/src/math.trait.hfa (modified) (4 diffs)
• src/AST/Decl.cpp (modified) (1 diff)
• src/SynTree/TypeSubstitution.cc (modified) (2 diffs)

libcfa/src/math.trait.hfa

@@ -16 +16 @@
 #pragma once
 
-trait Not( T ) {
-        void ?{}( T &, zero_t );
-        int !?( T );
+trait Not( U ) {
+        void ?{}( U &, zero_t );
+        int !?( U );
 }; // Not
 
@@ -26 +26 @@
 }; // Equality
 
-trait Relational( T | Equality( T ) ) {
-        int ?<?( T, T );
-        int ?<=?( T, T );
-        int ?>?( T, T );
-        int ?>=?( T, T );
+trait Relational( U | Equality( U ) ) {
+        int ?<?( U, U );
+        int ?<=?( U, U );
+        int ?>?( U, U );
+        int ?>=?( U, U );
 }; // Relational
 
@@ -39 +39 @@
 }; // Signed
 
-trait Additive( T | Signed( T ) ) {
-        T ?+?( T, T );
-        T ?-?( T, T );
-        T ?+=?( T &, T );
-        T ?-=?( T &, T );
+trait Additive( U | Signed( U ) ) {
+        U ?+?( U, U );
+        U ?-?( U, U );
+        U ?+=?( U &, U );
+        U ?-=?( U &, U );
 }; // Additive
 
@@ -49 +49 @@
         void ?{}( T &, one_t );
         // T ?++( T & );
-        // T ++?( T &);
+        // T ++?( T & );
         // T ?--( T & );
         // T --?( T & );
 }; // Incdec
 
-trait Multiplicative( T | Incdec( T ) ) {
-        T ?*?( T, T );
-        T ?/?( T, T );
-        T ?%?( T, T );
-        T ?/=?( T &, T );
+trait Multiplicative( U | Incdec( U ) ) {
+        U ?*?( U, U );
+        U ?/?( U, U );
+        U ?%?( U, U );
+        U ?/=?( U &, U );
 }; // Multiplicative
 

src/AST/Decl.cpp

@@ -39 +39 @@
         if ( uniqueId ) return;  // ensure only set once
         uniqueId = ++lastUniqueId;
-        //idMap[ uniqueId ] = this;
+        // The extra readonly pointer is causing some reference counting issues.
+        // idMap[ uniqueId ] = this;
 }
 
 readonly<Decl> Decl::fromId( UniqueId id ) {
+        // Right now this map is always empty, so don't use it.
         assert( false );
         IdMapType::const_iterator i = idMap.find( id );

src/SynTree/TypeSubstitution.cc

@@ -146 +146 @@
 }
 
-static bool are_same( TypeInstType * left, TypeInstType * right ) {
-        if ( left->baseType && right->baseType ) {
-                return left->baseType == right->baseType;
-        } else {
-                return left->name == right->name;
-        }
-}
-
 Type * TypeSubstitution::Substituter::postmutate( TypeInstType *inst ) {
         BoundVarsType::const_iterator bound = boundVars.find( inst->name );
@@ -166 +158 @@
                 // TODO: investigate preventing type variables from being bound to themselves in the first place.
                 if ( TypeInstType * replacement = dynamic_cast< TypeInstType * >( i->second ) ) {
-                        if ( are_same( inst, replacement ) ) {
+                        if ( inst->name == replacement->name ) {
                                 return inst;
                         }