Cleaned up syntax naming

Draco-lang · Oct 31, 2024 · 1990d06 · 1990d06
1 parent 883abbe
commit 1990d06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Draco.Compiler/Internal/Syntax/Syntax.xml b/src/Draco.Compiler/Internal/Syntax/Syntax.xml
@@ -516,9 +516,9 @@
       The this parameter at the first place in a parameter list.
     </Documentation>
 
-    <Field Name="ThisToken" Type="SyntaxToken">
+    <Field Name="This" Type="SyntaxToken">
       <Documentation>
-        The this keyword, representing the type instance.
+        The 'this' keyword.
       </Documentation>
       <Token Kind="KeywordThis" />
     </Field>
@@ -687,9 +687,9 @@
       <Token Kind="KeywordPublic" />
     </Field>
 
-    <Field Name="GlobalKeyword" Type="SyntaxToken?">
+    <Field Name="GlobalModifier" Type="SyntaxToken?">
       <Documentation>
-        The optional global keyword that mark this variable as a global.
+        The optional global modifier that marks this variable as a global (static).
       </Documentation>
 
       <Token Kind="KeywordGlobal"/>
@@ -1384,13 +1384,13 @@
       The expression referencing the receiver of a member function.
     </Documentation>
 
-    <Field Name="Keyword" Type="SyntaxToken">
+    <Field Name="This" Type="SyntaxToken">
       <Documentation>
-        The this keyword.
+        The 'this' keyword.
       </Documentation>
+
       <Token Kind="KeywordThis"/>
     </Field>
-
   </Node>
 
   <Node Name="GroupingExpressionSyntax" Base="ExpressionSyntax">

diff --git a/src/Draco.SourceGeneration/TemplateUtils.cs b/src/Draco.SourceGeneration/TemplateUtils.cs
@@ -28,7 +28,8 @@ internal static class TemplateUtils
         "operator",
         "object",
         "bool",
-        "string"
+        "string",
+        "this",
     ];
 
     /// <summary>