fix: type error location (#1169)

Signed-off-by: Louis Mandel <[email protected]>

Author: mandel

src/pdl/pdl_interpreter.py

@@ -373,14 +373,6 @@ def process_block(
     return result, background, scope, trace
 
 
-def context_in_contribute(block: AdvancedBlockType) -> bool:
-    if ContributeTarget.CONTEXT.value in block.contribute:
-        return True
-    if get_contribute_context_value(block.contribute) is not None:
-        return True
-    return False
-
-
 # A start-end time wrapper around `process_advanced_block`
 def process_advanced_block_timed(
     state: InterpreterState,
@@ -520,7 +512,7 @@ def process_advanced_block(  # noqa:C901
                     result_with_type_checking,
                     spec=block.spec,
                     msg="Type errors during spec checking:",
-                    loc=loc,
+                    loc=append(loc, "spec"),
                     trace=trace,
                 )
                 result = lazy_apply(checker, result)
@@ -589,6 +581,14 @@ def process_advanced_block(  # noqa:C901
     return result, background, new_scope, trace
 
 
+def context_in_contribute(block: AdvancedBlockType) -> bool:
+    if ContributeTarget.CONTEXT.value in block.contribute:
+        return True
+    if get_contribute_context_value(block.contribute) is not None:
+        return True
+    return False
+
+
 ResultWithTypeCheckingT = TypeVar("ResultWithTypeCheckingT")
 
 

tests/data/line/hello32.pdl

@@ -0,0 +1,5 @@
+defs:
+  x:
+    data: 1
+    spec: string
+text: ${x}

tests/test_examples_run.yaml

@@ -118,3 +118,4 @@ expected_runtime_error:
   - tests/data/line/hello28.pdl
   - tests/data/line/hello29.pdl
   - tests/data/line/hello30.pdl
+  - tests/data/line/hello32.pdl

tests/test_line_table.py

@@ -44,8 +44,8 @@ def test_line1(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello3.pdl",
     "errors": [
         "",
-        "tests/data/line/hello3.pdl:6 - Type errors during spec checking:",
-        "tests/data/line/hello3.pdl:6 -  World! should be of type <class 'int'>",
+        "tests/data/line/hello3.pdl:7 - Type errors during spec checking:",
+        "tests/data/line/hello3.pdl:7 -  World! should be of type <class 'int'>",
     ],
 }
 
@@ -100,8 +100,8 @@ def test_line8(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello9.pdl",
     "errors": [
         "",
-        "tests/data/line/hello9.pdl:3 - Type errors during spec checking:",
-        "tests/data/line/hello9.pdl:3 - hello should be of type <class 'int'>",
+        "tests/data/line/hello9.pdl:4 - Type errors during spec checking:",
+        "tests/data/line/hello9.pdl:4 - hello should be of type <class 'int'>",
     ],
 }
 
@@ -140,8 +140,8 @@ def test_line11(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello12.pdl",
     "errors": [
         "",
-        "tests/data/line/hello12.pdl:9 - Type errors during spec checking:",
-        "tests/data/line/hello12.pdl:9 - How are you? should be of type <class 'bool'>",
+        "tests/data/line/hello12.pdl:11 - Type errors during spec checking:",
+        "tests/data/line/hello12.pdl:11 - How are you? should be of type <class 'bool'>",
     ],
 }
 
@@ -154,8 +154,8 @@ def test_line12(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello13.pdl",
     "errors": [
         "",
-        "tests/data/line/hello13.pdl:9 - Type errors during spec checking:",
-        "tests/data/line/hello13.pdl:9 - 1 should be of type <class 'str'>",
+        "tests/data/line/hello13.pdl:12 - Type errors during spec checking:",
+        "tests/data/line/hello13.pdl:12 - 1 should be of type <class 'str'>",
     ],
 }
 
@@ -195,8 +195,8 @@ def test_line15(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello16.pdl",
     "errors": [
         "",
-        "tests/data/line/hello16.pdl:8 - Type errors during spec checking:",
-        "tests/data/line/hello16.pdl:8 - 30 should be of type <class 'str'>",
+        "tests/data/line/hello16.pdl:10 - Type errors during spec checking:",
+        "tests/data/line/hello16.pdl:10 - 30 should be of type <class 'str'>",
     ],
 }
 
@@ -209,8 +209,8 @@ def test_line16(capsys: CaptureFixture[str]):
     "file": "tests/data/line/hello17.pdl",
     "errors": [
         "",
-        "tests/data/line/hello17.pdl:3 - Type errors during spec checking:",
-        "tests/data/line/hello17.pdl:3 - hello should be of type <class 'int'>",
+        "tests/data/line/hello17.pdl:4 - Type errors during spec checking:",
+        "tests/data/line/hello17.pdl:4 - hello should be of type <class 'int'>",
     ],
 }
 
@@ -405,3 +405,17 @@ def test_line30(capsys: CaptureFixture[str]):
 
 def test_line31(capsys: CaptureFixture[str]):
     do_test(line31, capsys)
+
+
+line32 = {
+    "file": "tests/data/line/hello32.pdl",
+    "errors": [
+        "",
+        "tests/data/line/hello32.pdl:4 - Type errors during spec checking:",
+        "tests/data/line/hello32.pdl:4 - 1 should be of type <class 'str'>",
+    ],
+}
+
+
+def test_line32(capsys: CaptureFixture[str]):
+    do_test(line32, capsys)

tests/test_runtime_errors.py

@@ -79,7 +79,7 @@ def test_type_result():
         exec_str(prog_str)
     assert (
         str(exc.value.message)
-        == "Type errors during spec checking:\nline 0 - Hello should be of type <class 'int'>"
+        == "Type errors during spec checking:\nline 3 - Hello should be of type <class 'int'>"
     )