allow @foo{...} macro calls (#34505)

JuliaLang · Jan 28, 2020 · fba188c · fba188c · nanosoldier · Jan 28, 2020
1 parent a5c422f
commit fba188c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -3,7 +3,7 @@ Julia v1.5 Release Notes
 
 New language features
 ---------------------
-
+* Macro calls `@foo {...}` can now also be written `@foo{...}` (without the space) ([#34498]).
 
 Language changes
 ----------------

diff --git a/src/julia-parser.scm b/src/julia-parser.scm
@@ -1241,7 +1241,10 @@
  ((#\{ )
  (disallow-space s ex t)
  (take-token s)
- (loop (list* 'curly ex (parse-call-arglist s #\} ))))
+ (let ((args (parse-call-arglist s #\} )))
+ (if macrocall?
+ `(call ,ex (braces ,@args))
+ (loop (list* 'curly ex args)))))
  ((#\" #\`)
  (if (and (or (symbol? ex) (valid-modref? ex))
  (not (operator? ex))

diff --git a/test/parse.jl b/test/parse.jl
@@ -364,3 +364,14 @@ end
  @test expr == Meta.parse(pf > pg ? "(x$(f)y)$(g)z" : "x$(f)(y$(g)z)")
  end
 end
+
+# issue 34498
+@testset "macro calls @foo{...}" begin
+ @test :(@foo{}) == :(@foo {})
+ @test :(@foo{bar}) == :(@foo {bar})
+ @test :(@foo{bar,baz}) == :(@foo {bar,baz})
+ @test :(@foo{bar}(baz)) == :((@foo{bar})(baz))
+ @test :(@foo{bar}{baz}) == :((@foo{bar}){baz})
+ @test :(@foo{bar}[baz]) == :((@foo{bar})[baz])
+ @test :(@foo{bar} + baz) == :((@foo{bar}) + baz)
+end