(#72) Parser: fixes after the merge

ForNeVeR · Mar 27, 2022 · 7659e22 · 7659e22
1 parent f040d95
commit 7659e22
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/Cesium.CodeGen.Tests/Cesium.CodeGen.Tests.csproj b/Cesium.CodeGen.Tests/Cesium.CodeGen.Tests.csproj
@@ -27,4 +27,11 @@
       <ProjectReference Include="..\Cesium.Test.Framework\Cesium.Test.Framework.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="verified\CodeGenMethodTests.AmbiguousCallTest.verified.txt">
+        <ParentFile>CodeGenMethodTests</ParentFile>
+        <DependentUpon>CodeGenMethodTests.cs</DependentUpon>
+      </None>
+    </ItemGroup>
+
 </Project>
diff --git a/...ethodTests.AmbiguousCallTest.verified.txt → ...ethodTests.AmbiguousCallTest.verified.txt b/...ethodTests.AmbiguousCallTest.verified.txt → ...ethodTests.AmbiguousCallTest.verified.txt
diff --git a/Cesium.Parser.Tests/Cesium.Parser.Tests.csproj b/Cesium.Parser.Tests/Cesium.Parser.Tests.csproj
@@ -40,6 +40,18 @@
         <ParentFile>StatementParserTests</ParentFile>
         <DependentUpon>StatementParserTests.cs</DependentUpon>
       </None>
+      <None Update="ParserTests\verified\DeclarationParserTests.ComplexFunctionPointerTypeDef.verified.txt">
+        <ParentFile>DeclarationParserTests</ParentFile>
+        <DependentUpon>DeclarationParserTests.cs</DependentUpon>
+      </None>
+      <None Update="ParserTests\verified\DeclarationParserTests.FunctionPointerTypeDef.verified.txt">
+        <ParentFile>DeclarationParserTests</ParentFile>
+        <DependentUpon>DeclarationParserTests.cs</DependentUpon>
+      </None>
+      <None Update="ParserTests\verified\DeclarationParserTests.FunctionTypeDef.verified.txt">
+        <ParentFile>DeclarationParserTests</ParentFile>
+        <DependentUpon>DeclarationParserTests.cs</DependentUpon>
+      </None>
     </ItemGroup>
 
 </Project>
diff --git a/...omplexFunctionPointerTypeDef.verified.txt → ...omplexFunctionPointerTypeDef.verified.txt b/...omplexFunctionPointerTypeDef.verified.txt → ...omplexFunctionPointerTypeDef.verified.txt
diff --git a/...Tests.FunctionPointerTypeDef.verified.txt → ...Tests.FunctionPointerTypeDef.verified.txt b/...Tests.FunctionPointerTypeDef.verified.txt → ...Tests.FunctionPointerTypeDef.verified.txt
diff --git a/...nParserTests.FunctionTypeDef.verified.txt → ...nParserTests.FunctionTypeDef.verified.txt b/...nParserTests.FunctionTypeDef.verified.txt → ...nParserTests.FunctionTypeDef.verified.txt
diff --git a/.../FullParserTests.AbsCallTest.verified.txt → .../FullParserTests.AbsCallTest.verified.txt b/.../FullParserTests.AbsCallTest.verified.txt → .../FullParserTests.AbsCallTest.verified.txt
@@ -59,7 +59,8 @@
                     },
                     "Arguments": [
                       {
-                        "$type": "Cesium.Ast.NegationExpression, Cesium.Ast",
+                        "$type": "Cesium.Ast.UnaryOperatorExpression, Cesium.Ast",
+                        "Operator": "-",
                         "Target": {
                           "$type": "Cesium.Ast.ConstantExpression, Cesium.Ast",
                           "Constant": {
@@ -76,8 +77,8 @@
           },
           {
             "$type": "Cesium.Ast.AmbiguousBlockItem, Cesium.Ast",
-            "PossibleFunction": "exit",
-            "PossibleArgument": "exitCode"
+            "Item1": "exit",
+            "Item2": "exitCode"
           }
         ]
       }

diff --git a/Cesium.Parser/CParser.cs b/Cesium.Parser/CParser.cs
@@ -666,19 +666,21 @@ private static IfElseStatement MakeIfStatement(
         IToken __,
         Expression expression,
         IToken ___,
-        Statement statement)
-        => new(expression, statement, null);
+        IBlockItem statement) =>
+        // TODO[#115]: This direct cast should't be necessary. It is here because of the "lexer hack".
+        new(expression, (Statement)statement, null);
 
     [Rule("selection_statement: 'if' '(' expression ')' statement 'else' statement")]
     private static IfElseStatement MakeIfElseStatement(
         IToken _,
         IToken __,
         Expression expression,
         IToken ___,
-        Statement trueBranch,
+        IBlockItem trueBranch,
         IToken ____,
-        Statement falseBranch)
-        => new(expression, trueBranch, falseBranch);
+        IBlockItem falseBranch)
+        // TODO[#115]: These direct casts should't be necessary. They are here because of the "lexer hack".
+        => new(expression, (Statement)trueBranch, (Statement)falseBranch);
     // TODO: 6.8.4 Selection statements switch
 
     // TODO: 6.8.5 Iteration statements