Merge branch 'topic/refactor' into 'master'

Introduce the lkql refactor command

Closes #262

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

Author: raph-amiard

lkql/build/railroad-diagrams/pattern_arg.svg

@@ -927,19 +927,28 @@ class NodeKindPattern(NodePattern):
     kind_name = Field(type=Identifier)
 
 
+class PatternDetailDelimiter(LkqlNode):
+    """
+    Pattern detail delimiter, either 'is' (old syntax) or ':' (new syntax).
+    """
+    enum_node = True
+    alternatives = ['is', 'colon']
+
+
 @abstract
 class NodePatternDetail(LkqlNode):
     """
     Access to a field, property or selector inside a node pattern.
     """
-    pass
+    pattern_detail_delimiter = AbstractField(type=PatternDetailDelimiter)
 
 
 class NodePatternField(NodePatternDetail):
     """
     Access to a field in a node pattern.
     """
     identifier = Field(type=Identifier)
+    pattern_detail_delimiter = Field(type=PatternDetailDelimiter)
     expected_value = Field(type=BasePattern)
 
 
@@ -948,6 +957,7 @@ class NodePatternProperty(NodePatternDetail):
     Access to a property in a node pattern.
     """
     call = Field(type=FunCall)
+    pattern_detail_delimiter = Field(type=PatternDetailDelimiter)
     expected_value = Field(type=BasePattern)
 
 
@@ -956,18 +966,19 @@ class NodePatternSelector(NodePatternDetail):
     Use of a selector in a node pattern
     """
     call = Field(type=SelectorCall)
+    pattern_detail_delimiter = Field(type=PatternDetailDelimiter)
     pattern = Field(type=BasePattern)
 
 
 class ExtendedNodePattern(NodePattern):
     """
     Node pattern of the form:
 
-    ``KindName(field=val, prop() is val, any selector is Pattern)``
+    ``KindName(field: Pattern, prop(): Pattern, any selector: Pattern)``
 
     For instance::
 
-        ObjectDecl(children: AspectAssoc)
+        ObjectDecl(any children: AspectAssoc)
     """
     node_pattern = Field(type=ValuePattern)
     details = Field(type=NodePatternDetail.list)
@@ -1114,10 +1125,21 @@ class Tuple(Expr):
     ),
     tuple_pattern=TuplePattern("(", List(G.value_pattern, sep=","), ")"),
 
+    pattern_detail_delimiter=Or(
+        PatternDetailDelimiter.alt_is("is"),
+        PatternDetailDelimiter.alt_colon(":"),
+    ),
+
     pattern_arg=Or(
-        NodePatternSelector(G.selector_call, ":", G.or_pattern),
-        NodePatternField(G.id, ":", c(), G.or_pattern),
-        NodePatternProperty(G.fun_call, ":", c(), G.or_pattern)
+        NodePatternSelector(
+            G.selector_call, G.pattern_detail_delimiter, G.or_pattern
+        ),
+        NodePatternField(
+            G.id, G.pattern_detail_delimiter, c(), G.or_pattern
+        ),
+        NodePatternProperty(
+            G.fun_call, G.pattern_detail_delimiter, c(), G.or_pattern
+        )
     ),
 
     selector_call=SelectorCall(

lkql/language/parser.py

@@ -293,7 +293,7 @@ package body Gnatcheck.Compiler is
          --  We assume the following format of the message:
          --    filename:line:column: <message body>
          --
-         --  If this format is violated we display the line as unparasable.
+         --  If this format is violated we display the line as unparsable.
 
          --  Try to match the diagnostic to extract information
          Match (Match_Diagnosis, Msg, Matches);
@@ -302,6 +302,9 @@ package body Gnatcheck.Compiler is
             return;
          end if;
 
+         Msg_Start := Matches (5).First;
+         Msg_End   := Matches (5).Last;
+
          SF := File_Find
            (Msg (Matches (1).First .. Matches (1).Last),
             Use_Short_Name => True);
@@ -310,8 +313,18 @@ package body Gnatcheck.Compiler is
          Sloc.Column := Column_Number'Value
            (Msg (Matches (4).First .. Matches (4).Last));
 
-         Msg_Start := Matches (5).First;
-         Msg_End   := Matches (5).Last;
+         --  Handle internal warnings before any other kind of error, because
+         --  they don't have an Ada source location
+         --
+         --  TODO: We want to refactor this logic and make the logic of
+         --  handling internal errors more general.
+         if Msg_End - Msg_Start > 22
+           and then Msg
+             (Msg_Start .. Msg_Start + 22) = "warning: internal issue"
+         then
+            Warning (Msg (Msg_Start + 27 .. Msg_End));
+            return;
+         end if;
 
          --  Test if the provided sources is present and is not ignored
          if not Present (SF) or else Source_Info (SF) = Ignore_Unit then
@@ -374,7 +387,7 @@ package body Gnatcheck.Compiler is
 
             if Msg_End - Msg_Start > 21
                and then Msg
-                 (Msg_Start + 7 .. Msg_Start + 20) = "internal error"
+                 (Msg_Start + 7 .. Msg_Start + 20) = "internal issue"
             then
                Kind := Internal_Error;
             else

lkql_checker/src/gnatcheck-compiler.adb

@@ -122,6 +122,11 @@
             <artifactId>launcher-common</artifactId>
             <version>${graalvm.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.adacore</groupId>
+            <artifactId>liblkqllang</artifactId>
+            <version>0.1</version>
+        </dependency>
     </dependencies>
 
 </project>

lkql_jit/cli/pom.xml

@@ -17,7 +17,8 @@
             LKQLLauncher.LKQLRun.class,
             LKQLChecker.Args.class,
             GNATCheckWorker.Args.class,
-            LKQLDoc.class
+            LKQLDoc.class,
+            LKQLRefactor.class
         },
         description =
                 "Unified driver for LKQL (Langkit query language). Allows you to run LKQL "