Fixes Type::toString()

Issue: #17 Issue: #92
0x7CFE · Jul 17, 2016 · 15a7e2a · 15a7e2a
1 parent c9af814
commit 15a7e2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/inference.h b/include/inference.h
@@ -39,7 +39,7 @@ class Type {
     // tkMonotype       (class name)        (SmallInt)
     // tkComposite      (class name, ...)   (SmallInt, *)
     // tkArray          class name [...]    Array[String, *, (*, *), (True, False)]
-    std::string toString(bool subtypesOnly = false) const;
+    std::string toString(bool subtypesOnly = true) const;
 
     Type(TKind kind = tkUndefined) : m_kind(kind), m_value(0) {}
     Type(TObject* literal, TKind kind = tkLiteral) { set(literal, kind); }
@@ -79,7 +79,7 @@ class Type {
     bool isBlock() const {
         return
             isMonotype() &&
-            m_value == globals.blockClass &&
+            (m_value == globals.blockClass) &&
             !m_subTypes.empty();
     }
 

diff --git a/src/TypeAnalyzer.cpp b/src/TypeAnalyzer.cpp
@@ -26,7 +26,7 @@ static void printBlock(const Type& blockType, std::stringstream& stream) {
         stream << blockType[Type::bstCaptureIndex].toString(); // capture context index
 }
 
-std::string Type::toString(bool subtypesOnly /*= false*/) const {
+std::string Type::toString(bool subtypesOnly /*= true*/) const {
     std::stringstream stream;
 
     switch (m_kind) {
@@ -62,7 +62,7 @@ std::string Type::toString(bool subtypesOnly /*= false*/) const {
             break;
 
         case tkArray:
-            if (subtypesOnly)
+            if (!subtypesOnly)
                 stream << getValue()->cast<TClass>()->name->toString();
         case tkComposite: {
             stream << (m_kind == tkComposite ? "(" : "[");