Parser done

src/Draco.Compiler.Tests/Services/CodeCompletionTests.cs

@@ -38,13 +38,13 @@ public void TestLocalCompletionGlobalVariable()
     {
         // TODO: Can we get rid of all this filtering by filtering in the completion service?
         var completions = GetCompletionWords("""
-            val global = 5;
+            val globalVar = 5;
             func main(){
                 var local = gl|
             }
             """);
 
-        AssertCompletions(completions, "global");
+        AssertCompletions(completions, "globalVar");
     }
 
     [Fact]
@@ -78,11 +78,11 @@ func main(){
     public void TestGlobalCompletionGlobalVariable()
     {
         var completions = GetCompletionWords("""
-            val global = 5;
+            val globalVar = 5;
             val x = gl|
             """);
 
-        AssertCompletions(completions, "global");
+        AssertCompletions(completions, "globalVar");
     }
 
     [Fact]

src/Draco.Compiler/Internal/Syntax/Parser.cs

@@ -38,10 +38,15 @@ internal sealed class Parser(
     private enum DeclarationContext
     {
         /// <summary>
-        /// Global, like in a compilation unit, module, class, ...
+        /// Global, like in a compilation unit or module.
         /// </summary>
         Global,
 
+        /// <summary>
+        /// Inside a class declaration body.
+        /// </summary>
+        Class,
+
         /// <summary>
         /// Local to a function body/expression/code-block.
         /// </summary>
@@ -556,6 +561,7 @@ private ClassDeclarationSyntax ParseClassDeclaration(SyntaxList<AttributeSyntax>
         var body = this.ParseClassBody();
 
         return new ClassDeclarationSyntax(
+            attributes,
             visibility,
             valueModifier,
             classKeyword,
@@ -583,7 +589,7 @@ private ClassBodySyntax ParseClassBody()
                 if (this.PeekKind() is TokenKind.EndOfInput or TokenKind.CurlyClose) break;
 
                 // Parse a declaration
-                var decl = this.ParseDeclaration(DeclarationContext.Global);
+                var decl = this.ParseDeclaration(DeclarationContext.Class);
                 decls.Add(decl);
             }
             var closeBrace = this.Expect(TokenKind.CurlyClose);
@@ -594,7 +600,7 @@ private ClassBodySyntax ParseClassBody()
             var input = this.Synchronize(t => t.Kind switch
             {
                 TokenKind.Semicolon or TokenKind.CurlyClose => false,
-                _ when this.IsDeclarationStarter(DeclarationContext.Global) => false,
+                _ when this.IsDeclarationStarter(DeclarationContext.Class) => false,
                 _ => true,
             });
             var info = DiagnosticInfo.Create(SyntaxErrors.UnexpectedInput, formatArgs: "class body");
@@ -629,7 +635,11 @@ private VariableDeclarationSyntax ParseVariableDeclaration(
 
         // Global modifier
         this.Matches(TokenKind.KeywordGlobal, out var globalModifier);
-        // TODO: We need more info to check, if this is an error
+        if (context != DeclarationContext.Class && globalModifier is not null)
+        {
+            var info = DiagnosticInfo.Create(SyntaxErrors.UnexpectedGlobalModifier);
+            this.AddDiagnostic(globalModifier, info);
+        }
 
         // Field modifier
         this.Matches(TokenKind.KeywordField, out var fieldModifier);
@@ -708,7 +718,7 @@ private FunctionDeclarationSyntax ParseFunctionDeclaration(
         TypeSpecifierSyntax? returnType = null;
         if (this.PeekKind() == TokenKind.Colon) returnType = this.ParseTypeSpecifier();
 
-        var body = this.ParseFunctionBody();
+        var body = this.ParseFunctionBody(context);
 
         return new FunctionDeclarationSyntax(
             attributes,
@@ -882,8 +892,9 @@ private GenericParameterSyntax ParseGenericParameter()
     /// <summary>
     /// Parses a function body.
     /// </summary>
+    /// <param name="ctx">The current context we are in.</param>
     /// <returns>The parsed <see cref="FunctionBodySyntax"/>.</returns>
-    private FunctionBodySyntax ParseFunctionBody()
+    private FunctionBodySyntax ParseFunctionBody(DeclarationContext ctx)
     {
         if (this.Matches(TokenKind.Assign, out var assign))
         {
@@ -906,7 +917,7 @@ private FunctionBodySyntax ParseFunctionBody()
             var input = this.Synchronize(t => t.Kind switch
             {
                 TokenKind.Semicolon or TokenKind.CurlyClose => false,
-                _ when this.IsDeclarationStarter(DeclarationContext.Global) => false,
+                _ when this.IsDeclarationStarter(ctx) => false,
                 _ => true,
             });
             var info = DiagnosticInfo.Create(SyntaxErrors.UnexpectedInput, formatArgs: "function body");

src/Draco.Compiler/Internal/Syntax/Syntax.xml

@@ -341,6 +341,12 @@
       A class declaration.
     </Documentation>
 
+    <Field Name="Attributes" Type="SyntaxList&lt;AttributeSyntax&gt;?">
+      <Documentation>
+        The attributes of this class.
+      </Documentation>
+    </Field>
+
     <Field Name="VisibilityModifier" Type="SyntaxToken?">
       <Documentation>
         The visibility modifier keyword possibly starting the declaration.

src/Draco.Compiler/Internal/Syntax/SyntaxErrors.cs

@@ -191,4 +191,13 @@ internal static class SyntaxErrors
         severity: DiagnosticSeverity.Error,
         format: "unexpected field modifier in a local context",
         code: Code(20));
+
+    /// <summary>
+    /// There is a global modifier in a global or local context.
+    /// </summary>
+    public static readonly DiagnosticTemplate UnexpectedGlobalModifier = DiagnosticTemplate.Create(
+        title: "unexpected global modifier",
+        severity: DiagnosticSeverity.Error,
+        format: "unexpected global modifier outside of class declaration",
+        code: Code(21));
 }