Improving the Plato grammar, tools, and error recovery.

cdiggins · Mar 11, 2024 · c9fba58 · c9fba58
1 parent b0b8b46
commit c9fba58
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 110 deletions.
diff --git a/Plato.AST/AstNodeFactory.cs b/Plato.AST/AstNodeFactory.cs
@@ -240,20 +240,11 @@ public static AstMethodDeclaration ToAst(this CstMethodDeclaration md)
                 md,
                 ToAst(md.Identifier.Node),
                 ToAst(md.TypeAnnotation.Node),
-                md.FunctionParameterList.Node.FunctionParameter.Nodes.Select(ToAst).ToList(),
+                md.FunctionParameterList.Node?.FunctionParameter.Nodes.Select(ToAst).ToList() 
+                    ?? Enumerable.Empty<AstParameterDeclaration>(),
                 ToAst(md.FunctionBody.Node));
         }
 
-        public static AstMemberDeclaration ToAst(this CstMemberDeclaration memberDeclaration)
-        {
-            if (memberDeclaration.MethodDeclaration.Present)
-                return ToAst(memberDeclaration.MethodDeclaration.Node);
-            if (memberDeclaration.FieldDeclaration.Present)
-                return ToAst(memberDeclaration.FieldDeclaration.Node);
-
-            throw new Exception($"Unrecognized member type {memberDeclaration.Text}");  
-        }
-
         public static AstParameterDeclaration ToAst(this CstLambdaParameter lp, int index)
         {
             return new AstParameterDeclaration(lp, 
@@ -593,8 +584,6 @@ public static AstNode ToAst(this CstNode node)
                     throw new NotImplementedException();
                 case CstMemberAccess cstMemberAccess:
                     throw new NotImplementedException();
-                case CstMemberDeclaration cstMemberDeclaration:
-                    throw new NotImplementedException();
                 case CstMethodDeclaration cstMethodDeclaration:
                     throw new NotImplementedException();
                 case CstOperator cstOperator:
@@ -799,7 +788,7 @@ public static string ToAst(this CstQualifiedIdentifier cstQualifiedIdentifier)
             => cstQualifiedIdentifier.Text;
 
         public static string ToAst(this CstIdentifier cstIdentifier)
-            => cstIdentifier.Text;
+            => cstIdentifier?.Text ?? "";
 
         public static IEnumerable<AstVarDef> CreateVarDefs(this CstVarDecl cstVarDecl)
         {

diff --git a/PlatoCompiler/Compilation.cs b/PlatoCompiler/Compilation.cs
@@ -257,6 +257,7 @@ public void WriteReifiedTypes()
         public IType GetExpressionType(Expression expr)
             => ExpressionTypes.TryGetValue(expr, out var r) ? r : null;
 
+        // TODO: I have to make these more like Parser Errors 
         public void LogResolutionErrors(IEnumerable<SymbolFactory.ResolutionError> resolutionErrors)
         {
             foreach (var error in resolutionErrors)
@@ -265,9 +266,9 @@ public void LogResolutionErrors(IEnumerable<SymbolFactory.ResolutionError> resol
                 Log($"Symbol resolution error: {error.Message}");
                 if (pos != null)
                 {
-                    Log(pos.Node.Range.Begin.Input.File);
-                    Log(pos.Node.Range.Begin.CurrentLine);
-                    Log(pos.Node.Range.Begin.Indicator);
+                    Log(pos.Node.Range.End.Input.File);
+                    Log(pos.Node.Range.Begin?.CurrentLine);
+                    Log(pos.Node.Range.Begin?.Indicator);
                     Log(pos.Node.Range.End.CurrentLine);
                     Log(pos.Node.Range.End.Indicator);
                 }

diff --git a/PlatoStandardLibrary/std.angles.library.plato b/PlatoStandardLibrary/std.angles.library.plato
@@ -1,6 +1,6 @@
 library Angles 
 {
-    Radians(x : Number): Angle
+    Radians(x: Number): Angle
         => x;
 
     Degrees(x: Number): Angle

diff --git a/PlatoStandardLibrary/std.easing.library.plato b/PlatoStandardLibrary/std.easing.library.plato
@@ -7,11 +7,6 @@ library Easings
     // https://github.com/ai/easings.net/blob/master/src/easings/easingsFunctions.ts
     // This is an extremely good example of why Plato matters as a language. 
     // When we look at the source code of the two other implementations. 
-
-    BlendEaseFunc(p: Numerical, easeIn: Function1, easeOut: Function1): Number 
-        => p < 0.5 
-            ? 0.5 * easeIn(p * 2) 
-            : 0.5 * easeOut(p * 2 - 1) + 0.5;
 
     InvertEaseFunc(p: Numerical, easeIn: Function1): Numerical 
         => 1 - easeIn(1 - p);
@@ -137,5 +132,5 @@ library Easings
             ? a :
                 (x <= a) 
                     ? b * (a.Pow2 - x.Pow2) / a).Sqrt.FromOne 
-                    : b + (b.FromOne / a.FromOne * (a.FromOne.Pow2 - x.MinusOne.Pow2).Sqrt;
+                    : b + (b.FromOne / a.FromOne * (a.FromOne.Pow2 - x.MinusOne.Pow2).Sqrt);
 }
diff --git a/PlatoWinFormsEditor/Editor.cs b/PlatoWinFormsEditor/Editor.cs
@@ -97,6 +97,11 @@ public void OnLogMessage(string logMsg)
             LogBuilder.AppendLine(logMsg);
         }
 
+        public void ApplyStyle(string kind, ParserRange range)
+        {
+
+        }
+
         public void ApplyStyle(string kind, int start, int length)
         {
             var style = Styling.Styles[kind];
@@ -115,24 +120,15 @@ public void ApplyStyles()
         {
             foreach (var node in Tokenizer.ParserNodes)
             {
-                if (Styling.Styles.ContainsKey(node.Name))
+                if (node.IsEnd && Styling.Styles.ContainsKey(node.Name))
                 {
                     ApplyStyle(node.Name, node.Start, node.Length);
                 }
             }
 
             foreach (var error in Parser.ParserErrors)
             {
-                var pos1 = error.ParentState.Position;
-                var pos2 = error.State.Position;
-                var cnt = pos2 - pos1;
-                if (cnt > 5)
-                {
-                    cnt = 5;
-                    pos1 = pos2 - cnt;
-                }
-
-                ApplyStyle("ERROR", pos1, cnt);
+                ApplyStyle("ERROR", error.Range);
             }
 
             // TODO: set the properties.