Replace other self/super/crate usages with NameRef

Author: Veykril

Cargo.toml

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

rust.ungram

@@ -21,7 +21,7 @@
 //*************************//
 
 Name =
-  'ident'
+  'ident' | 'self'
 
 NameRef =
   'ident' | 'int_number' | 'self' | 'super' | 'crate'
@@ -121,7 +121,7 @@ ItemList =
 
 ExternCrate =
   Attr* Visibility?
-  'extern' 'crate' (NameRef | 'self') Rename? ';'
+  'extern' 'crate' NameRef Rename? ';'
 
 Rename =
   'as' (Name | '_')
@@ -155,8 +155,8 @@ ParamList =
 
 SelfParam =
   Attr* (
-    ('&' Lifetime?)? 'mut'? 'self'
-  | 'mut'? 'self' ':' Type
+    ('&' Lifetime?)? 'mut'? Name
+  | 'mut'? Name ':' Type
   )
 
 Param =
@@ -292,12 +292,7 @@ WherePred =
   ('for' GenericParamList)?  (Lifetime | Type) ':' TypeBoundList
 
 Visibility =
-  'pub' ('('
-    'super'
-  | 'self'
-  | 'crate'
-  | 'in' Path
-  ')')?
+  'pub' ('(' 'in'? Path ')')?
 
 Attr =
   '#' '!'? '[' Path ('=' Literal | TokenTree)? ']'