feat: update with latest v4 grammar

Author: johnstonskj

sdml-mode-hl.el

@@ -44,43 +44,17 @@
    ;; -------------------------------------------------------------------
 
    [
-    "module"
-    "import"
-    "assert"
-    "class"
-    "datatype"
-    "dimension"
-    "entity"
-    "enum"
-    "event"
-    "property"
-    "rdf"
-    "structure"
-    "union"
     "is"
     "of"
     "end"
-    ] @keyword
+   ] @keyword
 
    ;; -------------------------------------------------------------------
    ;; Operators
    ;; -------------------------------------------------------------------
 
    [
     "="
-    ":="
-    "≔"
-    "¬"
-    "∧"
-    "∨"
-    "⊻"
-    "==>"
-    "⇒"
-    "<==>"
-    "⇔"
-    "∀"
-    "∃"
-    "∈"
     "->"
     "→"
     "<-"
@@ -92,18 +66,25 @@
    ;; Module & Imports (Note module => type; definition => scope)
    ;; -------------------------------------------------------------------
 
-   (module name: (identifier) @module.definition)
+   (module "module" @keyword name: (identifier) @module.definition)
    (module "version" @keyword)
 
+   (from_clause "from" @keyword)
+
+   (module_path_root_only "::" @punctuation.separator)
+   (module_path_relative "::" @punctuation.separator)
+   (module_path_relative segment: (identifier) @module.special)
+   (module_path_absolute "::" @punctuation.separator
+                         segment: (identifier) @module.special)
+
+   (import_statement "import" @keyword)
    (import_statement [ "[" "]" ] @punctuation.bracket)
 
    (member_import name: (qualified_identifier) @type)
-   (member_import "as" @keyword)
-   (member_import rename: (identifier) @type)
+   (member_import "as" @keyword rename: (identifier) @type)
 
    (module_import name: (identifier) @module)
-   (module_import "as" @keyword)
-   (module_import rename: (identifier) @module)
+   (module_import "as" @keyword rename: (identifier) @module)
 
    ;; -------------------------------------------------------------------
    ;; Annotations and Constraints (Note property => label)
@@ -115,17 +96,17 @@
 
    (annotation_property value: (value (identifier_reference) @type))
 
-   (constraint name: (identifier) @label)
+   (constraint "assert" @keyword name: (identifier) @label)
 
    (informal_constraint (quoted_string) @embedded)
-   (informal_constraint language: (controlled_language_tag) @property)
+   (informal_constraint language: (controlled_language_tag) @label)
 
-   (constraint_environment (constraint_environment_end) @keyword)
+   (constraint_environment "with" @keyword)
 
-   (environment_def "def" @keyword)
-   (environment_def (identifier) @function.definition \. (function_def))
-   (environment_def (identifier) @constant \. (constant_def))
+   (function_def
+    (function_signature name: (identifier) @function.definition))
 
+   (function_signature "def" @keyword)
    (function_signature target: (_) @type)
    (function_signature [ "(" ")" ] @punctuation.bracket)
 
@@ -136,9 +117,11 @@
    (function_cardinality_expression (sequence_uniqueness) @keyword)
    (function_cardinality_expression [ "{" "}" ] @punctuation.bracket)
 
+   (function_body (function_op_by_definition) @operator)
+
    (function_composition subject: (reserved_self) @variable.builtin)
    (function_composition name: (identifier) @function.call)
-   (function_composition "." @punctuation.delimiter)
+   (function_composition [ "·" "." ] @operator)
 
    (constraint_sentence [ "(" ")" ] @punctuation.bracket)
 
@@ -157,35 +140,45 @@
 
    (quantified_sentence "," @punctuation.separator)
 
-   (quantified_variable source: (reserved_self) @variable.builtin)
-   (quantified_variable name: (identifier) @variable.parameter)
-   (quantified_variable "in" @keyword)
+   (variable (identifier) @variable)
 
    (functional_term
     function: (term (identifier_reference) @function.call))
 
    (sequence_builder [ "{" "}" ] @punctuation.bracket
-                     "|" @punctuation.separator)
-
-   (named_variable_set (identifier) @variable)
-
-   (mapping_variable
-    domain: (identifier) @variable range: (identifier) @variable)
-
-   (sequence_builder_body [ "(" ")" ] @punctuation.bracket)
+                     (set_op_builder) @punctuation.separator)
 
+   (sequence_of_predicate_values [ "{" "}" ] @punctuation.bracket)
+   (sequence_of_predicate_values (sequence_ordering) @keyword)
+   (sequence_of_predicate_values (sequence_uniqueness) @keyword)
+   (sequence_of_predicate_values  [ "[" "]" ] @punctuation.bracket)
    (sequence_of_predicate_values (identifier_reference) @type)
-   (sequence_of_predicate_values [ "[" "]" ] @punctuation.bracket)
-
-   (negation "not" @keyword)
-   (conjunction "and" @keyword)
-   (disjunction "or" @keyword)
-   (exclusive_disjunction "xor" @keyword)
-   (implication "implies" @keyword)
-   (biconditional "iff" @keyword)
 
-   (universal "forall" @keyword)
-   (existential "exists" @keyword)
+   (unary_boolean_sentence
+    [ (logical_op_negation "¬" @operator)
+      (logical_op_negation "not" @keyword) ])
+
+   (binary_boolean_sentence
+    [ (logical_op_conjunction "∧" @operator)
+      (logical_op_conjunction "and" @keyword)
+      (logical_op_disjunction "∨" @operator)
+      (logical_op_disjunction "or" @keyword)
+      (logical_op_exclusive_disjunction "⊻" @operator)
+      (logical_op_exclusive_disjunction "xor" @keyword)
+      (logical_op_implication [ "==>" "⇒" ] @operator)
+      (logical_op_implication "implies" @keyword)
+      (logical_op_biconditional [ "<==>" "⇔" ] @operator)
+      (logical_op_biconditional "iff" @keyword) ])
+
+   (quantified_variable_binding
+    [ (logical_quantifier_universal "∀" @operator)
+      (logical_quantifier_universal "forall" @keyword)
+      (logical_quantifier_existential "∃" @operator)
+      (logical_quantifier_existential "exists" @keyword) ])
+
+   (quantified_variable
+    [ (set_op_membership "∈" @operator)
+      (set_op_membership "in" @keyword) ])
 
    ;; -------------------------------------------------------------------
    ;; Types
@@ -196,50 +189,85 @@
     (unknown_type)
     ] @type.builtin
 
-   (data_type_def name: (identifier) @type.definition)
+   (data_type_def
+    "datatype" @keyword
+    name: (identifier) @type.definition)
    (data_type_def base: (identifier_reference) @type)
+   (data_type_def base: (builtin_simple_type) @type.builtin)
    (data_type_def opaque: (opaque) @keyword)
 
-   (dimension_def name: (identifier) @type.definition)
+   (datatype_def_restriction [ "{" "}" ] @punctuation.bracket)
+   (length_restriction_facet
+    [ "length"
+      "maxLength"
+      "minLength" ] @property
+    "=" @operator)
+   (digit_restriction_facet
+    [ "fractionDigits"
+      "totalDigits" ] @property
+    "=" @operator)
+   (value_restriction_facet
+    [ "maxExclusive"
+      "maxInclusive"
+      "minExclusive"
+      "minInclusive" ] @property
+    "=" @operator)
+   (tz_restriction_facet
+    "explicitTimezone" @property
+    "=" @operator)
+   (pattern_restriction_facet [ "[" "]" ] @punctuation.bracket)
+   (pattern_restriction_facet
+    "pattern" @property
+    "=" @operator
+    (quoted_string) @string)
 
-   (entity_def name: (identifier) @type.definition)
+   (kw_is_fixed) @keyword
 
-   (enum_def name: (identifier) @type.definition)
+   (tz_restriction_value) @keyword
 
-   (event_def name: (identifier) @type.definition)
+   (dimension_def "dimension" @keyword name: (identifier) @type.definition)
 
-   (structure_def name: (identifier) @type.definition)
+   (entity_def "entity" @keyword name: (identifier) @type.definition)
 
-   (union_def name: (identifier) @type.definition)
+   (enum_def "enum" @keyword name: (identifier) @type.definition)
+
+   (event_def "event" @keyword name: (identifier) @type.definition)
+
+   (property_def "property" @keyword)
+
+   (structure_def "structure" @keyword name: (identifier) @type.definition)
+
+   (union_def "union" @keyword name: (identifier) @type.definition)
 
    (source_entity "source" @keyword entity: (identifier_reference) @type)
    (source_entity "with" @keyword)
+   (source_entity [ "[" "]" ] @punctuation.bracket)
    (source_entity member: (identifier) @variable.field)
 
    ;; -------------------------------------------------------------------
    ;; RDF Definitions
    ;; -------------------------------------------------------------------
 
-   (rdf_def name: (identifier) @type.definition)
+   (rdf_def "rdf" @keyword name: (identifier) @type.definition)
    (rdf_types "type" @keyword type: (identifier_reference) @type)
    (rdf_types [ "[" "]" ] @punctuation.bracket)
 
    ;; -------------------------------------------------------------------
    ;; Type Classes
    ;; -------------------------------------------------------------------
 
-   (type_class_def name: (identifier) @type.definition)
+   (type_class_def "class" @keyword name: (identifier) @type.definition)
    (type_class_def [ "(" ")" ] @punctuation.bracket)
 
    (type_variable name: (identifier) @type)
-   (type_variable "+" @operator)
+   (type_variable (type_op_combiner) @operator)
 
    (type_class_reference name: (identifier_reference) @type)
 
    (type_class_arguments [ "(" ")" ] @punctuation.bracket)
 
-   (method_def "def" @keyword)
-   (method_def name: (identifier) @method.definition)
+   (method_def
+    (function_signature name: (identifier) @method.definition))
 
    (wildcard) @type.builtin
 
@@ -265,8 +293,7 @@
    (value_variant name: (identifier) @constant)
 
    (type_variant (identifier_reference) @type)
-   (type_variant rename: (identifier) @type)
-   (type_variant "as" @keyword)
+   (type_variant "as" @keyword rename: (identifier) @type)
 
    (cardinality_expression ordering: (sequence_ordering) @keyword)
    (cardinality_expression uniqueness: (sequence_uniqueness) @keyword)
@@ -284,6 +311,7 @@
    (binary) @string.special
 
    [
+    (rational)
     (decimal)
     (double)
     (integer)
@@ -297,8 +325,11 @@
 
    (value (identifier_reference) @type)
 
-   (sequence_of_values (identifier_reference) @type)
+   (sequence_of_values [ "{" "}" ] @punctuation.bracket)
+   (sequence_of_values (sequence_ordering) @keyword)
+   (sequence_of_values (sequence_uniqueness) @keyword)
    (sequence_of_values  [ "[" "]" ] @punctuation.bracket)
+   (sequence_of_values (identifier_reference) @type)
 
    ;; -------------------------------------------------------------------
    ;; Errors

sdml-mode-indent.el

@@ -45,8 +45,8 @@
   '(;; These nodes are always indented
     (indent-all . (member
                    entity_identity
+                   function_def
                    function_body
-                   constant_def
                    informal_constraint
                    constraint_sentence
                    source_entity
@@ -59,6 +59,7 @@
     (indent-body . (module_body
                     import_statement
                     annotation_only_body
+                    datatype_def_restriction
                     ;; entity_body << this double indents.
                     dimension_body
                     enum_body
@@ -93,7 +94,7 @@
     (multi-line-text . (quoted_string))
 
     ;; These nodes always outdent (1 shift in opposite direction)
-    (outdent . (constraint_environment_end))))
+    (outdent . (set_op_builder))))
 
 
 ;; --------------------------------------------------------------------------