Merge branch 'topic/lkql_rule_config' into 'master'

Rework the LKQL rule config file feature

Closes #245 and #220

See merge request eng/libadalang/langkit-query-language!221

lkql/language/lexer.py

@@ -4,7 +4,7 @@
 
 class Token(LexerToken):
     Identifier = WithSymbol()
-    KindName = WithSymbol()
+    UpperIdentifier = WithSymbol()
     String = WithText()
     Integer = WithText()
 
@@ -136,7 +136,7 @@ class Token(LexerToken):
     (Literal("null"),                             Token.Null),
     (Pattern("[0-9]+"),                           Token.Integer),
     (Pattern("[a-z][A-Za-z0-9_]*"),               Token.Identifier),
-    (Pattern("[A-Z][A-Za-z_]*(.list)?"),          Token.KindName),
+    (Pattern("[A-Za-z][A-Za-z0-9_]*"),            Token.UpperIdentifier),
     (Pattern(r'"(\\.|[^"])*"'),                   Token.String),
     (Pattern(r"#(.?)+"),                          Token.Comment)
 )

lkql/language/parser.py

@@ -1074,12 +1074,12 @@ class Tuple(Expr):
         ExtendedNodePattern(
 
             Or(UniversalPattern("*"),
-               NodeKindPattern(G.kind_name),
+               NodeKindPattern(G.upper_id),
                ParenPattern("(", G.or_pattern, ")")),
 
             Pick("(", c(), List(G.pattern_arg, sep=","), ")")
         ),
-        NodeKindPattern(G.kind_name),
+        NodeKindPattern(G.upper_id),
         UniversalPattern("*"),
         NullPattern("null"),
         G.regex_pattern,
@@ -1138,14 +1138,22 @@ class Tuple(Expr):
         List(G.object_assoc, empty_valid=True, sep=","),
         "}"
     ),
-    object_assoc=ObjectAssoc(G.id, ":", G.expr),
+    object_assoc=ObjectAssoc(G.object_key, ":", G.expr),
 
     at_object_lit=AtObjectLiteral(
         "@", "{",
         List(G.at_object_assoc, empty_valid=True, sep=","),
         "}"
     ),
-    at_object_assoc=AtObjectAssoc(G.id, Opt(":", G.expr)),
+    at_object_assoc=AtObjectAssoc(
+        G.object_key,
+        Opt(":", G.expr)
+    ),
+
+    object_key=Or(
+        G.id,
+        G.upper_id
+    ),
 
     listcomp=ListComprehension(
         "[",
@@ -1321,7 +1329,7 @@ class Tuple(Expr):
     if_then_else=IfThenElse("if", G.expr, "then", G.expr, "else", G.expr),
 
     id=Identifier(Token.Identifier),
-    kind_name=Identifier(Token.KindName),
+    upper_id=Identifier(Token.UpperIdentifier),
     integer=IntegerLiteral(Token.Integer),
 
     bool_literal=Or(BoolLiteral.alt_true("true"),