From df305457c82a7a9d6e9791ae12a75c7cd16fe663 Mon Sep 17 00:00:00 2001
From: ProgramSnail <PurpureBacterium@yandex.ru>
Date: Sat, 22 Jul 2023 13:34:19 +0300
Subject: [PATCH] minor fixes, changes, required for usage

---
 corpus/test.langexp |  2 +-
 grammar.js          | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/corpus/test.langexp b/corpus/test.langexp
index f7fdf18..4b3e72f 100644
--- a/corpus/test.langexp
+++ b/corpus/test.langexp
@@ -2,7 +2,7 @@
 Test
 ================================================================================
 
-#! lang
+#!/usr/bin/env lang
 
 :: module; // import module to current namespace
 
diff --git a/grammar.js b/grammar.js
index 924520e..8ccb6c9 100644
--- a/grammar.js
+++ b/grammar.js
@@ -82,8 +82,8 @@ module.exports = grammar({
     case: $ => seq(
       choice(':=', '=:'),
       $._expression,
-      optional(seq(choice('??', 'if'), $._expression)),
-      optional(seq($._do, $._expression)),
+      optional(seq(choice('??', 'if'), field('condition', $._expression))),
+      optional(field('expression', seq($._do, $._expression))),
     ),
 
     match: $ => seq(
@@ -108,11 +108,11 @@ module.exports = grammar({
     loop: $ => seq(
       choice('@', 'for'),
       optional(choice(
-        field('condition', $._expression),
-        seq(field('variable', $._expression), ':', field('interval', $._expression)),
+        $._expression,
+        seq($._expression, ':', $._expression),
       )),
       $._do,
-      field('expression', $._expression),
+      $._expression,
     ),
 
     // --- operators
@@ -134,7 +134,7 @@ module.exports = grammar({
 
     // --- modifiers
 
-    return: $ => seq(choice('return', 'bring'), field('value', $._expression)),
+    return: $ => seq(choice('return', 'bring'), $._expression),
 
     name_definition: $ => seq(
       $._var_let,
@@ -164,7 +164,7 @@ module.exports = grammar({
     ),
 
     constructor: $ => seq(
-      $.type,
+      field('type', $.type),
       repeat1(seq(optional($.annotation_identifier), $._scoped_expression)),
     ),