Skip to content

Commit

Permalink
various re-naming for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Meisrimel authored and Peter Meisrimel committed Aug 6, 2024
1 parent 0dd0229 commit 0f2a8f5
Show file tree
Hide file tree
Showing 12 changed files with 275 additions and 275 deletions.
4 changes: 2 additions & 2 deletions src/XML/src/FMI/fmi_xml_terminals_and_icons.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ int fmi_xml_handle_fmiTerminalsAndIcons(fmi3_xml_parser_context_t* context, cons
}
jm_log_verbose(context->callbacks, module, "Parsing XML element fmiTerminalsAndIcons");

ret = fmi3_xml_parse_attr_as_string(context, FMI_TERMICON_ELM(fmi_xml_elmID_termIcon_fmiTerminalsAndIcons), FMI_TERMICON_ATTR(fmi_attr_id_fmiVersion), 1 /* required */,
ret = fmi3_xml_parse_attr_as_string(context, FMI_ELM_TERMICON(fmi_xml_elmID_termIcon_fmiTerminalsAndIcons), FMI_ATTR_TERMICON(fmi_attr_id_fmiVersion), 1 /* required */,
&(termIcon->fmi3_xml_standard_version));
if (ret) {
return ret;
Expand Down Expand Up @@ -193,7 +193,7 @@ int fmi_xml_handle_Terminal(fmi3_xml_parser_context_t* context, const char* data
// parse name
jm_vector(char)* bufName = fmi3_xml_reserve_parse_buffer(context, bufIdx++, 100);
if (!bufName) {return -1;}
if (fmi3_xml_parse_attr_as_string(context, FMI_TERMICON_ELM(fmi_xml_elmID_termIcon_Terminal), FMI_TERMICON_ATTR(fmi_attr_id_name), 1 /* required */, bufName)) {return -1;}
if (fmi3_xml_parse_attr_as_string(context, FMI_ELM_TERMICON(fmi_xml_elmID_termIcon_Terminal), FMI_ATTR_TERMICON(fmi_attr_id_name), 1 /* required */, bufName)) {return -1;}

/* Add the name to the terminalsAndIcons-wide set and retrieve the pointer */
if (jm_vector_get_size(char)(bufName)) {
Expand Down
110 changes: 55 additions & 55 deletions src/XML/src/FMI3/fmi3_xml_model_description.c
View file

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions src/XML/src/FMI3/fmi3_xml_model_description_scheme.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ extern "C" {
#define FMI3_XML_ELMLIST_ABSTRACT_MODEL_DESCR(EXPAND_XML_ELMNAME) \
EXPAND_XML_ELMNAME(Variable)

// XXX: fmi3_xml_modelDescription_elmID_none & fmi3_xml_elmID_Start are defined in fmi3_xml_parser.h, got good style
// XXX: fmi3_xml_elmID_none & fmi3_xml_elmID_Start are defined in fmi3_xml_parser.h, got good style
/*
Define XML schema structure. Used to build the 'fmi3_xml_modelDescription_scheme_info_t' type (in fmi3_xml_parser.c).
Expand All @@ -184,20 +184,20 @@ extern "C" {
if the parent can have multiple elements of this type
*/
/* scheme_ID, super_type, parent_ID, sib_idx, multi_elem */
#define fmi3_xml_scheme_fmiModelDescription {fmi3_xml_modelDescription_elmID_none, fmi3_xml_modelDescription_elmID_none, 0, 0}
#define fmi3_xml_scheme_ModelExchange {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 0, 0}
#define fmi3_xml_scheme_SourceFiles {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelExchange, 0, 0}
#define fmi3_xml_scheme_File {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_SourceFiles, 0, 1}
#define fmi3_xml_scheme_CoSimulation {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 1, 0}
#define fmi3_xml_scheme_ScheduledExecution {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 2, 0}
#define fmi3_xml_scheme_SourceFilesCS {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_CoSimulation, 0, 0}
#define fmi3_xml_scheme_FileCS {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_SourceFilesCS, 0, 1}
#define fmi3_xml_scheme_UnitDefinitions {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 2, 0}
#define fmi3_xml_scheme_Unit {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_UnitDefinitions, 0, 1}
#define fmi3_xml_scheme_BaseUnit {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_Unit, 0, 0}
#define fmi3_xml_scheme_DisplayUnit {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_Unit, 1, 1}
#define fmi3_xml_scheme_TypeDefinitions {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 3, 0}
#define fmi3_xml_scheme_SimpleType {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_fmiModelDescription {fmi3_xml_elmID_none, fmi3_xml_elmID_none, 0, 0}
#define fmi3_xml_scheme_ModelExchange {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 0, 0}
#define fmi3_xml_scheme_SourceFiles {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelExchange, 0, 0}
#define fmi3_xml_scheme_File {fmi3_xml_elmID_none, fmi3_xml_elmID_SourceFiles, 0, 1}
#define fmi3_xml_scheme_CoSimulation {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 1, 0}
#define fmi3_xml_scheme_ScheduledExecution {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 2, 0}
#define fmi3_xml_scheme_SourceFilesCS {fmi3_xml_elmID_none, fmi3_xml_elmID_CoSimulation, 0, 0}
#define fmi3_xml_scheme_FileCS {fmi3_xml_elmID_none, fmi3_xml_elmID_SourceFilesCS, 0, 1}
#define fmi3_xml_scheme_UnitDefinitions {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 2, 0}
#define fmi3_xml_scheme_Unit {fmi3_xml_elmID_none, fmi3_xml_elmID_UnitDefinitions, 0, 1}
#define fmi3_xml_scheme_BaseUnit {fmi3_xml_elmID_none, fmi3_xml_elmID_Unit, 0, 0}
#define fmi3_xml_scheme_DisplayUnit {fmi3_xml_elmID_none, fmi3_xml_elmID_Unit, 1, 1}
#define fmi3_xml_scheme_TypeDefinitions {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 3, 0}
#define fmi3_xml_scheme_SimpleType {fmi3_xml_elmID_none, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_Float64Type {fmi3_xml_elmID_SimpleType, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_Float32Type {fmi3_xml_elmID_SimpleType, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_Int64Type {fmi3_xml_elmID_SimpleType, fmi3_xml_elmID_TypeDefinitions, 0, 1}
Expand All @@ -213,22 +213,22 @@ extern "C" {
#define fmi3_xml_scheme_ClockType {fmi3_xml_elmID_SimpleType, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_StringType {fmi3_xml_elmID_SimpleType, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_EnumerationType {fmi3_xml_elmID_SimpleType, fmi3_xml_elmID_TypeDefinitions, 0, 1}
#define fmi3_xml_scheme_Item {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_EnumerationType, 0, 1}
#define fmi3_xml_scheme_LogCategories {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 4, 0}
#define fmi3_xml_scheme_Category {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_LogCategories, 0, 1}
#define fmi3_xml_scheme_DefaultExperiment {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 5, 0}
#define fmi3_xml_scheme_VendorAnnotations {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 6, 0}
#define fmi3_xml_scheme_Tool {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_VendorAnnotations, 0, 1}
#define fmi3_xml_scheme_ModelVariables {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 7, 0}
#define fmi3_xml_scheme_Item {fmi3_xml_elmID_none, fmi3_xml_elmID_EnumerationType, 0, 1}
#define fmi3_xml_scheme_LogCategories {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 4, 0}
#define fmi3_xml_scheme_Category {fmi3_xml_elmID_none, fmi3_xml_elmID_LogCategories, 0, 1}
#define fmi3_xml_scheme_DefaultExperiment {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 5, 0}
#define fmi3_xml_scheme_VendorAnnotations {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 6, 0}
#define fmi3_xml_scheme_Tool {fmi3_xml_elmID_none, fmi3_xml_elmID_VendorAnnotations, 0, 1}
#define fmi3_xml_scheme_ModelVariables {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 7, 0}

#define fmi3_xml_scheme_ModelStructure {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_fmiModelDescription, 8, 0}
#define fmi3_xml_scheme_Output {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelStructure, 0, 1}
#define fmi3_xml_scheme_ContinuousStateDerivative {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelStructure, 1, 1}
#define fmi3_xml_scheme_ClockedState {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelStructure, 2, 1}
#define fmi3_xml_scheme_InitialUnknown {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelStructure, 3, 1}
#define fmi3_xml_scheme_EventIndicator {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelStructure, 4, 1}
#define fmi3_xml_scheme_ModelStructure {fmi3_xml_elmID_none, fmi3_xml_elmID_fmiModelDescription, 8, 0}
#define fmi3_xml_scheme_Output {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelStructure, 0, 1}
#define fmi3_xml_scheme_ContinuousStateDerivative {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelStructure, 1, 1}
#define fmi3_xml_scheme_ClockedState {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelStructure, 2, 1}
#define fmi3_xml_scheme_InitialUnknown {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelStructure, 3, 1}
#define fmi3_xml_scheme_EventIndicator {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelStructure, 4, 1}

#define fmi3_xml_scheme_Variable {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_ModelVariables, 0, 1}
#define fmi3_xml_scheme_Variable {fmi3_xml_elmID_none, fmi3_xml_elmID_ModelVariables, 0, 1}
#define fmi3_xml_scheme_Float64 {fmi3_xml_elmID_Variable, fmi3_xml_elmID_ModelVariables, 0, 1}
#define fmi3_xml_scheme_Float32 {fmi3_xml_elmID_Variable, fmi3_xml_elmID_ModelVariables, 0, 1}
#define fmi3_xml_scheme_Int64 {fmi3_xml_elmID_Variable, fmi3_xml_elmID_ModelVariables, 0, 1}
Expand All @@ -245,18 +245,18 @@ extern "C" {
#define fmi3_xml_scheme_String {fmi3_xml_elmID_Variable, fmi3_xml_elmID_ModelVariables, 0, 1}
#define fmi3_xml_scheme_Enumeration {fmi3_xml_elmID_Variable, fmi3_xml_elmID_ModelVariables, 0, 1}

#define fmi3_xml_scheme_Dimension {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_Variable, 0, 1}
#define fmi3_xml_scheme_Dimension {fmi3_xml_elmID_none, fmi3_xml_elmID_Variable, 0, 1}
#define fmi3_xml_scheme_BinaryVariableStart {fmi3_xml_elmID_Start, fmi3_xml_elmID_Binary, 1, 1}
#define fmi3_xml_scheme_StringVariableStart {fmi3_xml_elmID_Start, fmi3_xml_elmID_String, 1, 1}
#define fmi3_xml_scheme_Alias {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_Variable, 2, 1}
#define fmi3_xml_scheme_Alias {fmi3_xml_elmID_none, fmi3_xml_elmID_Variable, 2, 1}

#define fmi3_xml_scheme_Annotations {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_Variable, 1, 0}
#define fmi3_xml_scheme_VariableTool {fmi3_xml_modelDescription_elmID_none, fmi3_xml_elmID_Annotations, 0, 1}
#define fmi3_xml_scheme_Annotations {fmi3_xml_elmID_none, fmi3_xml_elmID_Variable, 1, 0}
#define fmi3_xml_scheme_VariableTool {fmi3_xml_elmID_none, fmi3_xml_elmID_Annotations, 0, 1}

// Not used except for setting up the element handler framework:
#define fmi3_xml_scheme_Start {fmi3_xml_modelDescription_elmID_none, fmi3_xml_modelDescription_elmID_none, 1, 0}
#define fmi3_xml_scheme_Start {fmi3_xml_elmID_none, fmi3_xml_elmID_none, 1, 0}

// TODO: List formatting + use terminals and Icons type
// TODO: List formatting
// TODO: rename to include modelDescription in name?

#ifdef __cplusplus
Expand Down
16 changes: 8 additions & 8 deletions src/XML/src/FMI3/fmi3_xml_model_structure.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static int fmi3_xml_parse_dependencies(fmi3_xml_parser_context_t* context,
<xs:list itemType="xs:unsignedInt"/>
</xs:simpleType>
</xs:attribute> */
if (fmi3_xml_get_attr_str(context, elmID, FMI3_MODELDESCRIPTION_ATTR(fmi_attr_id_dependencies), 0, &listInd)) {
if (fmi3_xml_get_attr_str(context, elmID, FMI3_ATTR(fmi_attr_id_dependencies), 0, &listInd)) {
return -1;
}
if (listInd) {
Expand Down Expand Up @@ -297,7 +297,7 @@ static int fmi3_xml_parse_dependencies(fmi3_xml_parser_context_t* context,
</xs:simpleType>
</xs:attribute>
*/
if (fmi3_xml_get_attr_str(context, elmID, FMI3_MODELDESCRIPTION_ATTR(fmi_attr_id_dependenciesKind), 0, &listKind)) {
if (fmi3_xml_get_attr_str(context, elmID, FMI3_ATTR(fmi_attr_id_dependenciesKind), 0, &listKind)) {
return -1;
}
if (listKind) {
Expand Down Expand Up @@ -424,7 +424,7 @@ int fmi3_xml_parse_unknown(fmi3_xml_parser_context_t* context,
fmi3_value_reference_t vr;
fmi3_xml_variable_t* variable;

if (fmi3_xml_parse_attr_as_uint32(context, elmID, FMI3_MODELDESCRIPTION_ATTR(fmi_attr_id_valueReference), 1, &vr, 0)){
if (fmi3_xml_parse_attr_as_uint32(context, elmID, FMI3_ATTR(fmi_attr_id_valueReference), 1, &vr, 0)){
fmi3_xml_set_model_structure_invalid(ms);
return -1;
}
Expand All @@ -449,7 +449,7 @@ int fmi3_xml_handle_Output(fmi3_xml_parser_context_t* context, const char* data)
fmi3_xml_model_description_t* md = context->modelDescription;
fmi3_xml_model_structure_t* ms = md->modelStructure;
if (!data) {
if (fmi3_xml_parse_unknown(context, FMI3_MODELDESCRIPTION_ELM(fmi3_xml_elmID_Output), &ms->outputs, ms->outputDeps)) {
if (fmi3_xml_parse_unknown(context, FMI3_ELM(fmi3_xml_elmID_Output), &ms->outputs, ms->outputDeps)) {
return -1;
}
} else {
Expand All @@ -471,7 +471,7 @@ int fmi3_xml_handle_ContinuousStateDerivative(fmi3_xml_parser_context_t* context
fmi3_xml_model_structure_t* ms = md->modelStructure;
if (!data) {
/* perform the parsing */
if (fmi3_xml_parse_unknown(context, FMI3_MODELDESCRIPTION_ELM(fmi3_xml_elmID_ContinuousStateDerivative),
if (fmi3_xml_parse_unknown(context, FMI3_ELM(fmi3_xml_elmID_ContinuousStateDerivative),
&ms->continuousStateDerivatives, ms->continuousStateDerivativeDeps)) {
return -1;
}
Expand Down Expand Up @@ -502,7 +502,7 @@ int fmi3_xml_handle_ClockedState(fmi3_xml_parser_context_t* context, const char*
fmi3_xml_model_description_t* md = context->modelDescription;
fmi3_xml_model_structure_t* ms = md->modelStructure;
if (!data) {
if (fmi3_xml_parse_unknown(context, FMI3_MODELDESCRIPTION_ELM(fmi3_xml_elmID_ClockedState),
if (fmi3_xml_parse_unknown(context, FMI3_ELM(fmi3_xml_elmID_ClockedState),
&ms->clockedStates, ms->clockedStateDeps)) {
return -1;
}
Expand Down Expand Up @@ -535,7 +535,7 @@ int fmi3_xml_handle_InitialUnknown(fmi3_xml_parser_context_t* context, const cha
fmi3_xml_model_description_t* md = context->modelDescription;
fmi3_xml_model_structure_t* ms = md->modelStructure;
if (!data) {
if (fmi3_xml_parse_unknown(context, FMI3_MODELDESCRIPTION_ELM(fmi3_xml_elmID_InitialUnknown), &ms->initialUnknowns, ms->initialUnknownDeps)) {
if (fmi3_xml_parse_unknown(context, FMI3_ELM(fmi3_xml_elmID_InitialUnknown), &ms->initialUnknowns, ms->initialUnknownDeps)) {
return -1;
}
} else {
Expand All @@ -561,7 +561,7 @@ int fmi3_xml_handle_EventIndicator(fmi3_xml_parser_context_t* context, const cha
}

if (!data) {
if (fmi3_xml_parse_unknown(context, FMI3_MODELDESCRIPTION_ELM(fmi3_xml_elmID_EventIndicator),
if (fmi3_xml_parse_unknown(context, FMI3_ELM(fmi3_xml_elmID_EventIndicator),
&ms->eventIndicators, ms->eventIndicatorDeps)) {
return -1;
}
Expand Down
Loading

0 comments on commit 0f2a8f5

Please sign in to comment.