status-im
/
edn.nim
mirror of https://github.com/status-im/edn.nim.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

line/column numbers for keywords

This commit is contained in:
Roland Sadowski 2020-02-04 19:27:48 +00:00
parent 8a77ab1ad6
commit 871e235a03
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/edn.nim
View File

@ -605,11 +605,9 @@ proc read_delimited_list(
result.comment_placement = Inside result.comment_placement = Inside
result.list = list result.list = list
proc add_line_col_meta(p: var EdnParser, node: var EdnNode): void = proc add_line_col_info(p: var EdnParser, node: var EdnNode): void =
let m = new_hmap()
node.line = p.line_number node.line = p.line_number
node.column = getColNumber(p, p.bufpos) node.column = getColNumber(p, p.bufpos)
discard add_meta(node, m)
proc maybe_add_comments(node: EdnNode, list_result: DelimitedListResult): EdnNode = proc maybe_add_comments(node: EdnNode, list_result: DelimitedListResult): EdnNode =
if list_result.comment_lines.len > 0: if list_result.comment_lines.len > 0:
@ -671,7 +669,7 @@ proc splice_conditional_exprs(list_result: DelimitedListResult): seq[EdnNode] =
proc read_list(p: var EdnParser): EdnNode = proc read_list(p: var EdnParser): EdnNode =
result = EdnNode(kind: EdnList) result = EdnNode(kind: EdnList)
add_line_col_meta(p, result) add_line_col_info(p, result)
var delimited_result = read_delimited_list(p, ')', {Recursive: true}.to_table()) var delimited_result = read_delimited_list(p, ')', {Recursive: true}.to_table())
result.list = splice_conditional_exprs(delimited_result) result.list = splice_conditional_exprs(delimited_result)
discard maybe_add_comments(result, delimited_result) discard maybe_add_comments(result, delimited_result)
@ -701,7 +699,7 @@ proc read_map(p: var EdnParser): EdnNode =
while i <= list.high - 1: while i <= list.high - 1:
result.map[list[i]] = list[i+1] result.map[list[i]] = list[i+1]
i = i + 2 i = i + 2
add_line_col_meta(p, result) add_line_col_info(p, result)
discard maybe_add_comments(result, list_result) discard maybe_add_comments(result, list_result)
const const
@ -754,13 +752,14 @@ proc read_ns_map(p: var EdnParser): EdnNode =
proc read_vector(p: var EdnParser): EdnNode = proc read_vector(p: var EdnParser): EdnNode =
result = EdnNode(kind: EdnVector) result = EdnNode(kind: EdnVector)
add_line_col_meta(p, result) add_line_col_info(p, result)
let delimited_result = read_delimited_list(p, ']', {Recursive: true}.to_table()) let delimited_result = read_delimited_list(p, ']', {Recursive: true}.to_table())
result.vec = splice_conditional_exprs(delimited_result) result.vec = splice_conditional_exprs(delimited_result)
discard maybe_add_comments(result, delimited_result) discard maybe_add_comments(result, delimited_result)
proc read_set(p: var EdnParser): EdnNode = proc read_set(p: var EdnParser): EdnNode =
result = EdnNode(kind: EdnSet) result = EdnNode(kind: EdnSet)
add_line_col_info(p, result)
let list_result = read_delimited_list(p, '}', {Recursive: true}.to_table()) let list_result = read_delimited_list(p, '}', {Recursive: true}.to_table())
var elements = list_result.list var elements = list_result.list
discard maybe_add_comments(result, list_result) discard maybe_add_comments(result, list_result)
@ -1307,15 +1306,24 @@ proc read_internal(p: var EdnParser): EdnNode =
if isDigit(p.buf[p.bufpos + 1]): if isDigit(p.buf[p.bufpos + 1]):
return read_num(p) return read_num(p)
else: else:
let column = getColNumber(p, p.bufpos)
token = read_token(p, false) token = read_token(p, false)
let line_num = p.line_number
result = interpret_token(token) result = interpret_token(token)
result.line = line_num
result.column = column
return result return result
let column = getColNumber(p, p.bufpos)
token = read_token(p, true) token = read_token(p, true)
if opts.suppress_read: if opts.suppress_read:
result = nil result = nil
else: else:
let line_num = p.line_number
result = interpret_token(token) result = interpret_token(token)
result.line = line_num
result.column = column
proc read*(p: var EdnParser): EdnNode = proc read*(p: var EdnParser): EdnNode =
result = read_internal(p) result = read_internal(p)