fix merge conflict

tserg · Nov 17, 2024 · a8ad00a · a8ad00a
1 parent 04679ce
commit a8ad00a
Showing 1 changed file with 5 additions and 39 deletions.
diff --git a/vyper/ast/pre_parser.py b/vyper/ast/pre_parser.py
@@ -228,34 +228,6 @@ def parse(self, code: str):
                             compiler_version = pragma.removeprefix("version ").strip()
                             validate_version_pragma(compiler_version, code, start)
                             settings.compiler_version = compiler_version
-                    # TODO: refactor these to something like Settings.from_pragma
-                    elif pragma.startswith("optimize "):
-                        if settings.optimize is not None:
-                            raise StructureException("pragma optimize specified twice!", start)
-                        try:
-                            mode = pragma.removeprefix("optimize").strip()
-                            settings.optimize = OptimizationLevel.from_string(mode)
-                        except ValueError:
-                            raise StructureException(f"Invalid optimization mode `{mode}`", start)
-                    elif pragma.startswith("evm-version "):
-                        if settings.evm_version is not None:
-                            raise StructureException("pragma evm-version specified twice!", start)
-                        evm_version = pragma.removeprefix("evm-version").strip()
-                        if evm_version not in EVM_VERSIONS:
-                            raise StructureException(f"Invalid evm version: `{evm_version}`", start)
-                        settings.evm_version = evm_version
-                    elif pragma.startswith("experimental-codegen") or pragma.startswith("venom"):
-                        if settings.experimental_codegen is not None:
-                            raise StructureException(
-                                "pragma experimental-codegen/venom specified twice!", start
-                            )
-                        settings.experimental_codegen = True
-                    elif pragma.startswith("enable-decimals"):
-                        if settings.enable_decimals is not None:
-                            raise StructureException(
-                                "pragma enable_decimals specified twice!", start
-                            )
-                        settings.enable_decimals = True
 
                         # TODO: refactor these to something like Settings.from_pragma
                         elif pragma.startswith("optimize "):
@@ -265,24 +237,18 @@ def parse(self, code: str):
                                 mode = pragma.removeprefix("optimize").strip()
                                 settings.optimize = OptimizationLevel.from_string(mode)
                             except ValueError:
-                                raise StructureException(
-                                    f"Invalid optimization mode `{mode}`", start
-                                )
+                                raise StructureException(f"Invalid optimization mode `{mode}`", start)
                         elif pragma.startswith("evm-version "):
                             if settings.evm_version is not None:
-                                raise StructureException(
-                                    "pragma evm-version specified twice!", start
-                                )
+                                raise StructureException("pragma evm-version specified twice!", start)
                             evm_version = pragma.removeprefix("evm-version").strip()
                             if evm_version not in EVM_VERSIONS:
-                                raise StructureException(
-                                    f"Invalid evm version: `{evm_version}`", start
-                                )
+                                raise StructureException(f"Invalid evm version: `{evm_version}`", start)
                             settings.evm_version = evm_version
-                        elif pragma.startswith("experimental-codegen"):
+                        elif pragma.startswith("experimental-codegen") or pragma.startswith("venom"):
                             if settings.experimental_codegen is not None:
                                 raise StructureException(
-                                    "pragma experimental-codegen specified twice!", start
+                                    "pragma experimental-codegen/venom specified twice!", start
                                 )
                             settings.experimental_codegen = True
                         elif pragma.startswith("enable-decimals"):