Add end offsets to AST and source map

setup.py

@@ -55,6 +55,7 @@
     python_requires='>=3.6',
     py_modules=['vyper'],
     install_requires=[
+        'asttokens>=1.1.13,<2',
         'pycryptodome>=3.5.1,<4',
     ],
     setup_requires=[

vyper/ast.py

@@ -14,7 +14,14 @@
     annotate_source_code,
 )
 
-BASE_NODE_ATTRIBUTES = ('node_id', 'source_code', 'col_offset', 'lineno')
+BASE_NODE_ATTRIBUTES = (
+    'node_id',
+    'source_code',
+    'col_offset',
+    'lineno',
+    'end_col_offset',
+    'end_lineno'
+)
 
 
 class VyperNode:

vyper/ast_utils.py

@@ -1,4 +1,5 @@
 import ast as python_ast
+import asttokens
 from typing import (
     Generator,
 )
@@ -43,6 +44,10 @@ def _build_vyper_ast_init_kwargs(
     yield ('node_id', node.node_id)  # type: ignore
     yield ('source_code', source_code)
 
+    end = node.last_token.end if hasattr(node, 'last_token') else (None, None)
+    yield ('end_lineno', end[0])
+    yield ('end_col_offset', end[1])
+
     if isinstance(node, python_ast.ClassDef):
         yield ('class_type', node.class_type)  # type: ignore
 
@@ -92,6 +97,7 @@ def parse_to_ast(source_code: str) -> list:
     class_types, reformatted_code = pre_parse(source_code)
     py_ast = python_ast.parse(reformatted_code)
     annotate_ast(py_ast, source_code, class_types)
+    asttokens.ASTTokens(source_code, tree=py_ast)
     # Convert to Vyper AST.
     vyper_ast = parse_python_ast(
         source_code=source_code,

vyper/compile_lll.py

@@ -65,9 +65,9 @@ def __new__(cls, sstr, *args, **kwargs):
     def __init__(self, sstr, pos=None):
         self.pc_debugger = False
         if pos is not None:
-            self.lineno, self.col_offset = pos
+            self.lineno, self.col_offset, self.end_lineno, self.end_col_offset = pos
         else:
-            self.lineno, self.col_offset = None, None
+            self.lineno, self.col_offset, self.end_lineno, self.end_col_offset = [None] * 4
 
 
 def apply_line_numbers(func):
@@ -453,7 +453,8 @@ def compile_to_assembly(code, withargs=None, existing_labels=None, break_dest=No
 def note_line_num(line_number_map, item, pos):
     # Record line number attached to pos.
     if isinstance(item, instruction) and item.lineno is not None:
-        line_number_map['pc_pos_map'][pos] = item.lineno, item.col_offset
+        offsets = (item.lineno, item.col_offset, item.end_lineno, item.end_col_offset)
+        line_number_map['pc_pos_map'][pos] = offsets
     added_line_breakpoint = note_breakpoint(line_number_map, item, pos)
     return added_line_breakpoint
 

vyper/parser/parser_utils.py

@@ -239,7 +239,12 @@ def get_length(arg):
 
 
 def getpos(node):
-    return (node.lineno, node.col_offset)
+    return (
+        node.lineno,
+        node.col_offset,
+        getattr(node, 'end_lineno', None),
+        getattr(node, 'end_col_offset', None)
+    )
 
 
 # Take a value representing a memory or storage location, and descend down to