(#72) Parser: support basic struct parsing

ForNeVeR · Feb 16, 2022 · 440b74e · 440b74e
1 parent aed2502
commit 440b74e
Show file tree

Hide file tree

Showing 31 changed files with 223 additions and 60 deletions.
diff --git a/Cesium.Ast/Declarations.cs b/Cesium.Ast/Declarations.cs
@@ -10,11 +10,35 @@ public record Declaration(
 public record InitDeclarator(Declarator Declarator, Initializer? Initializer = null);
 
 public interface IDeclarationSpecifier { }
+
+// 6.7.1 Storage-class specifiers
+public record StorageClassSpecifier(string Name) : IDeclarationSpecifier;
+
 // 6.7.2 Type specifiers
-public record TypeSpecifier(string TypeName) : IDeclarationSpecifier;
+public interface ITypeSpecifier : ISpecifierQualifierListItem, IDeclarationSpecifier { }
+
+public record SimpleTypeSpecifier(string TypeName) : ITypeSpecifier;
+public record StructOrUnionSpecifier(
+    ComplexTypeKind TypeKind,
+    string? Identifier,
+    ImmutableArray<StructDeclaration> StructDeclarations) : ITypeSpecifier;
+
+// 6.7.2.1 Structure and union specifiers
+public enum ComplexTypeKind
+{
+    Struct
+}
+
+public record StructDeclaration(
+    ImmutableArray<ISpecifierQualifierListItem> SpecifiersQualifiers,
+    ImmutableArray<StructDeclarator>? Declarators);
+
+public interface ISpecifierQualifierListItem {}
+
+public record StructDeclarator(Declarator Declarator);
 
 // 6.7.3 Type qualifiers
-public record TypeQualifier(string Name) : IDeclarationSpecifier;
+public record TypeQualifier(string Name) : IDeclarationSpecifier, ISpecifierQualifierListItem;
 
 // 6.7.7 Type names
 public record AbstractDeclarator(Pointer? Pointer = null, IDirectAbstractDeclarator? DirectAbstractDeclarator = null);

diff --git a/Cesium.CodeGen/Ir/DeclarationInfo.cs b/Cesium.CodeGen/Ir/DeclarationInfo.cs
@@ -89,7 +89,7 @@ private static (IType, string? cliImportMemberName) GetPrimitiveInfo(
         {
             switch (specifier)
             {
-                case TypeSpecifier ts:
+                case SimpleTypeSpecifier ts:
                     if (type != null)
                         throw new NotSupportedException(
                             $"Unsupported type definition after already resolved type {type}: {ts}.");

diff --git a/Cesium.CodeGen/Ir/ParametersInfo.cs b/Cesium.CodeGen/Ir/ParametersInfo.cs
@@ -17,7 +17,7 @@ public static ParametersInfo Of(ParameterTypeList parameters)
             if (specifiers.Length != 1 || declarator != null || abstractDeclarator != null) isVoid = false;
             else
             {
-                isVoid = specifiers.Single() is TypeSpecifier { TypeName: "void" };
+                isVoid = specifiers.Single() is SimpleTypeSpecifier { TypeName: "void" };
             }
         }
         else isVoid = false;

diff --git a/Cesium.Parser.Tests/ParserTests/DeclarationParserTests.CliImport.verified.txt b/Cesium.Parser.Tests/ParserTests/DeclarationParserTests.CliImport.verified.txt
@@ -6,7 +6,7 @@
       "MemberName": "System.Runtime.InteropServices.Marshal::AllocHGlobal"
     },
     {
-      "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+      "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
       "TypeName": "void"
     }
   ],

diff --git a/...m.Parser.Tests/ParserTests/DeclarationParserTests.InitializerDeclarationTest.verified.txt b/...m.Parser.Tests/ParserTests/DeclarationParserTests.InitializerDeclarationTest.verified.txt
@@ -2,7 +2,7 @@
   "$type": "Cesium.Ast.Declaration, Cesium.Ast",
   "Specifiers": [
     {
-      "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+      "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
       "TypeName": "int"
     }
   ],

diff --git a/Cesium.Parser.Tests/ParserTests/DeclarationParserTests.MultiDeclaration.verified.txt b/Cesium.Parser.Tests/ParserTests/DeclarationParserTests.MultiDeclaration.verified.txt
@@ -2,7 +2,7 @@
   "$type": "Cesium.Ast.Declaration, Cesium.Ast",
   "Specifiers": [
     {
-      "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+      "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
       "TypeName": "int"
     }
   ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.AnonymousArrayParameter.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.AnonymousArrayParameter.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "char"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.ArrayOfArrayParameter.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.ArrayOfArrayParameter.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "char"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.ArrayParameter.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.ArrayParameter.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "char"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.CharLiteral.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.CharLiteral.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],
@@ -30,7 +30,7 @@
             "$type": "Cesium.Ast.Declaration, Cesium.Ast",
             "Specifiers": [
               {
-                "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                 "TypeName": "char"
               }
             ],
@@ -63,7 +63,7 @@
             "$type": "Cesium.Ast.Declaration, Cesium.Ast",
             "Specifiers": [
               {
-                "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                 "TypeName": "char"
               }
             ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.CliImport.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.CliImport.verified.txt
@@ -11,7 +11,7 @@
             "MemberName": "Foo.Bar::Baz"
           },
           {
-            "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+            "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
             "TypeName": "int"
           }
         ],
@@ -40,7 +40,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],
@@ -65,7 +65,7 @@
             "$type": "Cesium.Ast.Declaration, Cesium.Ast",
             "Specifiers": [
               {
-                "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                 "TypeName": "int"
               }
             ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.ExpressionTest.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.ExpressionTest.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.FunctionCallTest.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.FunctionCallTest.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],
@@ -43,7 +43,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],
@@ -68,7 +68,7 @@
             "$type": "Cesium.Ast.Declaration, Cesium.Ast",
             "Specifiers": [
               {
-                "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                 "TypeName": "int"
               }
             ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.IntParameter.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.IntParameter.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "int"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.MainSignature.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.MainSignature.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "int"
                   }
                 ],
@@ -45,7 +45,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "char"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.MinimalProgramTest.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.MinimalProgramTest.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.NegationTest.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.NegationTest.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -30,7 +30,7 @@
             "$type": "Cesium.Ast.Declaration, Cesium.Ast",
             "Specifiers": [
               {
-                "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                 "TypeName": "int"
               }
             ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.PointerArrayParameter.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.PointerArrayParameter.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "char"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.PointerParameter.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.PointerParameter.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "void"
         }
       ],
@@ -26,7 +26,7 @@
                 "$type": "Cesium.Ast.ParameterDeclaration, Cesium.Ast",
                 "Specifiers": [
                   {
-                    "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                    "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                     "TypeName": "char"
                   }
                 ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.PrefixIncrementTest.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.PrefixIncrementTest.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],
@@ -30,7 +30,7 @@
             "$type": "Cesium.Ast.Declaration, Cesium.Ast",
             "Specifiers": [
               {
-                "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+                "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
                 "TypeName": "int"
               }
             ],

diff --git a/Cesium.Parser.Tests/ParserTests/FullParserTests.ReturnTest.verified.txt b/Cesium.Parser.Tests/ParserTests/FullParserTests.ReturnTest.verified.txt
@@ -5,7 +5,7 @@
       "$type": "Cesium.Ast.FunctionDefinition, Cesium.Ast",
       "Specifiers": [
         {
-          "$type": "Cesium.Ast.TypeSpecifier, Cesium.Ast",
+          "$type": "Cesium.Ast.SimpleTypeSpecifier, Cesium.Ast",
           "TypeName": "int"
         }
       ],