(ForNeVeR#74) Parser: labeled and switch statements

gsomix · Jul 21, 2022 · 535b898 · 535b898
1 parent 9d92cbc
commit 535b898
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 10 deletions.
diff --git a/Cesium.Ast/Statements.cs b/Cesium.Ast/Statements.cs
@@ -1,10 +1,19 @@
 using System.Collections.Immutable;
+using Yoakke.SynKit.C.Syntax;
+using Yoakke.SynKit.Lexer;
 
 namespace Cesium.Ast;
 
 // 6.8 Statements and blocks
 public abstract record Statement : IBlockItem;
 
+// 6.8.1 Labeled statement
+public record LabelStatement(string Identifier, Statement Body) : Statement;
+
+public record CaseStatement(IToken<CTokenType> Constant, Statement Body) : Statement;
+
+public record DefaultStatement(Statement Body) : Statement;
+
 // 6.8.2 Compound statement
 public record CompoundStatement(ImmutableArray<IBlockItem> Block) : Statement;
 
@@ -18,6 +27,8 @@ public record ExpressionStatement(Expression? Expression) : Statement;
 // 6.8.4 Selection statements
 public record IfElseStatement(Expression Expression, Statement TrueBranch, Statement? FalseBranch) : Statement;
 
+public record SwitchStatement(Expression Expression, Statement Body) : Statement;
+
 // 6.8.5 Iteration statements
 public record ForStatement(
     Expression? InitExpression,
@@ -30,4 +41,4 @@ public record GoToStatement(string Identifier) : Statement;
 
 public record BreakStatement : Statement;
 
-public record ReturnStatement(Expression Expression) : Statement;
+public record ReturnStatement(Expression Expression) : Statement;
diff --git a/Cesium.Parser.Tests/ParserTests/StatementParserTests.cs b/Cesium.Parser.Tests/ParserTests/StatementParserTests.cs
@@ -38,11 +38,11 @@ private static Task DoTest(string source)
     [Fact]
     public Task NestedIfs() => DoTest(@"
 if (1)
-    if (2) { 
+    if (2) {
         int x = 0;
     } else {
         int y = 1;
-    } 
+    }
 ");
 
     [Fact]
@@ -92,4 +92,23 @@ public Task ArrayAssigment() => DoTest(@"{
     int a[1];
     a[0] = 0;
 }");
+
+    [Fact]
+    public Task SwitchStatement_Empty() => DoTest(@"switch(x) { }");
+
+    [Fact]
+    public Task SwitchStatement_OneCase() => DoTest(@"switch(x) { case 0: break; }");
+
+    [Fact]
+    public Task SwitchStatement_MultiCases() => DoTest(@"switch(x) {
+    case 0: break;
+    case 1: break;
+}");
+
+    [Fact]
+    public Task SwitchStatement_MultiCasesWithDefault() => DoTest(@"switch(x) {
+    case 0: break;
+    case 1: break;
+    default: break;
+}");
 }
diff --git a/...Parser.Tests/ParserTests/verified/StatementParserTests.SwitchStatement_Empty.verified.txt b/...Parser.Tests/ParserTests/verified/StatementParserTests.SwitchStatement_Empty.verified.txt
@@ -0,0 +1,14 @@
+{
+  "$type": "Cesium.Ast.SwitchStatement, Cesium.Ast",
+  "Expression": {
+    "$type": "Cesium.Ast.ConstantExpression, Cesium.Ast",
+    "Constant": {
+      "Kind": "Identifier",
+      "Text": "x"
+    }
+  },
+  "Body": {
+    "$type": "Cesium.Ast.CompoundStatement, Cesium.Ast",
+    "Block": []
+  }
+}
diff --git a/...r.Tests/ParserTests/verified/StatementParserTests.SwitchStatement_MultiCases.verified.txt b/...r.Tests/ParserTests/verified/StatementParserTests.SwitchStatement_MultiCases.verified.txt
@@ -0,0 +1,35 @@
+{
+  "$type": "Cesium.Ast.SwitchStatement, Cesium.Ast",
+  "Expression": {
+    "$type": "Cesium.Ast.ConstantExpression, Cesium.Ast",
+    "Constant": {
+      "Kind": "Identifier",
+      "Text": "x"
+    }
+  },
+  "Body": {
+    "$type": "Cesium.Ast.CompoundStatement, Cesium.Ast",
+    "Block": [
+      {
+        "$type": "Cesium.Ast.CaseStatement, Cesium.Ast",
+        "Constant": {
+          "Kind": "IntLiteral",
+          "Text": "0"
+        },
+        "Body": {
+          "$type": "Cesium.Ast.BreakStatement, Cesium.Ast"
+        }
+      },
+      {
+        "$type": "Cesium.Ast.CaseStatement, Cesium.Ast",
+        "Constant": {
+          "Kind": "IntLiteral",
+          "Text": "1"
+        },
+        "Body": {
+          "$type": "Cesium.Ast.BreakStatement, Cesium.Ast"
+        }
+      }
+    ]
+  }
+}
diff --git a/...serTests/verified/StatementParserTests.SwitchStatement_MultiCasesWithDefault.verified.txt b/...serTests/verified/StatementParserTests.SwitchStatement_MultiCasesWithDefault.verified.txt
@@ -0,0 +1,41 @@
+{
+  "$type": "Cesium.Ast.SwitchStatement, Cesium.Ast",
+  "Expression": {
+    "$type": "Cesium.Ast.ConstantExpression, Cesium.Ast",
+    "Constant": {
+      "Kind": "Identifier",
+      "Text": "x"
+    }
+  },
+  "Body": {
+    "$type": "Cesium.Ast.CompoundStatement, Cesium.Ast",
+    "Block": [
+      {
+        "$type": "Cesium.Ast.CaseStatement, Cesium.Ast",
+        "Constant": {
+          "Kind": "IntLiteral",
+          "Text": "0"
+        },
+        "Body": {
+          "$type": "Cesium.Ast.BreakStatement, Cesium.Ast"
+        }
+      },
+      {
+        "$type": "Cesium.Ast.CaseStatement, Cesium.Ast",
+        "Constant": {
+          "Kind": "IntLiteral",
+          "Text": "1"
+        },
+        "Body": {
+          "$type": "Cesium.Ast.BreakStatement, Cesium.Ast"
+        }
+      },
+      {
+        "$type": "Cesium.Ast.DefaultStatement, Cesium.Ast",
+        "Body": {
+          "$type": "Cesium.Ast.BreakStatement, Cesium.Ast"
+        }
+      }
+    ]
+  }
+}
diff --git a/...rser.Tests/ParserTests/verified/StatementParserTests.SwitchStatement_OneCase.verified.txt b/...rser.Tests/ParserTests/verified/StatementParserTests.SwitchStatement_OneCase.verified.txt
@@ -0,0 +1,25 @@
+{
+  "$type": "Cesium.Ast.SwitchStatement, Cesium.Ast",
+  "Expression": {
+    "$type": "Cesium.Ast.ConstantExpression, Cesium.Ast",
+    "Constant": {
+      "Kind": "Identifier",
+      "Text": "x"
+    }
+  },
+  "Body": {
+    "$type": "Cesium.Ast.CompoundStatement, Cesium.Ast",
+    "Block": [
+      {
+        "$type": "Cesium.Ast.CaseStatement, Cesium.Ast",
+        "Constant": {
+          "Kind": "IntLiteral",
+          "Text": "0"
+        },
+        "Body": {
+          "$type": "Cesium.Ast.BreakStatement, Cesium.Ast"
+        }
+      }
+    ]
+  }
+}
diff --git a/Cesium.Parser/CParser.cs b/Cesium.Parser/CParser.cs
@@ -635,15 +635,28 @@ private static AssignmentInitializer MakeInitializer(Expression assignmentExpres
     // TODO: 6.7.10 Static assertions
 
     // 6.8 Statements and blocks
-    // TODO: [Rule("statement: labeled_statement")]
+    [Rule("statement: labeled_statement")]
     [Rule("statement: compound_statement")]
     [Rule("statement: expression_statement")]
     [Rule("statement: selection_statement")]
     [Rule("statement: iteration_statement")]
     [Rule("statement: jump_statement")]
     private static Statement MakeStatementIdentity(Statement statement) => statement;
 
-    // TODO: 6.8.1 Labeled statements
+    // 6.8.1 Labeled statements
+    [Rule("labeled_statement: Identifier ':' statement")]
+    private static Statement MakeLabelStatement(IToken identifier, IToken _, Statement block) =>
+        new LabelStatement(identifier.Text, block);
+
+    // TODO: constant or constant-expression? What's difference? gsomix.
+    [Rule("labeled_statement: 'case' constant ':' statement")]
+    private static Statement MakeCaseStatement(IToken _, ICToken constant, IToken __, Statement block) =>
+        new CaseStatement(constant, block);
+
+    [Rule("labeled_statement: 'default' ':' statement")]
+    private static Statement MakeDefaultStatement(IToken _, IToken __, Statement block) =>
+        new DefaultStatement(block);
+
     // 6.8.2 Compound statement
     [Rule("compound_statement: '{' block_item_list? '}'")]
     private static CompoundStatement MakeCompoundStatement(ICToken _, BlockItemList? block, ICToken __) =>
@@ -665,25 +678,34 @@ private static CompoundStatement MakeCompoundStatement(ICToken _, BlockItemList?
 
     // 6.8.4 Selection statements
     [Rule("selection_statement: 'if' '(' expression ')' statement")]
-    private static IfElseStatement MakeIfStatement(
+    private static Statement MakeIfStatement(
         IToken _,
         IToken __,
         Expression expression,
         IToken ___,
         Statement statement)
-        => new(expression, statement, null);
+        => new IfElseStatement(expression, statement, null);
 
     [Rule("selection_statement: 'if' '(' expression ')' statement 'else' statement")]
-    private static IfElseStatement MakeIfElseStatement(
+    private static Statement MakeIfElseStatement(
         IToken _,
         IToken __,
         Expression expression,
         IToken ___,
         Statement trueBranch,
         IToken ____,
         Statement falseBranch)
-        => new(expression, trueBranch, falseBranch);
-    // TODO: 6.8.4 Selection statements switch
+        => new IfElseStatement(expression, trueBranch, falseBranch);
+
+    [Rule("selection_statement: 'switch' '(' expression ')' statement")]
+    private static Statement MakeSwitchStatement(
+        IToken _, // switch
+        IToken __, // (
+        Expression expression,
+        IToken ___, // )
+        Statement body)
+        => new SwitchStatement(expression, body);
+
 
     // TODO: 6.8.5 Iteration statements
     [Rule("iteration_statement: 'for' '(' expression? ';' expression? ';' expression? ')' statement")]