Merge pull request #370 from Pangoraw/bracketed_function_def

Support bracketed function call in function definition

Author: pfitzseb

src/interface.jl

@@ -173,7 +173,9 @@ function get_sig(x::EXPR)
         return x.args[1]
     elseif headof(x) === :struct || headof(x) === :mutable
         return x.args[2]
-    elseif headof(x) === :abstract || headof(x) === :primitive || headof(x) === :function || headof(x) === :macro
+    elseif headof(x) === :function || headof(x) === :macro
+        return rem_invis(x.args[1])
+    elseif headof(x) === :abstract || headof(x) === :primitive
         return x.args[1]
     end
 end

src/utils.jl

@@ -575,7 +575,7 @@ _kw_convert(x::EXPR) = EXPR(:kw, EXPR[x.args[1], x.args[2]], EXPR[x.head], x.ful
 
 When parsing a function or macro signature, should it be converted to a tuple?
 """
-convertsigtotuple(sig::EXPR) = isbracketed(sig) && !(istuple(sig.args[1]) || (headof(sig.args[1]) === :block) || issplat(sig.args[1]))
+convertsigtotuple(sig::EXPR) = isbracketed(sig) && !(istuple(sig.args[1]) || iscall(sig.args[1]) || (headof(sig.args[1]) === :block) || issplat(sig.args[1]))
 
 """
     docable(head)

test/interface.jl

@@ -52,10 +52,12 @@ end
     @test valof(CSTParser.get_name(CSTParser.parse("function f()::T end"))) == "f"
     @test valof(CSTParser.get_name(CSTParser.parse("function f(x::T) where T end"))) == "f"
     @test valof(CSTParser.get_name(CSTParser.parse("function f{T}() end"))) == "f"
+    @test valof(CSTParser.get_name(CSTParser.parse("function (f()) end"))) == "f"
 
     # Operators
     @test CSTParser.str_value(CSTParser.get_name(CSTParser.parse("function +() end"))) == "+"
     @test CSTParser.str_value(CSTParser.get_name(CSTParser.parse("function (+)() end"))) == "+"
+    @test CSTParser.str_value(CSTParser.get_name(CSTParser.parse("function (a + b) end"))) == "+"
     @test CSTParser.str_value(CSTParser.get_name(CSTParser.parse("+(x,y) = x"))) == "+"
     @test CSTParser.str_value(CSTParser.get_name(CSTParser.parse("+(x,y)::T = x"))) == "+"
     @test CSTParser.str_value(CSTParser.get_name(CSTParser.parse("!(x)::T = x"))) == "!"