fix: Improve inplace/(post|pre) syntax

tokay-lang · Oct 17, 2024 · bfc5bb9 · bfc5bb9
1 parent 530a8ad
commit bfc5bb9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/compiler/parser.rs b/src/compiler/parser.rs
@@ -1798,6 +1798,10 @@ impl Parser {
                                                         "emit" => "sequence",
                                                         "children" =>
                                                             (value!([
+                                                                (value!([
+                                                                    "emit" => "identifier",
+                                                                    "value" => "_"
+                                                                ])),
                                                                 (value!([
                                                                     "emit" => "value_token_touch",
                                                                     "value" => "["
@@ -1814,10 +1818,6 @@ impl Parser {
                                                                     "emit" => "value_token_touch",
                                                                     "value" => "]"
                                                                 ])),
-                                                                (value!([
-                                                                    "emit" => "identifier",
-                                                                    "value" => "_"
-                                                                ])),
                                                                 (value!([
                                                                     "emit" => "call",
                                                                     "children" =>
@@ -2118,10 +2118,6 @@ impl Parser {
                                                                     "emit" => "identifier",
                                                                     "value" => "Variable"
                                                                 ])),
-                                                                (value!([
-                                                                    "emit" => "identifier",
-                                                                    "value" => "_"
-                                                                ])),
                                                                 (value!([
                                                                     "emit" => "op_mod_kle",
                                                                     "children" =>
@@ -5058,6 +5054,10 @@ impl Parser {
                                                                                 ]))
                                                                             ]))
                                                                     ])),
+                                                                    (value!([
+                                                                        "emit" => "identifier",
+                                                                        "value" => "_"
+                                                                    ])),
                                                                     (value!([
                                                                         "emit" => "value_instance",
                                                                         "children" =>

diff --git a/src/compiler/tokay.tok b/src/compiler/tokay.tok
@@ -1,5 +1,5 @@
 # The Tokay programming language
-# Copyright © 2023 by Jan Max Meyer, Phorward Software Technologies.
+# Copyright © 2024 by Jan Max Meyer, Phorward Software Technologies.
 # Licensed under the MIT license. See LICENSE for more information.
 #
 # This Tokay program expresses Tokay's grammar in itself.
@@ -127,7 +127,7 @@ Ccl : @{
 # Statics, Variables, Loads
 
 Subscript : @{
-    '[' _ Expression ']' _  ast("item")
+    _ '[' _ Expression ']'  ast("item")
 }
 
 Attribute : @{
@@ -147,7 +147,7 @@ Variable : @{
 }
 
 Lvalue : @{
-    Variable _ Subscript* ast("lvalue")  # Lvalue currently doesn't allow attribute assignment!
+    Variable Subscript*  ast("lvalue")  # Lvalue currently doesn't allow attribute assignment!
 }
 
 Load : @{
@@ -284,7 +284,7 @@ Atomic : @{
     TokenModifier
     Keyword<'if'> _ Expect<Expression> ___ Expect<Statement> \
         (___ Keyword<'else'> _ ___ Expect<Statement>)?  ast("op_if")
-    Keyword<'for'> _ Expect<Lvalue> Keyword<Expect<'in'>> _ Expect<Expression> \
+    Keyword<'for'> _ Expect<Lvalue> _ Keyword<Expect<'in'>> _ Expect<Expression> \
          ___ Expect<Statement>  ast("op_for")
     Keyword<'loop'> _ Expression ___ Block  ast("op_loop")
     Keyword<'loop'> _ Expect<Block>  ast("op_loop")

diff --git a/tests/list_add.tok b/tests/list_add.tok
@@ -25,7 +25,7 @@ l
 l = ,
 i = 0
 l += i
-l, ++i
+l ++i
 
 # iadd with mutable object
 l = ,
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ l @@
     l = ,
     i = 0
     l += i
-    l, ++i
+    l ++i
     # iadd with mutable object
     l = ,
@@ Expand Down @@