fix import.:x parsing

Author: pfitzseb

src/components/internals.jl

@@ -388,7 +388,7 @@ end
 """
 Helper function for parsing import/using statements.
 """
-function parse_dot_mod(ps::ParseState, is_colon = false, allow_as = false)
+function parse_dot_mod(ps::ParseState, is_colon=false, allow_as=false)
     ret = EXPR(EXPR(:OPERATOR, 0, 0, "."), EXPR[], EXPR[])
 
     prevpos = position(ps)
@@ -414,6 +414,11 @@ function parse_dot_mod(ps::ParseState, is_colon = false, allow_as = false)
 
         if kindof(ps.nt) === Tokens.DOT
             pushtotrivia!(ret, EXPR(next(ps)))
+            if kindof(ps.nt) === Tokens.COLON
+                next(ps)
+                push!(ret, INSTANCE(next(ps)))
+                return ret
+            end
         elseif isoperator(ps.nt) && (ps.nt.dotop || kindof(ps.nt) === Tokens.DOT)
             pushtotrivia!(ret, EXPR(:DOT, 1, 1))
             ps.nt = RawToken(kindof(ps.nt), ps.nt.startpos, ps.nt.endpos, ps.nt.startbyte + 1, ps.nt.endbyte, ps.nt.token_error, false, ps.nt.suffix)

src/spec.jl

@@ -430,6 +430,6 @@ function tokenkindtoheadmap(k::Tokens.Kind)
     elseif k === Tokens.ENDMARKER
         return :errortoken
     else
-        error("")
+        error("Cannot convert token $k to Expr head")
     end
 end

test/parser.jl

@@ -829,6 +829,9 @@ end
         """ |> test_expr
         @test "function f() ::T end" |> test_expr # ws closer
         @test "import Base: +, -, .+, .-" |> test_expr
+        @test "import Base.:+" |> test_expr
+        @test "import Base.:⋅" |> test_expr
+        @test "import Base.:sin, Base.:-" |> test_expr
         @test "[a +   + l]" |> test_expr # ws closer
         @test "@inbounds C[i,j] = - α[i] * αjc" |> test_expr
         @test "@inbounds C[i,j] = - n * p[i] * pj" |> test_expr