A few fixes for ranges of diagnostic messages (#187)

Author: c42f

src/parse_stream.jl

@@ -778,10 +778,17 @@ function steal_token_bytes!(stream::ParseStream, pos::ParseStreamPosition, numby
     return t2_is_empty
 end
 
+# Get position of last item emitted into the output stream
 function Base.position(stream::ParseStream)
     ParseStreamPosition(lastindex(stream.tokens), lastindex(stream.ranges))
 end
 
+# Get position of next item to be emitted into the output stream
+# TODO: Figure out how to remove this? It's only used with emit_diagnostic
+function next_position(stream::ParseStream)
+    ParseStreamPosition(lastindex(stream.tokens)+1, lastindex(stream.ranges)+1)
+end
+
 """
     emit(stream, mark, kind, flags = EMPTY_FLAGS; error=nothing)
 
@@ -837,10 +844,6 @@ function emit_diagnostic(stream::ParseStream, mark::ParseStreamPosition; kws...)
                      _next_byte(stream) - 1; kws...)
 end
 
-function emit_diagnostic(stream::ParseStream, r::NTuple{2,ParseStreamPosition}; kws...)
-    emit_diagnostic(stream, first(r), last(r); kws...)
-end
-
 function emit_diagnostic(stream::ParseStream, mark::ParseStreamPosition,
                          end_mark::ParseStreamPosition; kws...)
     fbyte = token_first_byte(stream, mark.token_index)

src/parser.jl

@@ -113,6 +113,10 @@ function Base.position(ps::ParseState, args...)
     position(ps.stream, args...)
 end
 
+function next_position(ps::ParseState, args...)
+    next_position(ps.stream, args...)
+end
+
 function emit(ps::ParseState, args...; kws...)
     emit(ps.stream, args...; kws...)
 end
@@ -1232,11 +1236,15 @@ function parse_unary(ps::ParseState)
         # last case wrong)
         op_pos = bump_dotsplit(ps, emit_dot_node=true)
 
-        # Setup possible whitespace error between operator and (
-        ws_mark = position(ps)
-        bump_trivia(ps)
-        ws_mark_end = position(ps)
-        ws_error_pos = emit(ps, ws_mark, K"TOMBSTONE")
+        space_before_paren = preceding_whitespace(t2)
+        if space_before_paren
+            # Setup possible whitespace error between operator and (
+            ws_node_mark = position(ps)
+            ws_mark = next_position(ps)
+            bump_trivia(ps)
+            ws_error_pos = emit(ps, ws_node_mark, K"TOMBSTONE")
+            ws_mark_end = next_position(ps)
+        end
 
         mark_before_paren = position(ps)
         bump(ps, TRIVIA_FLAG) # (
@@ -1251,7 +1259,7 @@ function parse_unary(ps::ParseState)
         # The precedence between unary + and any following infix ^ depends on
         # whether the parens are a function call or not
         if opts.is_paren_call
-            if preceding_whitespace(t2)
+            if space_before_paren
                 # Whitespace not allowed before prefix function call bracket
                 # + (a,b)   ==> (call + (error) a b)
                 reset_node!(ps, ws_error_pos, kind=K"error")
@@ -1592,7 +1600,7 @@ function parse_call_chain(ps::ParseState, mark, is_macrocall=false)
                 # A.B.@x  ==>  (macrocall (. (. A (quote B)) (quote @x)))
                 # @A.B.x  ==>  (macrocall (. (. A (quote B)) (quote @x)))
                 # [email protected]  ==>  (macrocall (. (. A (error-t) B) (quote @x)))
-                emit_diagnostic(ps, macro_atname_range,
+                emit_diagnostic(ps, macro_atname_range...,
                     error="`@` must appear on first or last macro name component")
                 bump(ps, TRIVIA_FLAG, error="Unexpected `.` after macro name")
             else
@@ -1646,7 +1654,7 @@ function parse_call_chain(ps::ParseState, mark, is_macrocall=false)
                 end
                 parse_macro_name(ps)
                 macro_name_position = position(ps)
-                macro_atname_range = (m, macro_name_position)
+                macro_atname_range = (m, next_position(ps))
                 emit(ps, m, K"quote")
                 emit(ps, mark, K".")
             elseif k == K"'"
@@ -2484,10 +2492,12 @@ function parse_import_path(ps::ParseState)
     # import . .A    ==> (import (. . . A))
     first_dot = true
     while true
-        m = position(ps)
-        bump_trivia(ps)
-        m2 = position(ps)
-        k = peek(ps)
+        t = peek_token(ps)
+        k = kind(t)
+        if !first_dot && preceding_whitespace(t)
+            emit_diagnostic(ps, whitespace=true,
+                            warning="space between dots in import path")
+        end
         if k == K"."
             bump(ps)
         elseif k == K".."
@@ -2497,9 +2507,6 @@ function parse_import_path(ps::ParseState)
         else
             break
         end
-        if !first_dot && m != m2
-            emit_diagnostic(ps, m, m2, warning="space between dots in import path")
-        end
         first_dot = false
     end
     if is_dotted(peek_token(ps))