fix: fix pragma settings parsing

dasy/compiler.py

@@ -11,6 +11,7 @@
     build_layout_output,
     build_opcodes_output,
 )
+from vyper.compiler.settings import Settings
 from dasy.parser import parse_src
 from dasy.parser.utils import filename_to_contract_name
 
@@ -74,13 +75,16 @@ def layout(self):
 
 def generate_compiler_data(src: str, name="DasyContract") -> CompilerData:
     (ast, settings) = parse_src(src)
+    settings = Settings(**settings)
     data = CompilerData(
         "",
         ast.name or name,
         None,
         source_id=0,
-        **settings,
+        settings=settings,
     )
+    print(data)
+    print(data.settings)
     data.vyper_module = ast
     return data
 

dasy/parser/parse.py

@@ -252,6 +252,7 @@ def parse_src(src: str):
                 add_src_map(src, element, v)
         elif isinstance(ast, dict):
             settings.update(ast)
+            continue
         elif ast:
             add_src_map(src, element, ast)
         else:

examples/Transient.vy

@@ -0,0 +1,6 @@
+#pragma evm-version cancun
+
+@nonreentrant("lock")
+@external
+def foo() -> uint256:
+    return 4

examples/nonreentrant.dasy

@@ -1,4 +1,4 @@
-(pragma :evm-version "cancun")
+(pragma :evm-version "paris")
 
 (defn func0 [] [:external (nonreentrant "lock")]
   (raw_call msg/sender b"" :value 0))

examples/nonreentrant2.dasy

@@ -0,0 +1,14 @@
+;; (interface! "examples/nonreentrantenforcer.dasy")
+(definterface Nonreentrantenforcer
+    (defn func0 [] :nonpayable))
+
+(defvar target (public Nonreentrantenforcer))
+
+(defn __init__ [:address target] :external
+  (set self/target (Nonreentrantenforcer target)))
+
+(defn callback [] :external
+  (.func0 self/target))
+
+(defn __fallback__ [] :external
+  (.func0 self/target))

examples/nonreentrantenforcer.dasy

@@ -0,0 +1,10 @@
+(pragma :evm-version "paris")
+
+(defn func0 [] [:external (nonreentrant "lock")]
+  (raw_call msg/sender b"" :value 0))
+
+(defn func1 [] [:external (nonreentrant "lock_2")]
+  (raw_call msg/sender b"" :value 0))
+
+(defn func2 [] [:external (nonreentrant "lock_2")]
+  (raw_call msg/sender b"" :value 0))

examples/transient_nonreentrant.dasy

@@ -0,0 +1,10 @@
+(pragma :evm-version "cancun")
+
+(defn func0 [] [:external (nonreentrant "lock")]
+  (raw_call msg/sender b"" :value 0))
+
+(defn func1 [] [:external (nonreentrant "lock_2")]
+  (raw_call msg/sender b"" :value 0))
+
+(defn func2 [] [:external (nonreentrant "lock_2")]
+  (raw_call msg/sender b"" :value 0))

tests/test_dasy.py

@@ -340,7 +340,10 @@ def testInterface():
 
 
 def test_reentrancy():
-    c = compile("examples/nonreentrant.dasy")  # noqa: F841
+    # TODO: This test should fail!
+    c = compile("examples/nonreentrantenforcer.dasy")  # noqa: F841
+    helper = compile("examples/nonreentrant2.dasy", c.address)  # noqa: F841
+    helper.callback()
 
 
 def test_auction():