Fix wrong line number offset in line eval directives.

aradi · Mar 24, 2016 · bcbb699 · bcbb699
1 parent 4da652c
commit bcbb699
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/bin/fypp b/bin/fypp
@@ -1156,7 +1156,7 @@ class Renderer:
 
 
     def _get_eval(self, span, expr):
-        self._update_linenr(span[1])
+        self._update_linenr(span[0])
         try:
             result = self._evaluator.evaluate(expr)
         except Exception as exc:

diff --git a/test/test_fypp.py b/test/test_fypp.py
@@ -377,6 +377,11 @@ def _linenumbering(nummode):
      fypp.STRING
     ),
     #
+    ('builtin_var_line_in_lineeval', [],
+     '$:_LINE_\n',
+     '1\n'
+    ),
+    #
     ('escaped_control_inline', [],
      r'A#\{if False}\#B#\{endif}\#',
      'A#{if False}#B#{endif}#'