Merge pull request #58 from benber86/fix/dec

version 0.0.6

Author: benber86

pyproject.toml

@@ -38,7 +38,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "mamushi"
-version = "0.0.5"
+version = "0.0.6"
 description = "Vyper Formatter"
 authors = ["benny <[email protected]>"]
 

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.5
+current_version = 0.0.6
 commit = True
 tag = True
 

src/mamushi/__version__.py

@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "0.0.6"

src/mamushi/formatting/whitespace.py

@@ -100,7 +100,6 @@ def whitespace(leaf: Leaf) -> str:
             tokens.CALL,
             tokens.EXTERNAL_CALL,
             tokens.EMPTY,
-            tokens.ABI_DECODE,
             tokens.SUBSCRIPT,
             tokens.INDEXED_ARGS,
             tokens.LOG_STMT,

src/mamushi/parsing/grammar.lark

@@ -151,7 +151,8 @@ _simple_stmt: (declaration
 declaration: variable ["=" expr]
 skip_assign: "_"
 multiple_assign: (atom_expr | skip_assign) ("," (atom_expr | skip_assign))+ [","]
-assign: (atom_expr | multiple_assign | "(" multiple_assign ")" ) "=" expr
+assign: (atom_expr | multiple_assign | "(" multiple_assign ")") "=" expr
+
 // NOTE: Keep these in sync with bin_op below
 ?aug_operator: "+"  -> add
              | "-"  -> sub
@@ -302,14 +303,8 @@ call: atom_expr "(" [arguments] ")"
 // special rule to handle types as "arguments" (for `empty` builtin)
 empty: "empty" "(" type ")"
 
-// special rule to handle types as "arguments" (for `_abi_decode` builtin)
-abi_decode: ("_abi_decode" | "abi_decode") "(" arg "," type ( "," kwarg )* ")"
-
-special_builtins: empty | abi_decode
-
 // NOTE: Must end recursive cycle like this (with `atom` calling `operation`)
 ?atom: literal
-     | special_builtins
      | tuple
      | list
      | dict
@@ -332,7 +327,7 @@ DEC_NUMBER: /0|[1-9](_?\d)*/
 HEX_NUMBER.2: /0x([_]?[0-9a-f])+/i
 OCT_NUMBER.2: /0o([_]?[0-7])+/i
 BIN_NUMBER.2 : /0b([_]?[01])+/i
-FLOAT_NUMBER.2: /(([1-9]\d*(_?\d*)*\.?\d*(_?\d*)?|\.\d+(_?\d*)?)(e[-+]?\d+(_?\d*)?)?|[1-9]\d*(_?\d*)?(e[-+]?\d+(_?\d*)?)?)/i
+FLOAT_NUMBER.2: /([0-9]+(_?[0-9])*\.([0-9]+(_?[0-9])*)?|\.[0-9]+(_?[0-9])*)(e[-+]?[0-9]+(_?[0-9])*)?|[0-9]+(_?[0-9])*e[-+]?[0-9]+(_?[0-9])*/i
 
 _number: DEC_NUMBER
        | HEX_NUMBER

src/mamushi/parsing/tokens.py

@@ -135,7 +135,6 @@
 CALL = "call"
 EXTERNAL_CALL = "external_call"
 EMPTY = "empty"
-ABI_DECODE = "abi_decode"
 ATTRIBUTE = "attribute"
 GET_VAR = "get_var"
 LOG_STMT = "log_stmt"

tests/data/assignments/complex_multiple_assignments.vy

@@ -0,0 +1,32 @@
+@internal
+def foo():
+    (a,
+            b,
+            c, d) = abi_decode(
+            slice(data,
+                   A,
+            B),
+            (uint256,
+                        uint256,            uint256,
+                         uint256),
+        )
+
+
+
+    a,  b,  c, d = abi_decode(  slice(              data, A,  B),         (uint256,
+                        uint256,            uint256  ,
+                         uint256),
+        )
+
+# output
+@internal
+def foo():
+    (a, b, c, d) = abi_decode(
+        slice(data, A, B),
+        (uint256, uint256, uint256, uint256),
+    )
+
+    a, b, c, d = abi_decode(
+        slice(data, A, B),
+        (uint256, uint256, uint256, uint256),
+    )

tests/data/assignments/operator_negative_numbers_spacing.vy

@@ -1,5 +1,6 @@
 @external
 def foo(x: int256) -> int256:
+    c: uint256 = as_wei_value(     0.0375,   "ether")
     if x <= -  41_446_531_673_892_822_313:
         return empty(int256)
     a: int256 = x + (  - 123)
@@ -8,6 +9,7 @@ def foo(x: int256) -> int256:
 # output
 @external
 def foo(x: int256) -> int256:
+    c: uint256 = as_wei_value(0.0375, "ether")
     if x <= -41_446_531_673_892_822_313:
         return empty(int256)
     a: int256 = x + (-123)