xmi 0.1.0 → 0.2.0

data/lib/xmi/uml13/activity_state.rb

@@ -1,32 +1,34 @@
-require 'shale'
+# frozen_string_literal: true
 
-require_relative 'model_elementbehavior'
-require_relative 'model_elementbinding'
-require_relative 'model_elementcollaboration'
-require_relative 'model_elementconstraint'
-require_relative 'model_elementelement_reference'
-require_relative 'model_elementimplementation'
-require_relative 'model_elementname'
-require_relative 'model_elementnamespace'
-require_relative 'model_elementpartition'
-require_relative 'model_elementpresentation'
-require_relative 'model_elementprovision'
-require_relative 'model_elementrequirement'
-require_relative 'model_elementstereotype'
-require_relative 'model_elementtagged_value'
-require_relative 'model_elementtemplate'
-require_relative 'model_elementtemplate_parameter'
-require_relative 'model_elementview'
-require_relative 'model_elementvisibility'
-require_relative 'state_vertexincoming'
-require_relative 'state_vertexoutgoing'
-require_relative 'state_vertexparent'
-require_relative 'stateclassifier_in_state'
-require_relative 'statedeferred_event'
-require_relative 'stateentry'
-require_relative 'stateexit'
-require_relative 'stateinternal_transition'
-require_relative 'xm_iextension'
+require "shale"
+
+require_relative "model_elementbehavior"
+require_relative "model_elementbinding"
+require_relative "model_elementcollaboration"
+require_relative "model_elementconstraint"
+require_relative "model_elementelement_reference"
+require_relative "model_elementimplementation"
+require_relative "model_elementname"
+require_relative "model_elementnamespace"
+require_relative "model_elementpartition"
+require_relative "model_elementpresentation"
+require_relative "model_elementprovision"
+require_relative "model_elementrequirement"
+require_relative "model_elementstereotype"
+require_relative "model_elementtagged_value"
+require_relative "model_elementtemplate"
+require_relative "model_elementtemplate_parameter"
+require_relative "model_elementview"
+require_relative "model_elementvisibility"
+require_relative "state_vertexincoming"
+require_relative "state_vertexoutgoing"
+require_relative "state_vertexparent"
+require_relative "stateclassifier_in_state"
+require_relative "statedeferred_event"
+require_relative "stateentry"
+require_relative "stateexit"
+require_relative "stateinternal_transition"
+require_relative "xm_iextension"
 
 class ActivityState < Shale::Mapper
   attribute :name, Shale::Type::Value
@@ -87,64 +89,64 @@ class ActivityState < Shale::Mapper
   attribute :state_exit, Stateexit, collection: true
 
   xml do
-    root 'ActivityState'
-    namespace 'omg.org/UML1.3', 'UML'
+    root "ActivityState"
+    namespace "omg.org/UML1.3", "UML"
 
-    map_attribute 'name', to: :name
-    map_attribute 'visibility', to: :visibility
-    map_attribute 'binding', to: :binding
-    map_attribute 'template', to: :template
-    map_attribute 'templateParameter', to: :template_parameter
-    map_attribute 'implementation', to: :implementation
-    map_attribute 'view', to: :view
-    map_attribute 'presentation', to: :presentation
-    map_attribute 'namespace', to: :namespace
-    map_attribute 'constraint', to: :constraint
-    map_attribute 'requirement', to: :requirement
-    map_attribute 'provision', to: :provision
-    map_attribute 'stereotype', to: :stereotype
-    map_attribute 'elementReference', to: :element_reference
-    map_attribute 'collaboration', to: :collaboration
-    map_attribute 'behavior', to: :behavior
-    map_attribute 'partition', to: :partition
-    map_attribute 'outgoing', to: :outgoing
-    map_attribute 'incoming', to: :incoming
-    map_attribute 'parent', to: :parent
-    map_attribute 'State.stateMachine', to: :state_state_machine
-    map_attribute 'deferredEvent', to: :deferred_event
-    map_attribute 'classifierInState', to: :classifier_in_state
-    map_attribute 'SubmachineState.stateMachine', to: :submachine_state_state_machine
-    map_attribute 'xmi.id', to: :xmi_id
-    map_attribute 'xmi.label', to: :xmi_label
-    map_attribute 'xmi.uuid', to: :xmi_uuid
-    map_attribute 'href', to: :href
-    map_attribute 'xmi.idref', to: :xmi_idref
-    map_element 'ModelElement.name', to: :model_element_name
-    map_element 'ModelElement.visibility', to: :model_element_visibility
-    map_element 'XMI.extension', to: :xmi_extension, prefix: nil, namespace: nil
-    map_element 'ModelElement.binding', to: :model_element_binding
-    map_element 'ModelElement.template', to: :model_element_template
-    map_element 'ModelElement.templateParameter', to: :model_element_template_parameter
-    map_element 'ModelElement.implementation', to: :model_element_implementation
-    map_element 'ModelElement.view', to: :model_element_view
-    map_element 'ModelElement.presentation', to: :model_element_presentation
-    map_element 'ModelElement.namespace', to: :model_element_namespace
-    map_element 'ModelElement.constraint', to: :model_element_constraint
-    map_element 'ModelElement.requirement', to: :model_element_requirement
-    map_element 'ModelElement.provision', to: :model_element_provision
-    map_element 'ModelElement.stereotype', to: :model_element_stereotype
-    map_element 'ModelElement.elementReference', to: :model_element_element_reference
-    map_element 'ModelElement.collaboration', to: :model_element_collaboration
-    map_element 'ModelElement.behavior', to: :model_element_behavior
-    map_element 'ModelElement.partition', to: :model_element_partition
-    map_element 'StateVertex.outgoing', to: :state_vertex_outgoing
-    map_element 'StateVertex.incoming', to: :state_vertex_incoming
-    map_element 'StateVertex.parent', to: :state_vertex_parent
-    map_element 'State.deferredEvent', to: :state_deferred_event
-    map_element 'State.classifierInState', to: :state_classifier_in_state
-    map_element 'ModelElement.taggedValue', to: :model_element_tagged_value
-    map_element 'State.internalTransition', to: :state_internal_transition
-    map_element 'State.entry', to: :state_entry
-    map_element 'State.exit', to: :state_exit
+    map_attribute "name", to: :name
+    map_attribute "visibility", to: :visibility
+    map_attribute "binding", to: :binding
+    map_attribute "template", to: :template
+    map_attribute "templateParameter", to: :template_parameter
+    map_attribute "implementation", to: :implementation
+    map_attribute "view", to: :view
+    map_attribute "presentation", to: :presentation
+    map_attribute "namespace", to: :namespace
+    map_attribute "constraint", to: :constraint
+    map_attribute "requirement", to: :requirement
+    map_attribute "provision", to: :provision
+    map_attribute "stereotype", to: :stereotype
+    map_attribute "elementReference", to: :element_reference
+    map_attribute "collaboration", to: :collaboration
+    map_attribute "behavior", to: :behavior
+    map_attribute "partition", to: :partition
+    map_attribute "outgoing", to: :outgoing
+    map_attribute "incoming", to: :incoming
+    map_attribute "parent", to: :parent
+    map_attribute "State.stateMachine", to: :state_state_machine
+    map_attribute "deferredEvent", to: :deferred_event
+    map_attribute "classifierInState", to: :classifier_in_state
+    map_attribute "SubmachineState.stateMachine", to: :submachine_state_state_machine
+    map_attribute "xmi.id", to: :xmi_id
+    map_attribute "xmi.label", to: :xmi_label
+    map_attribute "xmi.uuid", to: :xmi_uuid
+    map_attribute "href", to: :href
+    map_attribute "xmi.idref", to: :xmi_idref
+    map_element "ModelElement.name", to: :model_element_name
+    map_element "ModelElement.visibility", to: :model_element_visibility
+    map_element "XMI.extension", to: :xmi_extension, prefix: nil, namespace: nil
+    map_element "ModelElement.binding", to: :model_element_binding
+    map_element "ModelElement.template", to: :model_element_template
+    map_element "ModelElement.templateParameter", to: :model_element_template_parameter
+    map_element "ModelElement.implementation", to: :model_element_implementation
+    map_element "ModelElement.view", to: :model_element_view
+    map_element "ModelElement.presentation", to: :model_element_presentation
+    map_element "ModelElement.namespace", to: :model_element_namespace
+    map_element "ModelElement.constraint", to: :model_element_constraint
+    map_element "ModelElement.requirement", to: :model_element_requirement
+    map_element "ModelElement.provision", to: :model_element_provision
+    map_element "ModelElement.stereotype", to: :model_element_stereotype
+    map_element "ModelElement.elementReference", to: :model_element_element_reference
+    map_element "ModelElement.collaboration", to: :model_element_collaboration
+    map_element "ModelElement.behavior", to: :model_element_behavior
+    map_element "ModelElement.partition", to: :model_element_partition
+    map_element "StateVertex.outgoing", to: :state_vertex_outgoing
+    map_element "StateVertex.incoming", to: :state_vertex_incoming
+    map_element "StateVertex.parent", to: :state_vertex_parent
+    map_element "State.deferredEvent", to: :state_deferred_event
+    map_element "State.classifierInState", to: :state_classifier_in_state
+    map_element "ModelElement.taggedValue", to: :model_element_tagged_value
+    map_element "State.internalTransition", to: :state_internal_transition
+    map_element "State.entry", to: :state_entry
+    map_element "State.exit", to: :state_exit
   end
 end

data/lib/xmi/uml13/actor.rb

@@ -1,40 +1,42 @@
-require 'shale'
+# frozen_string_literal: true
 
-require_relative 'classifierassociation_end'
-require_relative 'classifierclassifier_in_state'
-require_relative 'classifierclassifier_role'
-require_relative 'classifiercreate_action'
-require_relative 'classifierfeature'
-require_relative 'classifierinstance'
-require_relative 'classifierparameter'
-require_relative 'classifierparticipant'
-require_relative 'classifierrealization'
-require_relative 'classifierspecification'
-require_relative 'classifierstructural_feature'
-require_relative 'generalizable_elementgeneralization'
-require_relative 'generalizable_elementis_abstract'
-require_relative 'generalizable_elementis_leaf'
-require_relative 'generalizable_elementis_root'
-require_relative 'generalizable_elementspecialization'
-require_relative 'model_elementbehavior'
-require_relative 'model_elementbinding'
-require_relative 'model_elementconstraint'
-require_relative 'model_elementelement_reference'
-require_relative 'model_elementimplementation'
-require_relative 'model_elementname'
-require_relative 'model_elementnamespace'
-require_relative 'model_elementpartition'
-require_relative 'model_elementpresentation'
-require_relative 'model_elementprovision'
-require_relative 'model_elementrequirement'
-require_relative 'model_elementstereotype'
-require_relative 'model_elementtagged_value'
-require_relative 'model_elementtemplate'
-require_relative 'model_elementtemplate_parameter'
-require_relative 'model_elementview'
-require_relative 'model_elementvisibility'
-require_relative 'namespaceowned_element'
-require_relative 'xm_iextension'
+require "shale"
+
+require_relative "classifierassociation_end"
+require_relative "classifierclassifier_in_state"
+require_relative "classifierclassifier_role"
+require_relative "classifiercreate_action"
+require_relative "classifierfeature"
+require_relative "classifierinstance"
+require_relative "classifierparameter"
+require_relative "classifierparticipant"
+require_relative "classifierrealization"
+require_relative "classifierspecification"
+require_relative "classifierstructural_feature"
+require_relative "generalizable_elementgeneralization"
+require_relative "generalizable_elementis_abstract"
+require_relative "generalizable_elementis_leaf"
+require_relative "generalizable_elementis_root"
+require_relative "generalizable_elementspecialization"
+require_relative "model_elementbehavior"
+require_relative "model_elementbinding"
+require_relative "model_elementconstraint"
+require_relative "model_elementelement_reference"
+require_relative "model_elementimplementation"
+require_relative "model_elementname"
+require_relative "model_elementnamespace"
+require_relative "model_elementpartition"
+require_relative "model_elementpresentation"
+require_relative "model_elementprovision"
+require_relative "model_elementrequirement"
+require_relative "model_elementstereotype"
+require_relative "model_elementtagged_value"
+require_relative "model_elementtemplate"
+require_relative "model_elementtemplate_parameter"
+require_relative "model_elementview"
+require_relative "model_elementvisibility"
+require_relative "namespaceowned_element"
+require_relative "xm_iextension"
 
 class Actor < Shale::Mapper
   attribute :name, Shale::Type::Value
@@ -112,81 +114,81 @@ class Actor < Shale::Mapper
   attribute :classifier_feature, Classifierfeature, collection: true
 
   xml do
-    root 'Actor'
-    namespace 'omg.org/UML1.3', 'UML'
+    root "Actor"
+    namespace "omg.org/UML1.3", "UML"
 
-    map_attribute 'name', to: :name
-    map_attribute 'visibility', to: :visibility
-    map_attribute 'isRoot', to: :is_root
-    map_attribute 'isLeaf', to: :is_leaf
-    map_attribute 'isAbstract', to: :is_abstract
-    map_attribute 'binding', to: :binding
-    map_attribute 'template', to: :template
-    map_attribute 'templateParameter', to: :template_parameter
-    map_attribute 'implementation', to: :implementation
-    map_attribute 'view', to: :view
-    map_attribute 'presentation', to: :presentation
-    map_attribute 'namespace', to: :namespace
-    map_attribute 'constraint', to: :constraint
-    map_attribute 'requirement', to: :requirement
-    map_attribute 'provision', to: :provision
-    map_attribute 'stereotype', to: :stereotype
-    map_attribute 'elementReference', to: :element_reference
-    map_attribute 'ModelElement.collaboration', to: :model_element_collaboration
-    map_attribute 'behavior', to: :behavior
-    map_attribute 'partition', to: :partition
-    map_attribute 'generalization', to: :generalization
-    map_attribute 'specialization', to: :specialization
-    map_attribute 'parameter', to: :parameter
-    map_attribute 'structuralFeature', to: :structural_feature
-    map_attribute 'specification', to: :specification
-    map_attribute 'realization', to: :realization
-    map_attribute 'associationEnd', to: :association_end
-    map_attribute 'participant', to: :participant
-    map_attribute 'createAction', to: :create_action
-    map_attribute 'instance', to: :instance
-    map_attribute 'Classifier.collaboration', to: :classifier_collaboration
-    map_attribute 'classifierRole', to: :classifier_role
-    map_attribute 'classifierInState', to: :classifier_in_state
-    map_attribute 'xmi.id', to: :xmi_id
-    map_attribute 'xmi.label', to: :xmi_label
-    map_attribute 'xmi.uuid', to: :xmi_uuid
-    map_attribute 'href', to: :href
-    map_attribute 'xmi.idref', to: :xmi_idref
-    map_element 'ModelElement.name', to: :model_element_name
-    map_element 'ModelElement.visibility', to: :model_element_visibility
-    map_element 'GeneralizableElement.isRoot', to: :generalizable_element_is_root
-    map_element 'GeneralizableElement.isLeaf', to: :generalizable_element_is_leaf
-    map_element 'GeneralizableElement.isAbstract', to: :generalizable_element_is_abstract
-    map_element 'XMI.extension', to: :xmi_extension, prefix: nil, namespace: nil
-    map_element 'ModelElement.binding', to: :model_element_binding
-    map_element 'ModelElement.template', to: :model_element_template
-    map_element 'ModelElement.templateParameter', to: :model_element_template_parameter
-    map_element 'ModelElement.implementation', to: :model_element_implementation
-    map_element 'ModelElement.view', to: :model_element_view
-    map_element 'ModelElement.presentation', to: :model_element_presentation
-    map_element 'ModelElement.namespace', to: :model_element_namespace
-    map_element 'ModelElement.constraint', to: :model_element_constraint
-    map_element 'ModelElement.requirement', to: :model_element_requirement
-    map_element 'ModelElement.provision', to: :model_element_provision
-    map_element 'ModelElement.stereotype', to: :model_element_stereotype
-    map_element 'ModelElement.elementReference', to: :model_element_element_reference
-    map_element 'ModelElement.behavior', to: :model_element_behavior
-    map_element 'ModelElement.partition', to: :model_element_partition
-    map_element 'GeneralizableElement.generalization', to: :generalizable_element_generalization
-    map_element 'GeneralizableElement.specialization', to: :generalizable_element_specialization
-    map_element 'Classifier.parameter', to: :classifier_parameter
-    map_element 'Classifier.structuralFeature', to: :classifier_structural_feature
-    map_element 'Classifier.specification', to: :classifier_specification
-    map_element 'Classifier.realization', to: :classifier_realization
-    map_element 'Classifier.associationEnd', to: :classifier_association_end
-    map_element 'Classifier.participant', to: :classifier_participant
-    map_element 'Classifier.createAction', to: :classifier_create_action
-    map_element 'Classifier.instance', to: :classifier_instance
-    map_element 'Classifier.classifierRole', to: :classifier_classifier_role
-    map_element 'Classifier.classifierInState', to: :classifier_classifier_in_state
-    map_element 'ModelElement.taggedValue', to: :model_element_tagged_value
-    map_element 'Namespace.ownedElement', to: :namespace_owned_element
-    map_element 'Classifier.feature', to: :classifier_feature
+    map_attribute "name", to: :name
+    map_attribute "visibility", to: :visibility
+    map_attribute "isRoot", to: :is_root
+    map_attribute "isLeaf", to: :is_leaf
+    map_attribute "isAbstract", to: :is_abstract
+    map_attribute "binding", to: :binding
+    map_attribute "template", to: :template
+    map_attribute "templateParameter", to: :template_parameter
+    map_attribute "implementation", to: :implementation
+    map_attribute "view", to: :view
+    map_attribute "presentation", to: :presentation
+    map_attribute "namespace", to: :namespace
+    map_attribute "constraint", to: :constraint
+    map_attribute "requirement", to: :requirement
+    map_attribute "provision", to: :provision
+    map_attribute "stereotype", to: :stereotype
+    map_attribute "elementReference", to: :element_reference
+    map_attribute "ModelElement.collaboration", to: :model_element_collaboration
+    map_attribute "behavior", to: :behavior
+    map_attribute "partition", to: :partition
+    map_attribute "generalization", to: :generalization
+    map_attribute "specialization", to: :specialization
+    map_attribute "parameter", to: :parameter
+    map_attribute "structuralFeature", to: :structural_feature
+    map_attribute "specification", to: :specification
+    map_attribute "realization", to: :realization
+    map_attribute "associationEnd", to: :association_end
+    map_attribute "participant", to: :participant
+    map_attribute "createAction", to: :create_action
+    map_attribute "instance", to: :instance
+    map_attribute "Classifier.collaboration", to: :classifier_collaboration
+    map_attribute "classifierRole", to: :classifier_role
+    map_attribute "classifierInState", to: :classifier_in_state
+    map_attribute "xmi.id", to: :xmi_id
+    map_attribute "xmi.label", to: :xmi_label
+    map_attribute "xmi.uuid", to: :xmi_uuid
+    map_attribute "href", to: :href
+    map_attribute "xmi.idref", to: :xmi_idref
+    map_element "ModelElement.name", to: :model_element_name
+    map_element "ModelElement.visibility", to: :model_element_visibility
+    map_element "GeneralizableElement.isRoot", to: :generalizable_element_is_root
+    map_element "GeneralizableElement.isLeaf", to: :generalizable_element_is_leaf
+    map_element "GeneralizableElement.isAbstract", to: :generalizable_element_is_abstract
+    map_element "XMI.extension", to: :xmi_extension, prefix: nil, namespace: nil
+    map_element "ModelElement.binding", to: :model_element_binding
+    map_element "ModelElement.template", to: :model_element_template
+    map_element "ModelElement.templateParameter", to: :model_element_template_parameter
+    map_element "ModelElement.implementation", to: :model_element_implementation
+    map_element "ModelElement.view", to: :model_element_view
+    map_element "ModelElement.presentation", to: :model_element_presentation
+    map_element "ModelElement.namespace", to: :model_element_namespace
+    map_element "ModelElement.constraint", to: :model_element_constraint
+    map_element "ModelElement.requirement", to: :model_element_requirement
+    map_element "ModelElement.provision", to: :model_element_provision
+    map_element "ModelElement.stereotype", to: :model_element_stereotype
+    map_element "ModelElement.elementReference", to: :model_element_element_reference
+    map_element "ModelElement.behavior", to: :model_element_behavior
+    map_element "ModelElement.partition", to: :model_element_partition
+    map_element "GeneralizableElement.generalization", to: :generalizable_element_generalization
+    map_element "GeneralizableElement.specialization", to: :generalizable_element_specialization
+    map_element "Classifier.parameter", to: :classifier_parameter
+    map_element "Classifier.structuralFeature", to: :classifier_structural_feature
+    map_element "Classifier.specification", to: :classifier_specification
+    map_element "Classifier.realization", to: :classifier_realization
+    map_element "Classifier.associationEnd", to: :classifier_association_end
+    map_element "Classifier.participant", to: :classifier_participant
+    map_element "Classifier.createAction", to: :classifier_create_action
+    map_element "Classifier.instance", to: :classifier_instance
+    map_element "Classifier.classifierRole", to: :classifier_classifier_role
+    map_element "Classifier.classifierInState", to: :classifier_classifier_in_state
+    map_element "ModelElement.taggedValue", to: :model_element_tagged_value
+    map_element "Namespace.ownedElement", to: :namespace_owned_element
+    map_element "Classifier.feature", to: :classifier_feature
   end
 end

data/lib/xmi/uml13/argument.rb

@@ -1,8 +1,10 @@
-require 'shale'
+# frozen_string_literal: true
 
-require_relative 'argumentaction'
-require_relative 'argumentvalue'
-require_relative 'xm_iextension'
+require "shale"
+
+require_relative "argumentaction"
+require_relative "argumentvalue"
+require_relative "xm_iextension"
 
 class Argument < Shale::Mapper
   attribute :action, Shale::Type::Value
@@ -16,17 +18,17 @@ class Argument < Shale::Mapper
   attribute :argument_action, Argumentaction, collection: true
 
   xml do
-    root 'Argument'
-    namespace 'omg.org/UML1.3', 'UML'
+    root "Argument"
+    namespace "omg.org/UML1.3", "UML"
 
-    map_attribute 'action', to: :action
-    map_attribute 'xmi.id', to: :xmi_id
-    map_attribute 'xmi.label', to: :xmi_label
-    map_attribute 'xmi.uuid', to: :xmi_uuid
-    map_attribute 'href', to: :href
-    map_attribute 'xmi.idref', to: :xmi_idref
-    map_element 'Argument.value', to: :argument_value
-    map_element 'XMI.extension', to: :xmi_extension, prefix: nil, namespace: nil
-    map_element 'Argument.action', to: :argument_action
+    map_attribute "action", to: :action
+    map_attribute "xmi.id", to: :xmi_id
+    map_attribute "xmi.label", to: :xmi_label
+    map_attribute "xmi.uuid", to: :xmi_uuid
+    map_attribute "href", to: :href
+    map_attribute "xmi.idref", to: :xmi_idref
+    map_element "Argument.value", to: :argument_value
+    map_element "XMI.extension", to: :xmi_extension, prefix: nil, namespace: nil
+    map_element "Argument.action", to: :argument_action
   end
 end

data/lib/xmi/uml13/argumentaction.rb

@@ -1,14 +1,16 @@
-require 'shale'
+# frozen_string_literal: true
 
-require_relative 'action'
+require "shale"
+
+require_relative "action"
 
 class Argumentaction < Shale::Mapper
   attribute :action, Action, collection: true
 
   xml do
-    root 'Argument.action'
-    namespace 'omg.org/UML1.3', 'UML'
+    root "Argument.action"
+    namespace "omg.org/UML1.3", "UML"
 
-    map_element 'Action', to: :action
+    map_element "Action", to: :action
   end
 end

data/lib/xmi/uml13/argumentvalue.rb

@@ -1,10 +1,12 @@
-require 'shale'
+# frozen_string_literal: true
 
-require_relative 'boolean_expression'
-require_relative 'expression'
-require_relative 'object_set_expression'
-require_relative 'procedure_expression'
-require_relative 'time_expression'
+require "shale"
+
+require_relative "boolean_expression"
+require_relative "expression"
+require_relative "object_set_expression"
+require_relative "procedure_expression"
+require_relative "time_expression"
 
 class Argumentvalue < Shale::Mapper
   attribute :expression, Expression
@@ -14,13 +16,13 @@ class Argumentvalue < Shale::Mapper
   attribute :boolean_expression, BooleanExpression
 
   xml do
-    root 'Argument.value'
-    namespace 'omg.org/UML1.3', 'UML'
+    root "Argument.value"
+    namespace "omg.org/UML1.3", "UML"
 
-    map_element 'Expression', to: :expression
-    map_element 'ProcedureExpression', to: :procedure_expression
-    map_element 'ObjectSetExpression', to: :object_set_expression
-    map_element 'TimeExpression', to: :time_expression
-    map_element 'BooleanExpression', to: :boolean_expression
+    map_element "Expression", to: :expression
+    map_element "ProcedureExpression", to: :procedure_expression
+    map_element "ObjectSetExpression", to: :object_set_expression
+    map_element "TimeExpression", to: :time_expression
+    map_element "BooleanExpression", to: :boolean_expression
   end
 end