Messages: add new messages ID

rename conflicting-key-type

Rename `conflicting-key-type` to `conflicting-key-type-merging-groups`.
Giving more context in the name allow us to introduce
`conflicting-key-type-definitions` later.

Messages: add conflicting-key-type-definitions

Messages: add conflicting-key-type-map-entry

Messages: undeclared-modifiers-in-key-type

Also improve the log messages.

Messages: add conflicting-key-type-preserve-entries

Messages: use XKB_ERROR_UNSUPPORTED_MODIFIER_MASK

Messages: add illegal-key-type-preserve-result

Messages: add conflicting-key-type-level-names

Messages: add duplicate-entry

Messages: add unsupported-symbols-field

Messages: add missing-symbols-group-name-index

Messages: use XKB_ERROR_WRONG_FIELD_TYPE

Message: add conflicting-key-name

Messages: use XKB_WARNING_UNDEFINED_KEYCODE

Messages: add illegal-keycode-alias

Messages: add unsupported-geometry-section

Messages: add missing-default-section

Messages: add XKB_LOG_MESSAGE_NO_ID

Messages: rename log_vrb_with_code to log_vrb

Messages: ERROR_WRONG_FIELD_TYPE & ERROR_INVALID_SYNTAX

Messages: add unknown-identifier

Messages: add invalid-expression-type

Messages: add invalid-operation + fixes

Messages: add unknown-operator

ERROR_UNKNOWN_IDENTIFIER → ERROR_INVALID_IDENTIFIER

Messages: add undeclared-virtual-modifier

Messages: add expected-array-entry

Messages: add invalid-include-statement

Messages: add included-file-not-found

Messages: add allocation-error

Message: add invalid-included-file

Messages: symbols

Messages: add invalid-value

Messages: add invalid-real-modifier

Messages: add unknown-field

Messages: add wrong-scope

Messages: add invalid-modmap-entry

Messages: add wrong-statement-type

Messages: add conflicting-key-symbols-entry

Messages: add invalid-set-default-statement

doc/message-registry.yaml

@@ -30,11 +30,26 @@
     - *decimal integer:* 1, 123, etc.
     - *decimal floating-point number:* 1.23, etc.
     - *hexadecimal integer:* prefixed with “0x”: 0x123, 0xff, 0xAB, etc.
+- id: "conflicting-key-type-preserve-entries"
+  code: 43
+  added: ALWAYS
+  type: warning
+  description: "Conflicting “preserve” entries in a key type"
 - id: "unsupported-modifier-mask"
   code: 60
   added: ALWAYS
   type: error
   description: "Warn on unsupported modifier mask"
+- id: "expected-array-entry"
+  code: 77
+  added: ALWAYS
+  type: error
+  description: "Expected an array entry, but the index is missing"
+- id: "illegal-keycode-alias"
+  code: 101
+  added: ALWAYS
+  type: warning
+  description: "Illegal keycode alias with the name of a real key"
 - id: "unrecognized-keysym"
   code: 107
   added: ALWAYS
@@ -65,18 +80,63 @@
         ```c
         key <AB08> {[ comma, semicolon, periodcentered, multiply ]};
         ```
+- id: "undeclared-virtual-modifier"
+  code: 123
+  added: ALWAYS
+  type: error
+  description: "A virtual modifier is used before being declared"
+- id: "wrong-statement-type"
+  code: 150
+  added: ALWAYS
+  type: error
+  description: "The type of the statement is not allowed in the context"
+- id: "unsupported-geometry-section"
+  code: 172
+  added: ALWAYS
+  type: warning
+  description: "Geometry sections are not supported"
 - id: "cannot-infer-key-type"
   code: 183
   added: ALWAYS
   type: warning
   description: "Warn if no key type can be inferred"
+- id: "illegal-key-type-preserve-result"
+  code: 195
+  added: ALWAYS
+  type: warning
+  description: "The result of a key type “preserve” entry must be a subset of its input modifiers."
+- id: "invalid-include-statement"
+  code: 203
+  added: ALWAYS
+  type: error
+  description: "Syntax error in the include statement"
+- id: "invalid-modmap-entry"
+  code: 206
+  added: ALWAYS
+  type: error
+  description: "A modmap entry is invalid"
 - id: "unsupported-group-index"
   code: 237
   added: ALWAYS
   type: error
   description: "Warn when a group index is not supported"
   details: |
     xkbcommon supports group index in the range (1..{{XKB_MAX_GROUPS}}).
+- id: "conflicting-key-type-level-names"
+  code: 239
+  added: ALWAYS
+  type: warning
+  description: "The name of a key type level is defined multiple times."
+- id: "invalid-set-default-statement"
+  code: 254
+  added: ALWAYS
+  type: error
+  description: "Invalid statement setting default values"
+- id: "conflicting-key-type-map-entry"
+  code: 266
+  added: ALWAYS
+  type: warning
+  description: "Conflicting “map” entries in type definition"
 - id: "undefined-key-type"
   code: 286
   added: ALWAYS
@@ -95,11 +155,56 @@
   details: |
     Shift levels are _one_-indexed. xkbcommon supports two formats of shift levels:
     as numbers and as identifiers `LevelN`, where `N` is in the range (1..8).
+- id: "included-file-not-found"
+  code: 338
+  added: ALWAYS
+  type: error
+  description: "Could not find a file used in an include statement"
+- id: "unknown-operator"
+  code: 345
+  added: ALWAYS
+  type: error
+  description: "Use of an operator that is unknown and thus unsupported"
+- id: "duplicate-entry"
+  code: 378
+  added: ALWAYS
+  type: warning
+  description: "An entry is duplicated and will be ignored"
+- id: "conflicting-key-type-definitions"
+  code: 407
+  added: ALWAYS
+  type: warning
+  description: "Conflicting definitions of a key type"
+  details: |
+    The given key type is defined multiple times, but only one definition is kept.
+- id: "wrong-scope"
+  code: 428
+  added: ALWAYS
+  type: error
+  description: "A statement is in a wrong scope and should be moved"
+- id: "missing-default-section"
+  code: 433
+  added: ALWAYS
+  type: warning
+  description: "Missing default section in included file"
+  details: |
+    When using an include statement, the included file may contains multiple sections.
+    The include statement may specify the name of the section to include, or leave it
+    unspecified. In the latter case, the included file must then define a *default* section.
+    The present warning is shown when no default section is defined.
+
+    To solve this, either fix the include statement by specifying the exact section to
+    include, or declare a default section in the included file.
 - id: "conflicting-key-symbol"
   code: 461
   added: ALWAYS
   type: warning
   description: "Warn if there are conflicting keysyms while merging keys"
+- id: "invalid-operation"
+  code: 478
+  added: ALWAYS
+  type: error
+  description: "The operation is invalid in the context"
 - id: "numeric-keysym"
   code: 489
   added: 1.6.0
@@ -132,11 +237,26 @@
   added: ALWAYS
   type: warning
   description: "TODO: add description"
+- id: "conflicting-key-name"
+  code: 523
+  added: ALWAYS
+  type: warning
+  description: "Conflicting definitions of a key name or alias"
+- id: "allocation-error"
+  code: 550
+  added: ALWAYS
+  type: error
+  description: "Cannot allocate memory"
 - id: "wrong-field-type"
   code: 578
   added: ALWAYS
   type: error
   description: "Warn when a field has not the expected type"
+- id: "invalid-real-modifier"
+  code: 623
+  added: ALWAYS
+  type: error
+  description: "Invalid _real_ modifier"
 - id: "unknown-char-escape-sequence"
   code: 645
   added: ALWAYS
@@ -156,11 +276,21 @@
     | `\e`            | `U+001B` Escape                     |
     | `\\`            | `U+005C` Backslash                  |
     | `\NNN`          | _Octal_ escape, from `\0` to `\777` |
+- id: "invalid-included-file"
+  code: 661
+  added: ALWAYS
+  type: error
+  description: "The target file of an include statement could not be processed"
 - id: "multiple-groups-at-once"
   code: 700
   added: ALWAYS
   type: warning
   description: "Warn if a key defines multiple groups at once"
+- id: "unsupported-symbols-field"
+  code: 711
+  added: ALWAYS
+  type: warning
+  description: "A legacy X11 symbol field is not supported"
 - id: "invalid-syntax"
   code: 769
   added: ALWAYS
@@ -170,34 +300,72 @@
   code: 770
   added: ALWAYS
   type: warning
-  description: "TODO: add description"
+  description: "Reference to an undefined keycode"
+- id: "invalid-expression-type"
+  code: 784
+  added: ALWAYS
+  type: error
+  description: "An expression has not the expected type"
+- id: "invalid-value"
+  code: 796
+  added: ALWAYS
+  type: error
+  description: "A value is invalid and will be ignored"
 - id: "conflicting-modmap"
   code: 800
   added: ALWAYS
   type: warning
   description: "Warn if there are conflicting modmap definitions"
   details: |
     @todo detailed explanation and examples
+- id: "unknown-field"
+  code: 812
+  added: ALWAYS
+  type: error
+  description: "A field is unknown and will be ignored"
 - id: "conflicting-key-action"
   code: 883
   added: ALWAYS
   type: warning
   description: "Warn if there are conflicting actions while merging keys"
-- id: "conflicting-key-type"
+- id: "conflicting-key-type-merging-groups"
   code: 893
   added: ALWAYS
   type: warning
   description: "Warn if there are conflicting key types while merging groups"
+- id: "conflicting-key-symbols-entry"
+  code: 901
+  added: ALWAYS
+  type: error
+  description: "Conflicting symbols entry for a key"
+- id: "missing-symbols-group-name-index"
+  code: 903
+  added: ALWAYS
+  type: warning
+  description: "Missing group index in a group name entry"
 - id: "conflicting-key-fields"
   code: 935
   added: ALWAYS
   type: warning
   description: "Warn if there are conflicting fields while merging keys"
+- id: "invalid-identifier"
+  code: 949
+  added: ALWAYS
+  type: error
+  description: "An identifier is used but is not built-in"
 - id: "unresolved-keymap-symbol"
   code: 965
   added: ALWAYS
   type: warning
   description: "Warn if using a symbol not defined in the keymap"
+- id: "undeclared-modifiers-in-key-type"
+  code: 971
+  added: ALWAYS
+  type: warning
+  description: "Some modifiers used in a key type “map” or “preserve” entry are not declared"
+  details: |
+    The modifiers used in `map` or `preserve` entries should be declared using the entry
+    `modifiers` in the key type.
 
 # TODO: deprecated keysym
 # TODO: unicode keysym when named and recommended keysym exists

src/context.h

@@ -138,10 +138,8 @@ xkb_context_sanitize_rule_names(struct xkb_context *ctx,
     xkb_log_with_code((ctx), XKB_LOG_LEVEL_CRITICAL, 0, (id), __VA_ARGS__)
 #define log_wsgo(ctx, ...) \
     xkb_log((ctx), XKB_LOG_LEVEL_CRITICAL, 0, __VA_ARGS__)
-#define log_vrb_with_code(ctx, vrb, id, ...) \
+#define log_vrb(ctx, vrb, id, ...) \
     xkb_log_with_code((ctx), XKB_LOG_LEVEL_WARNING, (vrb), (id), __VA_ARGS__)
-#define log_vrb(ctx, vrb, ...) \
-    xkb_log((ctx), XKB_LOG_LEVEL_WARNING, (vrb), __VA_ARGS__)
 
 /*
  * Variants which are prefixed by the name of the function they're