Merge pull request #40 from benber86/fix/struct

Fix/struct
benber86 · Aug 29, 2024 · 690a6f6 · 690a6f6
2 parents 998d8dd + d7a3f35
commit 690a6f6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,7 +38,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "mamushi"
-version = "0.0.4-a1"
+version = "0.0.4-a2"
 description = "Vyper Formatter"
 authors = ["benny <[email protected]>"]
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.4-a1
+current_version = 0.0.4-a2
 commit = False
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/src/mamushi/__version__.py b/src/mamushi/__version__.py
@@ -1 +1 @@
-__version__ = "0.0.4-a1"
+__version__ = "0.0.4-a2"
diff --git a/src/mamushi/formatting/whitespace.py b/src/mamushi/formatting/whitespace.py
@@ -113,7 +113,7 @@ def whitespace(leaf: Leaf) -> str:
     ):
         # no parentheses on calls, function sigs, logs and defs
         # except for returns
-        if t == tokens.LPAR and prev.type not in tokens.RETURN_TYPE:
+        if t == tokens.LPAR and prev.type not in {tokens.RETURN_TYPE}:
             return NO
 
         if t == tokens.LSQB:

diff --git a/src/mamushi/parsing/grammar.lark b/src/mamushi/parsing/grammar.lark
@@ -16,7 +16,7 @@ module: ( DOCSTRING
         | transient_def
         | implements_def
         | uses_def
-        | exports_def
+        | export
         | initializes_stmt
         | function_def
         | immutable_def
@@ -122,7 +122,7 @@ interface_def: _INTERFACE_DECL NAME ":" _NEWLINE _INDENT ( interface_function _N
 
 implements_def: "implements" ":" NAME
 uses_def: "uses" ":" NAME
-exports_def: "exports" ":" (attribute | tuple)
+export: "exports" ":" (attribute | "(" attribute ")"| tuple)
 
 _INITIALIZES_DECL: "initializes"
 initializes_stmt: _INITIALIZES_DECL ":" initializes_list

diff --git a/src/mamushi/parsing/tokens.py b/src/mamushi/parsing/tokens.py
@@ -182,7 +182,7 @@
 INTERFACE_DEF = "interface_def"
 IMPLEMENTS_DEF = "implements_def"
 USES_DEF = "uses_def"
-EXPORTS_DEF = "exports_def"
+EXPORT = "export"
 STRUCT_DEF = "struct_def"
 ENUM_DEF = "enum_def"
 EVENT_DEF = "event_def"
@@ -205,7 +205,7 @@
     INITIALIZES_STMT,
     IMPLEMENTS_DEF,
     USES_DEF,
-    EXPORTS_DEF,
+    EXPORT,
     CONSTANT_DEF,
     IMMUTABLE_DEF,
     INTERFACE_DEF,

diff --git a/...s/data/imports/imported_type_splitting.vy → ...s/data/modules/imported_type_splitting.vy b/...s/data/imports/imported_type_splitting.vy → ...s/data/modules/imported_type_splitting.vy