Merge rust-analyzer/ungrammar#27

27: Split out macro calls in item position r=matklad a=jonas-schievink

This is needed in order to distinguish macro calls in expression position from calls in item position.

Required for rust-lang/rust-analyzer#7717.

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>

Author: bors[bot]

src/tools/rust-analyzer/lib/ungrammar/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ungrammar"
 description = "A DSL for describing concrete syntax trees"
-version = "1.11.0"
+version = "1.12.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/matklad/ungrammar"
 authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]

src/tools/rust-analyzer/lib/ungrammar/rust.ungram

@@ -90,7 +90,7 @@ Item =
 | ExternCrate
 | Fn
 | Impl
-| MacroCall
+| MacroItem
 | MacroRules
 | MacroDef
 | Module
@@ -101,6 +101,9 @@ Item =
 | Union
 | Use
 
+MacroItem =
+  MacroCall
+
 MacroRules =
   Attr* Visibility?
   'macro_rules' '!' Name