Merge branch 'mr/thevenoux-langkit-query-language#550' into 'master'

LKQLWorker: emit an error for invalid rules value

Closes #550

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

Author: Roldak

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/GNATCheckWorker.java

@@ -359,6 +359,7 @@ private static Map<String, RuleInstance> parseLKQLRuleFile(
             if (topLevel.hasMember("rules")) {
                 processInstancesObject(
                     lkqlFileBasename,
+                    "rules",
                     topLevel.getMember("rules"),
                     RuleInstance.SourceMode.GENERAL,
                     res,
@@ -369,6 +370,7 @@ private static Map<String, RuleInstance> parseLKQLRuleFile(
                 if (topLevel.hasMember("ada_rules")) {
                     processInstancesObject(
                         lkqlFileBasename,
+                        "ada_rules",
                         topLevel.getMember("ada_rules"),
                         RuleInstance.SourceMode.ADA,
                         res,
@@ -378,6 +380,7 @@ private static Map<String, RuleInstance> parseLKQLRuleFile(
                 if (topLevel.hasMember("spark_rules")) {
                     processInstancesObject(
                         lkqlFileBasename,
+                        "spark_rules",
                         topLevel.getMember("spark_rules"),
                         RuleInstance.SourceMode.SPARK,
                         res,
@@ -406,11 +409,22 @@ private static Map<String, RuleInstance> parseLKQLRuleFile(
      */
     private static void processInstancesObject(
         final String lkqlRuleFile,
+        final String instancesObjectSymbol,
         final Value instancesObject,
         final RuleInstance.SourceMode sourceMode,
         final Map<String, RuleInstance> toPopulate,
         final boolean verbose
     ) throws LKQLRuleFileError {
+        if (!instancesObject.hasMembers()) {
+            errorInLKQLRuleFile(
+                lkqlRuleFile,
+                "The value associated to the '" +
+                instancesObjectSymbol +
+                "' symbol must be an LKQL object, got " +
+                instancesObject
+            );
+        }
+
         // Iterate on all instance object keys
         for (String ruleName : instancesObject.getMemberKeys()) {
             final String lowerRuleName = ruleName.toLowerCase();

testsuite/tests/gnatcheck/lkql_rules_config/invalid_rule_config/config1.lkql

@@ -0,0 +1 @@
+val rules = 2

testsuite/tests/gnatcheck/lkql_rules_config/invalid_rule_config/config2.lkql

@@ -0,0 +1,3 @@
+val rules = @{}
+
+val ada_rules = 2

testsuite/tests/gnatcheck/lkql_rules_config/invalid_rule_config/config3.lkql

@@ -0,0 +1,3 @@
+val rules = @{}
+
+val spark_rules = 2

testsuite/tests/gnatcheck/lkql_rules_config/invalid_rule_config/main.adb

@@ -0,0 +1 @@
+procedure Main is null;

testsuite/tests/gnatcheck/lkql_rules_config/invalid_rule_config/test.out

@@ -0,0 +1,23 @@
+Invalid type for rules object
+=============================
+
+gnatcheck: error: The value associated to the 'rules' symbol must be an LKQL object, got 2 (config1.lkql)
+gnatcheck: error: no rule to check specified
+try "gnatcheck --help" for more information.
+>>>program returned status code 2
+
+Invalid type for ada_rules object
+=================================
+
+gnatcheck: error: The value associated to the 'ada_rules' symbol must be an LKQL object, got 2 (config2.lkql)
+gnatcheck: error: no rule to check specified
+try "gnatcheck --help" for more information.
+>>>program returned status code 2
+
+Invalid type for spark_rules object
+===================================
+
+gnatcheck: error: The value associated to the 'spark_rules' symbol must be an LKQL object, got 2 (config3.lkql)
+gnatcheck: error: no rule to check specified
+try "gnatcheck --help" for more information.
+>>>program returned status code 2

testsuite/tests/gnatcheck/lkql_rules_config/invalid_rule_config/test.yaml

@@ -0,0 +1,11 @@
+driver: gnatcheck
+format: brief
+input_sources:
+  - main.adb
+tests:
+  - label: Invalid type for rules object
+    lkql_rule_file: config1.lkql
+  - label: Invalid type for ada_rules object
+    lkql_rule_file: config2.lkql
+  - label: Invalid type for spark_rules object
+    lkql_rule_file: config3.lkql