Merge branch 'main' into issue1218

cellml · May 16, 2024 · 584ebb5 · 584ebb5
2 parents 160d855 + 66d2f00
commit 584ebb5
Show file tree

Hide file tree

Showing 26 changed files with 1,625 additions and 631 deletions.
diff --git a/src/api/libcellml/issue.h b/src/api/libcellml/issue.h
@@ -68,92 +68,113 @@ class LIBCELLML_EXPORT Issue
     {
         UNDEFINED,
 
-        // Specification errors.
+        // Specification errors:
         XML,
+        XML_UNEXPECTED_ELEMENT,
+        XML_UNEXPECTED_CHARACTER,
+        XML_UNEXPECTED_NAMESPACE,
+        XML_ATTRIBUTE_HAS_NAMESPACE,
         XML_ID_ATTRIBUTE,
-        DATA_REPR_IDENTIFIER_UNICODE,
-        DATA_REPR_IDENTIFIER_LATIN_ALPHANUM,
-        DATA_REPR_IDENTIFIER_AT_LEAST_ONE_ALPHANUM,
-        DATA_REPR_IDENTIFIER_BEGIN_EURO_NUM,
-        DATA_REPR_IDENTIFIER_IDENTICAL,
-        DATA_REPR_INT_BASE10,
-        DATA_REPR_INT_SIGN,
-        DATA_REPR_INT_DIGIT,
-        DATA_REPR_BASIC_REAL_BASE10,
-        DATA_REPR_BASIC_REAL_SIGN,
-        DATA_REPR_BASIC_REAL_DECIMAL,
-        DATA_REPR_BASIC_REAL_DIGIT,
-        DATA_REPR_REAL_BASE10,
-        DATA_REPR_REAL_SIGNIFICAND,
-        DATA_REPR_REAL_EXPONENT,
         MODEL_ELEMENT,
         MODEL_NAME,
+        MODEL_NAME_VALUE,
         MODEL_CHILD,
         MODEL_MORE_THAN_ONE_ENCAPSULATION,
-        IMPORT_ATTRIBUTE,
+        IMPORT_ELEMENT,
         IMPORT_HREF,
+        IMPORT_HREF_LOCATOR,
         IMPORT_CHILD,
-        IMPORT_EQUIVALENT,
+        IMPORT_EQUIVALENT_INFOSET,
+        IMPORT_UNITS_ELEMENT,
         IMPORT_UNITS_NAME,
+        IMPORT_UNITS_NAME_VALUE,
         IMPORT_UNITS_NAME_UNIQUE,
-        IMPORT_UNITS_REF,
+        IMPORT_UNITS_UNITS_REFERENCE,
+        IMPORT_UNITS_UNITS_REFERENCE_VALUE,
+        IMPORT_UNITS_UNITS_REFERENCE_VALUE_TARGET,
+        IMPORT_COMPONENT_ELEMENT,
         IMPORT_COMPONENT_NAME,
+        IMPORT_COMPONENT_NAME_VALUE,
         IMPORT_COMPONENT_NAME_UNIQUE,
-        IMPORT_COMPONENT_COMPONENT_REF,
-        UNITS_ATTRIBUTE,
+        IMPORT_COMPONENT_COMPONENT_REFERENCE,
+        IMPORT_COMPONENT_COMPONENT_REFERENCE_VALUE,
+        IMPORT_COMPONENT_COMPONENT_REFERENCE_TARGET,
+        UNITS_ELEMENT,
         UNITS_NAME,
+        UNITS_NAME_VALUE,
         UNITS_NAME_UNIQUE,
         UNITS_STANDARD,
         UNITS_CHILD,
-        UNIT_ATTRIBUTE,
-        UNIT_UNITS_REF,
-        UNIT_CIRCULAR_REF,
-        UNIT_OPTIONAL_ATTRIBUTE,
-        UNIT_PREFIX,
-        UNIT_MULTIPLIER,
-        UNIT_EXPONENT,
-        COMPONENT_ATTRIBUTE,
+        UNIT_ELEMENT,
+        UNIT_UNITS,
+        UNIT_UNITS_REFERENCE,
+        UNIT_UNITS_CIRCULAR_REFERENCE,
+        UNIT_ATTRIBUTE_OPTIONAL,
+        UNIT_ATTRIBUTE_PREFIX_VALUE,
+        UNIT_ATTRIBUTE_MULTIPLIER_VALUE,
+        UNIT_ATTRIBUTE_EXPONENT_VALUE,
+        COMPONENT_ELEMENT,
         COMPONENT_NAME,
+        COMPONENT_NAME_VALUE,
         COMPONENT_NAME_UNIQUE,
         COMPONENT_CHILD,
-        VARIABLE_ATTRIBUTE,
-        VARIABLE_CHILD,
-        VARIABLE_NAME,
+        VARIABLE_ELEMENT,
+        VARIABLE_ATTRIBUTE_REQUIRED,
+        VARIABLE_NAME_VALUE,
         VARIABLE_NAME_UNIQUE,
-        VARIABLE_UNITS,
-        VARIABLE_INTERFACE,
-        VARIABLE_INITIAL_VALUE,
-        RESET_ATTRIBUTE,
-        RESET_VARIABLE_REF,
-        RESET_TEST_VARIABLE_REF,
-        RESET_ORDER,
+        VARIABLE_UNITS_VALUE,
+        VARIABLE_ATTRIBUTE_OPTIONAL,
+        VARIABLE_INTERFACE_VALUE,
+        VARIABLE_INITIAL_VALUE_VALUE,
+        RESET_ELEMENT,
+        RESET_ATTRIBUTE_REQUIRED,
+        RESET_VARIABLE_REFERENCE,
+        RESET_TEST_VARIABLE_REFERENCE,
+        RESET_ORDER_VALUE,
+        RESET_ORDER_UNIQUE,
         RESET_CHILD,
-        RESET_TEST_VALUE,
-        RESET_RESET_VALUE,
+        RESET_RESET_VALUE_CHILD,
+        RESET_TEST_VALUE_CHILD,
+        TEST_VALUE_ELEMENT,
+        TEST_VALUE_CHILD,
+        RESET_VALUE_ELEMENT,
+        RESET_VALUE_CHILD,
+        MATH_ELEMENT,
         MATH_MATHML,
         MATH_CHILD,
-        MATH_CI_VARIABLE_REF,
-        MATH_CN_UNITS,
+        MATH_CI_VARIABLE_REFERENCE,
+        MATH_CN_UNITS_ATTRIBUTE,
+        MATH_CN_UNITS_ATTRIBUTE_REFERENCE,
         MATH_CN_BASE10,
         MATH_CN_FORMAT,
-        ENCAPSULATION_ATTRIBUTE,
+        ENCAPSULATION_ELEMENT,
         ENCAPSULATION_CHILD,
-        COMPONENT_REF_COMPONENT,
+        COMPONENT_REF_ELEMENT,
+        COMPONENT_REF_COMPONENT_ATTRIBUTE,
+        COMPONENT_REF_COMPONENT_ATTRIBUTE_REFERENCE,
+        COMPONENT_REF_COMPONENT_ATTRIBUTE_UNIQUE,
         COMPONENT_REF_CHILD,
-        CONNECTION_ATTRIBUTE,
-        CONNECTION_COMPONENT1,
-        CONNECTION_COMPONENT2,
+        CONNECTION_ELEMENT,
+        CONNECTION_COMPONENT1_ATTRIBUTE,
+        CONNECTION_COMPONENT1_ATTRIBUTE_REFERENCE,
+        CONNECTION_COMPONENT2_ATTRIBUTE,
+        CONNECTION_COMPONENT2_ATTRIBUTE_REFERENCE,
         CONNECTION_EXCLUDE_SELF,
         CONNECTION_UNIQUE,
         CONNECTION_CHILD,
-        MAP_VARIABLES_ATTRIBUTE,
-        MAP_VARIABLES_VARIABLE1,
-        MAP_VARIABLES_VARIABLE2,
+        MAP_VARIABLES_ELEMENT,
+        MAP_VARIABLES_VARIABLE1_ATTRIBUTE,
+        MAP_VARIABLES_VARIABLE1_ATTRIBUTE_REFERENCE,
+        MAP_VARIABLES_VARIABLE2_ATTRIBUTE,
+        MAP_VARIABLES_VARIABLE2_ATTRIBUTE_REFERENCE,
         MAP_VARIABLES_UNIQUE,
-        MAP_VARIABLES_AVAILABLE_INTERFACE,
+
+        // Secondary specification errors:
+        DATA_REPR_IDENTIFIER_AT_LEAST_ONE_ALPHANUM,
+        DATA_REPR_IDENTIFIER_BEGIN_EURO_NUM,
+        DATA_REPR_IDENTIFIER_LATIN_ALPHANUM,
 
         // Issues not present in the normative specification:
-        MAP_VARIABLES_IDENTICAL_UNIT_REDUCTION,
         INVALID_ARGUMENT,
 
         // Importer class issues:

diff --git a/src/api/libcellml/validator.h b/src/api/libcellml/validator.h
@@ -16,9 +16,6 @@ limitations under the License.
 
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include "libcellml/logger.h"
 #include "libcellml/types.h"