Made compatibility with lark 1.0!

Compatibility was broken by lark-parser/lark@6bb9e8a

Author: KOLANICH

.github/workflows/pr_check.yml

@@ -21,8 +21,6 @@ jobs:
             python-version: ${{ matrix.python-version }}
         - name: Install dependencies
           run: python -m pip install --upgrade "tox>=4.0.9,<5" build
-        - name: Generate parser file
-          run: python hcl2/parser.py
         - name: Build to generate the version file
           run: python3 -m build
         - name: Test with Tox

hcl2/transformer.py

@@ -4,7 +4,7 @@
 from collections import namedtuple
 from typing import List, Dict, Any
 
-from lark import Transformer, Discard
+from lark.visitors import Transformer, Discard, _DiscardType
 
 HEREDOC_PATTERN = re.compile(r'<<([a-zA-Z][a-zA-Z0-9._-]+)\n((.|\n)*?)\n\s*\1', re.S)
 HEREDOC_TRIM_PATTERN = re.compile(r'<<-([a-zA-Z][a-zA-Z0-9._-]+)\n((.|\n)*?)\n\s*\1', re.S)
@@ -89,14 +89,14 @@ def function_call(self, args: List) -> str:
         args = self.strip_new_line_tokens(args)
         args_str = ''
         if len(args) > 1:
-            args_str = ", ".join([str(arg) for arg in args[1]])
+            args_str = ", ".join([str(arg) for arg in args[1] if arg is not Discard])
         return f"{args[0]}({args_str})"
 
     def arguments(self, args: List) -> List:
         return args
 
-    def new_line_and_or_comma(self, args: List) -> Discard:
-        return Discard()
+    def new_line_and_or_comma(self, args: List) -> _DiscardType:
+        return Discard
 
     def block(self, args: List) -> Dict:
         args = self.strip_new_line_tokens(args)
@@ -216,8 +216,8 @@ def heredoc_template_trim(self, args: List) -> str:
 
         return '"%s"' % '\n'.join(lines)
 
-    def new_line_or_comment(self, args: List) -> Discard:
-        return Discard()
+    def new_line_or_comment(self, args: List) -> _DiscardType:
+        return Discard
 
     def for_tuple_expr(self, args: List) -> str:
         args = self.strip_new_line_tokens(args)
@@ -245,7 +245,7 @@ def strip_new_line_tokens(self, args: List) -> List:
         Remove new line and Discard tokens.
         The parser will sometimes include these in the tree so we need to strip them out here
         """
-        return [arg for arg in args if arg != "\n" and not isinstance(arg, Discard)]
+        return [arg for arg in args if arg != "\n" and arg is not Discard]
 
     def to_string_dollar(self, value: Any) -> Any:
         """Wrap a string in ${ and }"""

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
 ]
 requires-python = ">=3.7.0"
-dependencies = ["lark>=0.10.0,<0.11.0"]
+dependencies = ["lark>=1"]
 dynamic = ["version"]
 
 [project.readme]

requirements.txt

@@ -1,3 +1,3 @@
 # Place dependencies in this file, following the distutils format:
 # http://docs.python.org/2/distutils/setupscript.html#relationships-between-distributions-and-packages
-lark-parser>=0.11.0,<1.0
+lark>=1.1.5,<2.0