improve/fix graph display

WalkerCodeRanger · WalkerCodeRanger · commit cc3edfbc4f2e · 2020-08-22T11:02:45.000-07:00
diff --git a/Parsing/Tree/ClassDeclarationSyntax.cs b/Parsing/Tree/ClassDeclarationSyntax.cs
@@ -67,7 +67,7 @@ public void CreateDefaultConstructor(SymbolTreeBuilder symbolTree)
 
             var constructedType = Symbol.Result.DeclaresDataType;
             var constructorSymbol = new ConstructorSymbol(Symbol.Result, null, FixedList<DataType>.Empty);
-            var selfParameterSymbol = new SelfParameterSymbol(constructorSymbol, false, constructedType);
+            var selfParameterSymbol = new SelfParameterSymbol(constructorSymbol, constructedType);
 
             symbolTree.Add(constructorSymbol);
             symbolTree.Add(selfParameterSymbol);
diff --git a/Parsing/Tree/SelfParameterSyntax.cs b/Parsing/Tree/SelfParameterSyntax.cs
@@ -8,7 +8,7 @@ namespace Adamant.Tools.Compiler.Bootstrap.Parsing.Tree
 {
     internal class SelfParameterSyntax : ParameterSyntax, ISelfParameterSyntax
     {
-        public bool IsMutableBinding => MutableSelf;
+        public bool IsMutableBinding => false;
         public bool MutableSelf { get; }
         public Promise<SelfParameterSymbol> Symbol { get; } = new Promise<SelfParameterSymbol>();
         IPromise<BindingSymbol> IBindingSyntax.Symbol => Symbol;
diff --git a/Semantics.Reachability.Graph/CallerVariable.cs b/Semantics.Reachability.Graph/CallerVariable.cs
@@ -14,7 +14,7 @@ public class CallerVariable : StackPlace
     {
         public BindingSymbol Symbol { get; }
 
-        private CallerVariable(ReachabilityGraph graph, BindingSymbol symbol)
+        internal CallerVariable(ReachabilityGraph graph, BindingSymbol symbol)
             : base(graph)
         {
             _ = symbol.DataType.UnderlyingReferenceType()
@@ -32,7 +32,8 @@ internal static CallerVariable CreateForParameterWithObject(ReachabilityGraph gr
 
         public override string ToString()
         {
-            return $"⟦{Symbol.Name}⟧: {Symbol.DataType}";
+            var name = Symbol is SelfParameterSymbol ? "self" : Symbol.Name?.ToString();
+            return $"⟦{name}⟧: {Symbol.DataType}";
         }
     }
 }
diff --git a/Semantics.Reachability.Graph/ReachabilityGraphGraphvizExtensions.cs b/Semantics.Reachability.Graph/ReachabilityGraphGraphvizExtensions.cs
@@ -8,7 +8,7 @@ namespace Adamant.Tools.Compiler.Bootstrap.Semantics.Reachability.Graph
 {
     public static class ReachabilityGraphGraphvizExtensions
     {
-        private const string Grey = "grey45";
+        private const string Grey = "grey55";
         private const string Black = "black";
 
         /// <summary>
diff --git a/Semantics.Reachability.Graph/Variable.cs b/Semantics.Reachability.Graph/Variable.cs
@@ -58,7 +58,9 @@ public void Dead()
 
         public override string ToString()
         {
-            return $"{Symbol.Name}: {Symbol.DataType}";
+            var mut = Symbol.IsMutableBinding ? "var " : "";
+            var name = Symbol is SelfParameterSymbol ? "self" : Symbol.Name?.ToString();
+            return $"{mut}{name}: {Symbol.DataType}";
         }
     }
 }
diff --git a/Semantics/AST/Tree/NamedParameter.cs b/Semantics/AST/Tree/NamedParameter.cs
@@ -24,7 +24,7 @@ public NamedParameter(
 
         public override string ToString()
         {
-            var mutable = Symbol.IsMutableBinding ? "mut " : "";
+            var mutable = Symbol.IsMutableBinding ? "var " : "";
             var defaultValue = DefaultValue != null ? " = " + DefaultValue : "";
             var declarationNumber = Symbol.DeclarationNumber is null ? "" : "#" + Symbol.DeclarationNumber;
             return $"{mutable}{Symbol.Name}{declarationNumber}: {Symbol.DataType}{defaultValue}";
diff --git a/Semantics/Symbols/Entities/EntitySymbolBuilder.cs b/Semantics/Symbols/Entities/EntitySymbolBuilder.cs
@@ -243,7 +243,7 @@ private void BuildSelParameterSymbol(
             ISelfParameterSyntax param,
             DataType type)
         {
-            var symbol = new SelfParameterSymbol(containingSymbol, param.IsMutableBinding, type);
+            var symbol = new SelfParameterSymbol(containingSymbol, type);
             param.Symbol.Fulfill(symbol);
             symbolTree.Add(symbol);
         }
diff --git a/Symbols/FieldSymbol.cs b/Symbols/FieldSymbol.cs
@@ -36,8 +36,8 @@ public override int GetHashCode()
 
         public override string ToILString()
         {
-            var mutable = IsMutableBinding ? "mut " : "";
-            return $"{ContainingSymbol}::{mutable}{Name}: {DataType}";
+            var mutable = IsMutableBinding ? "var" : "let";
+            return $"{ContainingSymbol}::{mutable} {Name}: {DataType}";
         }
     }
 }
diff --git a/Symbols/SelfParameterSymbol.cs b/Symbols/SelfParameterSymbol.cs
@@ -7,9 +7,12 @@ public class SelfParameterSymbol : BindingSymbol
     {
         public new InvocableSymbol ContainingSymbol { get; }
 
-        public SelfParameterSymbol(InvocableSymbol containingSymbol, bool isMutableBinding, DataType dataType)
-            : base(containingSymbol, null, isMutableBinding, dataType)
+        public SelfParameterSymbol(InvocableSymbol containingSymbol, DataType dataType)
+            : base(containingSymbol, null, false, dataType)
         {
+            if (containingSymbol is FunctionSymbol)
+                throw new ArgumentException("Function can't have self parameter", nameof(containingSymbol));
+
             ContainingSymbol = containingSymbol;
         }
 
@@ -31,8 +34,7 @@ public override int GetHashCode()
 
         public override string ToILString()
         {
-            var mutable = IsMutableBinding ? "mut " : "";
-            return $"{ContainingSymbol} {{{mutable}{Name}: {DataType}}}";
+            return $"{ContainingSymbol} {{self: {DataType}}}";
         }
     }
 }
diff --git a/Symbols/VariableSymbol.cs b/Symbols/VariableSymbol.cs
@@ -43,9 +43,9 @@ public override int GetHashCode()
 
         public override string ToILString()
         {
-            var mutable = IsMutableBinding ? "mut " : "";
+            var mutable = IsMutableBinding ? "var" : "let";
             var declarationNumber = DeclarationNumber is null ? "" : "#" + DeclarationNumber;
-            return $"{ContainingSymbol} {{{mutable}{Name}{declarationNumber}: {DataType}}}";
+            return $"{ContainingSymbol} {{{mutable} {Name}{declarationNumber}: {DataType}}}";
         }
     }
 }
diff --git a/Tests.Unit.Semantics.Reachability.Graph/CallerVariableTests.cs b/Tests.Unit.Semantics.Reachability.Graph/CallerVariableTests.cs
@@ -0,0 +1,20 @@
+using Adamant.Tools.Compiler.Bootstrap.Semantics.Reachability.Graph;
+using Adamant.Tools.Compiler.Bootstrap.Types;
+using Xunit;
+
+namespace Adamant.Tools.Compiler.Bootstrap.Tests.Unit.Semantics.Reachability.Graph
+{
+    public class CallerVariableTests : SymbolTestFixture
+    {
+        [Fact]
+        public void Self_parameter_to_string_has_name()
+        {
+            var sym = SelfParam(type: DataType("MyType", referenceCapability: ReferenceCapability.Borrowed));
+            var v = new CallerVariable(new ReachabilityGraph(), sym);
+
+            var actual = v.ToString();
+
+            Assert.Equal("⟦self⟧: mut MyType", actual);
+        }
+    }
+}
diff --git a/Tests.Unit.Semantics.Reachability.Graph/GlobalSuppressions.cs b/Tests.Unit.Semantics.Reachability.Graph/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Unit test naming")]
diff --git a/Tests.Unit.Semantics.Reachability.Graph/Tests.Unit.Semantics.Reachability.Graph.csproj b/Tests.Unit.Semantics.Reachability.Graph/Tests.Unit.Semantics.Reachability.Graph.csproj
@@ -36,6 +36,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Semantics.Reachability.Graph\Semantics.Reachability.Graph.csproj" />
     <ProjectReference Include="..\Tests.Asserts\Tests.Asserts.csproj" />
+    <ProjectReference Include="..\Tests.Unit\Tests.Unit.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Tests.Unit.Semantics.Reachability.Graph/VariableTests.cs b/Tests.Unit.Semantics.Reachability.Graph/VariableTests.cs
@@ -0,0 +1,31 @@
+using Adamant.Tools.Compiler.Bootstrap.Semantics.Reachability.Graph;
+using Adamant.Tools.Compiler.Bootstrap.Types;
+using Xunit;
+
+namespace Adamant.Tools.Compiler.Bootstrap.Tests.Unit.Semantics.Reachability.Graph
+{
+    public class VariableTests : SymbolTestFixture
+    {
+        [Fact]
+        public void Self_parameter_to_string_has_name()
+        {
+            var sym = SelfParam(type: DataType("MyType", referenceCapability: ReferenceCapability.Borrowed));
+            var v = new Variable(new ReachabilityGraph(), sym);
+
+            var actual = v.ToString();
+
+            Assert.Equal("self: mut MyType", actual);
+        }
+
+        [Fact]
+        public void ToString_include_mutable_binding()
+        {
+            var sym = Variable("foo", mut: true, type: DataType("MyType"));
+            var v = new Variable(new ReachabilityGraph(), sym);
+
+            var actual = v.ToString();
+
+            Assert.Equal("var foo: iso MyType", actual);
+        }
+    }
+}
diff --git a/Tests.Unit.Symbols/Tests.Unit.Symbols.csproj b/Tests.Unit.Symbols/Tests.Unit.Symbols.csproj
@@ -35,6 +35,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Symbols\Symbols.csproj" />
     <ProjectReference Include="..\Tests.Asserts\Tests.Asserts.csproj" />
+    <ProjectReference Include="..\Tests.Unit\Tests.Unit.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Tests.Unit/SymbolTestFixture.cs b/Tests.Unit/SymbolTestFixture.cs
@@ -5,7 +5,7 @@
 using Adamant.Tools.Compiler.Bootstrap.Symbols;
 using Adamant.Tools.Compiler.Bootstrap.Types;
 
-namespace Adamant.Tools.Compiler.Bootstrap.Tests.Unit.Symbols
+namespace Adamant.Tools.Compiler.Bootstrap.Tests.Unit
 {
     public abstract class SymbolTestFixture
     {
@@ -96,10 +96,19 @@ protected static MethodSymbol Method(
                 @params ?? mother.ParameterDataTypes,
                 @return ?? mother.ReturnDataType);
         }
-        protected ObjectType DataType(string? name = null)
+
+        protected ObjectType DataType(
+            string? name = null,
+            NamespaceName? containingNamespace = null,
+            bool? declaredMutable = null,
+            ReferenceCapability? referenceCapability = null)
         {
             var finalName = Name(name) ?? DefaultName("DataType");
-            return new ObjectType(NamespaceName.Global, finalName.Text, false, ReferenceCapability.Isolated);
+            return new ObjectType(
+                containingNamespace ?? NamespaceName.Global,
+                finalName.Text,
+                declaredMutable ?? false,
+                referenceCapability ?? ReferenceCapability.Isolated);
         }
 
         protected ObjectTypeSymbol Type(
@@ -141,5 +150,14 @@ protected static VariableSymbol Variable(
                 mut ?? mother.IsMutableBinding,
                 type ?? mother.DataType);
         }
+
+        protected SelfParameterSymbol SelfParam(
+            InvocableSymbol? containing = null,
+            DataType? type = null)
+        {
+            return new SelfParameterSymbol(
+                containing ?? Method(),
+                type ?? DataType());
+        }
     }
 }
diff --git a/Tests.Unit/Tests.Unit.csproj b/Tests.Unit/Tests.Unit.csproj
@@ -42,6 +42,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\Names\Names.csproj" />
+    <ProjectReference Include="..\Symbols\Symbols.csproj" />
     <ProjectReference Include="..\Tests.Asserts\Tests.Asserts.csproj" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Adamant.Tools.Compiler.Bootstrap.Parsing.Tree`
`8`	`8`	`{`
`9`	`9`	`internal class SelfParameterSyntax : ParameterSyntax, ISelfParameterSyntax`
`10`	`10`	`{`
`11`		`- public bool IsMutableBinding => MutableSelf;`
	`11`	`+ public bool IsMutableBinding => false;`
`12`	`12`	`public bool MutableSelf { get; }`
`13`	`13`	`public Promise<SelfParameterSymbol> Symbol { get; } = new Promise<SelfParameterSymbol>();`
`14`	`14`	`IPromise<BindingSymbol> IBindingSyntax.Symbol => Symbol;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class CallerVariable : StackPlace`
`14`	`14`	`{`
`15`	`15`	`public BindingSymbol Symbol { get; }`
`16`	`16`
`17`		`- private CallerVariable(ReachabilityGraph graph, BindingSymbol symbol)`
	`17`	`+ internal CallerVariable(ReachabilityGraph graph, BindingSymbol symbol)`
`18`	`18`	`: base(graph)`
`19`	`19`	`{`
`20`	`20`	`_ = symbol.DataType.UnderlyingReferenceType()`
`@@ -32,7 +32,8 @@ internal static CallerVariable CreateForParameterWithObject(ReachabilityGraph gr`
`32`	`32`
`33`	`33`	`public override string ToString()`
`34`	`34`	`{`
`35`		`- return $"⟦{Symbol.Name}⟧: {Symbol.DataType}";`
	`35`	`+ var name = Symbol is SelfParameterSymbol ? "self" : Symbol.Name?.ToString();`
	`36`	`+ return $"⟦{name}⟧: {Symbol.DataType}";`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Adamant.Tools.Compiler.Bootstrap.Semantics.Reachability.Graph`
`8`	`8`	`{`
`9`	`9`	`public static class ReachabilityGraphGraphvizExtensions`
`10`	`10`	`{`
`11`		`- private const string Grey = "grey45";`
	`11`	`+ private const string Grey = "grey55";`
`12`	`12`	`private const string Black = "black";`
`13`	`13`
`14`	`14`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@ public void Dead()`
`58`	`58`
`59`	`59`	`public override string ToString()`
`60`	`60`	`{`
`61`		`- return $"{Symbol.Name}: {Symbol.DataType}";`
	`61`	`+ var mut = Symbol.IsMutableBinding ? "var " : "";`
	`62`	`+ var name = Symbol is SelfParameterSymbol ? "self" : Symbol.Name?.ToString();`
	`63`	`+ return $"{mut}{name}: {Symbol.DataType}";`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public NamedParameter(`
`24`	`24`
`25`	`25`	`public override string ToString()`
`26`	`26`	`{`
`27`		`- var mutable = Symbol.IsMutableBinding ? "mut " : "";`
	`27`	`+ var mutable = Symbol.IsMutableBinding ? "var " : "";`
`28`	`28`	`var defaultValue = DefaultValue != null ? " = " + DefaultValue : "";`
`29`	`29`	`var declarationNumber = Symbol.DeclarationNumber is null ? "" : "#" + Symbol.DeclarationNumber;`
`30`	`30`	`return $"{mutable}{Symbol.Name}{declarationNumber}: {Symbol.DataType}{defaultValue}";`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ private void BuildSelParameterSymbol(`
`243`	`243`	`ISelfParameterSyntax param,`
`244`	`244`	`DataType type)`
`245`	`245`	`{`
`246`		`- var symbol = new SelfParameterSymbol(containingSymbol, param.IsMutableBinding, type);`
	`246`	`+ var symbol = new SelfParameterSymbol(containingSymbol, type);`
`247`	`247`	`param.Symbol.Fulfill(symbol);`
`248`	`248`	`symbolTree.Add(symbol);`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public override int GetHashCode()`
`36`	`36`
`37`	`37`	`public override string ToILString()`
`38`	`38`	`{`
`39`		`- var mutable = IsMutableBinding ? "mut " : "";`
`40`		`- return $"{ContainingSymbol}::{mutable}{Name}: {DataType}";`
	`39`	`+ var mutable = IsMutableBinding ? "var" : "let";`
	`40`	`+ return $"{ContainingSymbol}::{mutable} {Name}: {DataType}";`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,12 @@ public class SelfParameterSymbol : BindingSymbol`
`7`	`7`	`{`
`8`	`8`	`public new InvocableSymbol ContainingSymbol { get; }`
`9`	`9`
`10`		`- public SelfParameterSymbol(InvocableSymbol containingSymbol, bool isMutableBinding, DataType dataType)`
`11`		`- : base(containingSymbol, null, isMutableBinding, dataType)`
	`10`	`+ public SelfParameterSymbol(InvocableSymbol containingSymbol, DataType dataType)`
	`11`	`+ : base(containingSymbol, null, false, dataType)`
`12`	`12`	`{`
	`13`	`+ if (containingSymbol is FunctionSymbol)`
	`14`	`+ throw new ArgumentException("Function can't have self parameter", nameof(containingSymbol));`
	`15`	`+`
`13`	`16`	`ContainingSymbol = containingSymbol;`
`14`	`17`	`}`
`15`	`18`
`@@ -31,8 +34,7 @@ public override int GetHashCode()`
`31`	`34`
`32`	`35`	`public override string ToILString()`
`33`	`36`	`{`
`34`		`- var mutable = IsMutableBinding ? "mut " : "";`
`35`		`- return $"{ContainingSymbol} {{{mutable}{Name}: {DataType}}}";`
	`37`	`+ return $"{ContainingSymbol} {{self: {DataType}}}";`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ public override int GetHashCode()`
`43`	`43`
`44`	`44`	`public override string ToILString()`
`45`	`45`	`{`
`46`		`- var mutable = IsMutableBinding ? "mut " : "";`
	`46`	`+ var mutable = IsMutableBinding ? "var" : "let";`
`47`	`47`	`var declarationNumber = DeclarationNumber is null ? "" : "#" + DeclarationNumber;`
`48`		`- return $"{ContainingSymbol} {{{mutable}{Name}{declarationNumber}: {DataType}}}";`
	`48`	`+ return $"{ContainingSymbol} {{{mutable} {Name}{declarationNumber}: {DataType}}}";`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`}`