open_ehr 0.9.5 → 1.0.0

data/lib/open_ehr/parser/cadl_grammar.tt

@@ -53,8 +53,9 @@ module OpenEHR
       rule c_complex_object_head
         c_complex_object_id c_occurrences {
           def value
-            c_complex_object_id.value[:occurrences] = c_occurrences.value
-            c_complex_object_id.value
+            args = c_complex_object_id.value
+            args[:occurrences] = c_occurrences.value
+            args
           end
         }
       / c_complex_object_id '' {
@@ -92,24 +93,40 @@ module OpenEHR
       end
 
       rule c_object
-        c_primitive_object '' {
+        c_dv_quantity '' {
+          def value(node)
+            c_dv_quantity.value(node)
+          end
+        }	   
+      / c_ordinal '' {
+          def value(node)
+            args = c_ordinal.value
+            args[:path] = node.path
+            args[:rm_type_name] = 'DvOrdinal'
+            args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
+              :upper => 1, :lower => 1)
+            OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CDvOrdinal.new(
+             args)
+          end
+        }
+      / c_primitive_object '' {
           def value(node)
             c_primitive_object.value
           end
         }
-      /  c_complex_object '' {
+      / c_complex_object '' {
           def value(node)
             c_complex_object.value(node)
           end
         }
-      / vtc:V_TERM_CODE_CONSTRAINT '' {
+      / c_code_phrase '' {
           def value(node)
-            vtc.value(node)
+            c_code_phrase.value(node)
           end
         }
       / constraint_ref '' {
-          def value(node = nil)
-            constraint_ref.value
+          def value(node)
+            constraint_ref.value(node)
           end
         }
       / archetype_slot '' {
@@ -187,7 +204,10 @@ module OpenEHR
         }
       / c_archetype_slot_id white_space {
           def value(node)
-            c_archetype_slot_id.value
+            args = c_archetype_slot_id.value(node)
+            args[:occurrences] = OpenEHR::AssumedLibraryTypes::Interval.new(
+              :upper => 1, :lower => 1)
+            args
           end
         }
       end
@@ -217,9 +237,9 @@ module OpenEHR
       end
 
       rule c_primitive
-        c_duration '' {
+        c_boolean '' {
           def value
-            c_duration.value
+            c_boolean.value
           end
         }
       / c_date_time '' {
@@ -237,6 +257,11 @@ module OpenEHR
             c_date.value
           end
         }
+      / c_duration '' {
+          def value
+            c_duration.value
+          end
+        }
       / c_real '' {
           def value
             c_real.value
@@ -247,11 +272,6 @@ module OpenEHR
             c_integer.value
           end
         }	
-      / c_boolean '' {
-          def value
-            c_boolean.value
-          end
-        }
       / c_string '' {
           def value
             c_string.value
@@ -408,12 +428,12 @@ module OpenEHR
       rule existence_spec
         lo:V_INTEGER SYM_ELLIPSIS up:V_INTEGER {
           def value
-            OpenEHR::AssumedTypesLibrary::Interval.new(:lower => lo.value, :upper => up.value)
+            OpenEHR::AssumedLibraryTypes::Interval.new(:lower => lo.value, :upper => up.value)
           end
         }
       / V_INTEGER '' {
           def value
-            OpenEHR::AssumedTypesLibrary::Interval.new(:lower => V_INTEGER.value, :upper => V_INTEGER.value)
+            OpenEHR::AssumedLibraryTypes::Interval.new(:lower => V_INTEGER.value, :upper => V_INTEGER.value)
           end
         }
       end
@@ -500,11 +520,10 @@ module OpenEHR
         st:integer_value SYM_ELLIPSIS ed:cardinality_limit_value {
           def value
             if ed.value == '*'
-              interval = OpenEHR::AssumedLibraryTypes::Interval.new(
-                 :lower => st.value,
-                 :upper_unbounded => true)
+              OpenEHR::AssumedLibraryTypes::Interval.new(
+                 :lower => st.value)
             else
-              interval = OpenEHR::AssumedLibraryTypes::Interval.new(
+              OpenEHR::AssumedLibraryTypes::Interval.new(
                 :lower => st.value,
                 :upper => ed.value)
             end
@@ -726,7 +745,7 @@ module OpenEHR
             {:pattern => duration_pattern.value}
           end
         }
-      / duration_pattern '' {
+     / duration_pattern '' {
           def value
             {:pattern => duration_pattern.value}
           end
@@ -760,7 +779,7 @@ module OpenEHR
               args)
           end
         }
-      / c_duration_constraint !';' '' {
+      / c_duration_constraint '' {
           def value
             OpenEHR::AM::Archetype::ConstraintModel::Primitive::CDuration.new(
               c_duration_constraint.value)
@@ -849,9 +868,13 @@ module OpenEHR
       end
 
       rule constraint_ref
-        V_LOCAL_TERM_CODE_REF '' {
-          def value
-            V_LOCAL_TERM_CODE_REF.value
+        vltcr:V_LOCAL_TERM_CODE_REF '' {
+          def value(node)
+            OpenEHR::AM::Archetype::ConstraintModel::ConstraintRef.new(
+              :path => node.path,
+              :rm_type_name => 'ConstraintRef',
+              :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(:upper => 1, :lower => 1),
+              :reference => vltcr.value)
           end
         }
       end
@@ -897,7 +920,7 @@ module OpenEHR
           }
       end
 
-      rule V_TERM_CODE_CONSTRAINT
+      rule c_code_phrase
         ti:V_TERM_CODE code_string_spec ';' space code_string ']' space {
           def value(node)
             ::OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(
@@ -930,6 +953,199 @@ module OpenEHR
         }
       end
 
+      rule SYM_C_DV_ORDINAL
+        'C_DV_ORDINAL' space 
+      end
+
+      rule c_ordinal
+        c_ordinal_spec ';' space integer_value space {
+          def value
+            args = c_ordinal_spec.value
+            args[:assumed_value] = integer_value.value
+            args
+          end
+        }
+      / c_ordinal_spec space '' {
+          def value
+            c_ordinal_spec.value
+          end
+        }
+      / SYM_C_DV_ORDINAL SYM_LT white_space SYM_GT space {
+          def value
+            {:list => nil}
+          end
+      }
+      end
+
+      rule c_ordinal_spec
+        ordinal_list '' {
+          def value
+            {:list => ordinal_list.value}
+          end
+        }
+      / ordinal '' {
+          def value
+            {:list => [ordinal.value]}
+          end
+        }
+      end
+
+      rule ordinal_list
+        first:ordinal more:(',' space ordinal)+ {
+          def value
+            ordinals.map {|o| o.value}
+          end
+
+          def ordinals
+            [first] + more.elements.map {|e| e.ordinal}
+          end
+        }
+      end
+
+      rule ordinal
+        integer_value SYM_INTERVAL_DELIM vqtc:V_QUALIFIED_TERM_CODE_REF !SYM_INTERVAL_DELIM '' {
+          def value
+            symbol = ::OpenEHR::RM::DataTypes::Text::DvCodedText.new(
+              :value => vqtc.text_value, :defining_code => vqtc.value)
+            ::OpenEHR::RM::DataTypes::Quantity::DvOrdinal.new(
+                :value => integer_value.value,
+                :symbol => symbol)
+          end
+        }
+      end
+
+      rule c_dv_quantity
+        SYM_C_DV_QUANTITY SYM_START_DBLOCK
+        prop:property? ql:quantity_list? aqv:assumed_quantity_value?
+        SYM_END_DBLOCK <CDvQuantityItems>
+      / SYM_C_DV_QUANTITY SYM_START_DBLOCK
+        prop:property? aqv:assumed_quantity_value? ql:quantity_list?
+        SYM_END_DBLOCK <CDvQuantityItems>
+      / SYM_C_DV_QUANTITY SYM_START_DBLOCK
+        aqv:assumed_quantity_value? prop:property? ql:quantity_list?
+        SYM_END_DBLOCK <CDvQuantityItems>
+      / SYM_C_DV_QUANTITY SYM_START_DBLOCK
+        aqv:assumed_quantity_value? ql:quantity_list? prop:property?
+        SYM_END_DBLOCK <CDvQuantityItems>
+      / SYM_C_DV_QUANTITY SYM_START_DBLOCK
+        ql:quantity_list? aqv:assumed_quantity_value? prop:property?
+        SYM_END_DBLOCK <CDvQuantityItems>
+      / SYM_C_DV_QUANTITY SYM_START_DBLOCK
+        ql:quantity_list? prop:property? aqv:assumed_quantity_value?
+        SYM_END_DBLOCK <CDvQuantityItems>
+      end
+
+      rule SYM_C_DV_QUANTITY
+        'C_DV_QUANTITY' space
+      end
+
+      rule property
+        SYM_PROPERTY SYM_EQ SYM_START_DBLOCK
+          prop:V_QUALIFIED_TERM_CODE_REF SYM_END_DBLOCK {
+          def value
+            prop.value
+          end
+        }
+      end
+
+      rule SYM_PROPERTY
+        'property' space
+      end
+
+      rule quantity_list
+        SYM_QUANTITY_LIST SYM_EQ SYM_START_DBLOCK
+        c_quantity_items SYM_END_DBLOCK {
+          def value(node)
+            c_quantity_items.value(node)
+          end
+        }
+      end
+
+      rule assumed_quantity_value
+        SYM_ASSUMED_VALUE SYM_EQ SYM_START_DBLOCK 
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK val:real_value SYM_END_DBLOCK)?      
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK val:integer_value SYM_END_DBLOCK)?        
+        SYM_END_DBLOCK <AssumedValueItems>
+      / SYM_ASSUMED_VALUE SYM_EQ SYM_START_DBLOCK 
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK val:integer_value SYM_END_DBLOCK)?        
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK val:real_value SYM_END_DBLOCK)?      
+        SYM_END_DBLOCK <AssumedValueItems>
+      / SYM_ASSUMED_VALUE SYM_EQ SYM_START_DBLOCK 
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK val:integer_value SYM_END_DBLOCK)?        
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK val:real_value SYM_END_DBLOCK)?      
+        SYM_END_DBLOCK <AssumedValueItems>
+      / SYM_ASSUMED_VALUE SYM_EQ SYM_START_DBLOCK 
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK val:integer_value SYM_END_DBLOCK)?        
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK val:real_value SYM_END_DBLOCK)?      
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        SYM_END_DBLOCK <AssumedValueItems>
+      / SYM_ASSUMED_VALUE SYM_EQ SYM_START_DBLOCK 
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK val:real_value SYM_END_DBLOCK)?      
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK val:integer_value SYM_END_DBLOCK)?        
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        SYM_END_DBLOCK <AssumedValueItems>
+      / SYM_ASSUMED_VALUE SYM_EQ SYM_START_DBLOCK 
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK val:real_value SYM_END_DBLOCK)?      
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK val:integer_value SYM_END_DBLOCK)?        
+        SYM_END_DBLOCK <AssumedValueItems>
+      end
+
+      rule SYM_QUANTITY_LIST
+        'list' space
+      end
+
+      rule c_quantity_items
+        c_quantity_item more_cdv:(c_quantity_item white_space)* {
+          def value(node)
+            quantities.map {|q| q.value(node)}
+          end
+
+          def quantities
+            [c_quantity_item] + more_cdv.elements.map {|e| e.c_quantity_item}
+          end
+        }
+      end
+
+      rule c_quantity_item
+        '[' V_STRING ']' white_space SYM_EQ SYM_START_DBLOCK
+        SYM_UNITS SYM_EQ SYM_START_DBLOCK units:V_STRING SYM_END_DBLOCK
+        mag:(SYM_MAGNITUDE SYM_EQ SYM_START_DBLOCK int:real_interval_value SYM_END_DBLOCK)?
+        prec:(SYM_PRECISION SYM_EQ SYM_START_DBLOCK int:integer_interval_value SYM_END_DBLOCK)?
+        SYM_END_DBLOCK {
+          def value(node)
+            magnitude, precision = nil
+            magnitude = mag.int.value unless mag.empty?
+            precision = prec.int.value unless prec.empty?
+            OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CQuantityItem.new(
+              :path => node.path, :rm_type_name => 'DvQuantity',
+              :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
+                :upper => 1, :lower => 1),
+              :units => units.value,
+              :magnitude => magnitude, :precision => precision)
+          end
+        }
+      end
+
+      rule SYM_UNITS
+        'units' space
+      end
+
+      rule SYM_MAGNITUDE
+        'magnitude' space
+      end
+
+      rule SYM_PRECISION
+        'precision' space
+      end
+
+      rule SYM_ASSUMED_VALUE
+        'assumed_value' space
+      end
+
       rule V_C_DOMAIN_TYPE
         '('? [A-Z] IDCHAR* ')'? [ \n]* '<' [^>]* '>'
       end
@@ -1018,7 +1234,7 @@ module OpenEHR
               :reference_type => 'Constraint')
           end
         }
-      / SYM_NOT boolean_leaf {
+      / SYM_NOT boolean_leaf '' {
           def value
             OpenEHR::AM::Archetype::Assertion::ExprUnaryOperator.new(
               :type => 'Boolean',
@@ -1135,7 +1351,7 @@ module OpenEHR
             boolean_expression.value
           end
         }
-      / SYM_TRUE {
+      / SYM_TRUE '' {
           def value
             OpenEHR::AM::Archetype::Assertion::ExprLeaf.new(
               :type => 'Boolean',
@@ -1143,7 +1359,7 @@ module OpenEHR
               :reference_type => 'CONSTANT')
           end
         }
-      / SYM_FALSE {
+      / SYM_FALSE '' {
           def value
             OpenEHR::AM::Archetype::Assertion::ExprLeaf.new(
               :type => 'Boolean',

data/lib/open_ehr/parser/cadl_node.rb

@@ -14,6 +14,31 @@ module OpenEHR
           return parent.nil?
         end
       end
+
+      class CDvQuantityItems < Treetop::Runtime::SyntaxNode
+        def value(node)
+          property = prop.value unless prop.empty?
+          list = ql.value(node) unless ql.empty?
+          av = aqv.value unless aqv.empty?
+          OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CDvQuantity.new(
+            :path => node.path, :rm_type_name => 'DvQuantity',
+            :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
+              :upper => 1, :lower => 1),
+            :property => property, :list => list, :assumed_value => av)
+        end
+      end
+
+      class AssumedValueItems < Treetop::Runtime::SyntaxNode
+        def value
+          magnitude, precision = nil
+          magnitude = mag.val.value unless mag.empty?
+          precision = prec.val.value unless prec.empty?
+          OpenEHR::RM::DataTypes::Quantity::DvQuantity.new(
+            :units => units.value,
+            :magnitude => magnitude,
+            :precision => precision)
+        end
+      end
     end
   end
 end

data/lib/open_ehr/parser/dadl_grammar.tt

@@ -160,7 +160,12 @@ module OpenEHR
       end
 
       rule primitive_object_value
-        term_code '' {
+        term_code_list_value '' {
+          def value
+            term_code_list_value.value
+          end
+        }
+      / term_code '' {
           def value
             term_code.value
           end
@@ -175,11 +180,6 @@ module OpenEHR
             simple_interval_value.value
           end
         }
-      / term_code_list_value '' {
-          def value
-            term_code_list_value.value
-          end
-        }
       / simple_value '' {
           def value
             simple_value.value