Changes in src/AST/Decl.cpp [b230091:3e54399]

File:

• src/AST/Decl.cpp (modified) (3 diffs)

src/AST/Decl.cpp

@@ -39 +39 @@
         if ( uniqueId ) return;  // ensure only set once
         uniqueId = ++lastUniqueId;
-        // The extra readonly pointer is causing some reference counting issues.
-        // idMap[ uniqueId ] = this;
+        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 );
         if ( i != idMap.end() ) return i->second;
@@ -68 +65 @@
         }
         for (auto & tp : this->type_params) {
-                ftype->forall.emplace_back(new TypeInstType(tp));
+                ftype->forall.emplace_back(new TypeInstType(tp->name, tp));
                 for (auto & ap: tp->assertions) {
                         ftype->assertions.emplace_back(new VariableExpr(loc, ap));
@@ -136 +133 @@
 
         auto it = enumValues.find( enumerator->name );
+        
         if ( it != enumValues.end() ) {
-                value = it->second;
+                        
+                // Handle typed enum by casting the value in (C++) compiler
+                // if ( base ) { // A typed enum
+                //      if ( const BasicType * bt = dynamic_cast<const BasicType *>(base) ) {
+                //              switch( bt->kind ) {
+                //                      case BasicType::Kind::Bool:     value = (bool) it->second; break;
+                //                      case BasicType::Kind::Char: value = (char) it->second; break;
+                //                      case BasicType::Kind::SignedChar: value = (signed char) it->second; break;
+                //                      case BasicType::Kind::UnsignedChar: value = (unsigned char) it->second; break;
+                //                      case BasicType::Kind::ShortSignedInt: value = (short signed int) it->second; break;
+                //                      case BasicType::Kind::SignedInt: value = (signed int) it->second; break;
+                //                      case BasicType::Kind::UnsignedInt: value = (unsigned int) it->second; break;
+                //                      case BasicType::Kind::LongSignedInt: value = (long signed int) it->second; break;
+                //                      case BasicType::Kind::LongUnsignedInt: value = (long unsigned int) it->second; break;
+                //                      case BasicType::Kind::LongLongSignedInt: value = (long long signed int) it->second; break;
+                //                      case BasicType::Kind::LongLongUnsignedInt: value = (long long unsigned int) it->second; break; 
+                //                      // TODO: value should be able to handle long long unsigned int
+
+                //                      default:
+                //                      value = it->second;
+                //              }
+                //      }
+                // } else {
+                        value = it->second;
+                //}
+
                 return true;
         }