fix(functions): remove function body alias and use block (#111)

gleam-lang · Feb 7, 2025 · 3a5c285 · 3a5c285
1 parent 066704e
commit 3a5c285
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 66 deletions.
diff --git a/grammar.js b/grammar.js
@@ -255,13 +255,7 @@ module.exports = grammar({
           field("name", $.identifier),
           field("parameters", $.function_parameters),
           optional(seq("->", field("return_type", $._type))),
-          optional(
-            seq(
-              "{",
-              optional(field("body", alias($._statement_seq, $.function_body))),
-              "}"
-            )
-          )
+          optional(field("body", $.block))
         )
       ),
     function_parameters: ($) =>
@@ -406,9 +400,7 @@ module.exports = grammar({
           alias($.anonymous_function_parameters, $.function_parameters)
         ),
         optional(seq("->", field("return_type", $._type))),
-        "{",
-        field("body", alias($._statement_seq, $.function_body)),
-        "}"
+        field("body", $.block)
       ),
     anonymous_function_parameters: ($) =>
       seq(
@@ -426,7 +418,7 @@ module.exports = grammar({
         choice($._discard_param, $._name_param),
         optional($._type_annotation)
       ),
-    block: ($) => seq("{", $._statement_seq, "}"),
+    block: ($) => seq("{", optional($._statement_seq), "}"),
     case: ($) =>
       seq(
         "case",

diff --git a/test/corpus/attributes.txt b/test/corpus/attributes.txt
@@ -17,7 +17,7 @@ pub fn main() { todo }
     (visibility_modifier)
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo))))
 
 ================================================================================
@@ -44,7 +44,7 @@ pub fn wibble() { todo }
     (visibility_modifier)
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo))))
 
 ================================================================================
@@ -63,5 +63,5 @@ pub fn wibble() { todo }
     (visibility_modifier)
     name: (identifier)
     parameters: (function_parameters)
-    body: (function_body
+    body: (block
       (todo))))
diff --git a/test/corpus/cases.txt b/test/corpus/cases.txt
@@ -68,7 +68,7 @@ pub fn listed(names: List(String), person: Person) -> String {
           (type_identifier))))
     (type
       (type_identifier))
-    (function_body
+    (block
       (case
         (case_subjects
           (identifier))

diff --git a/test/corpus/destructuring.txt b/test/corpus/destructuring.txt
@@ -16,7 +16,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (case
         (case_subjects
           (identifier))
@@ -64,7 +64,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (let
         (record_pattern
           (constructor_name)

diff --git a/test/corpus/echo.txt b/test/corpus/echo.txt
@@ -13,7 +13,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (echo
         (integer)))))
 
@@ -34,7 +34,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (binary_expression
         (binary_expression
           (list)
@@ -59,7 +59,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (binary_expression
         (list)
         (pipeline_echo))
@@ -81,7 +81,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (echo
         (binary_expression
           (integer)
@@ -104,7 +104,7 @@ pub fn main() {
     (visibility_modifier)
     (identifier)
     (function_parameters)
-    (function_body
+    (block
       (echo
         (binary_expression
           (integer)