Changeset 26 for ruby/trunk/adl_parser/lib/parser.y

Timestamp:

May 2, 2008, 1:47:51 AM (16 years ago)

Author:

Tatsukawa, Akimichi

Message:

fixed parser.y

File:

• ruby/trunk/adl_parser/lib/parser.y (modified) (10 diffs)

ruby/trunk/adl_parser/lib/parser.y

@@ -39 +39 @@
     end
     
-    result = OpenEHR::AM::Archetype::ARCHETYPE.new(
-                                                   :description => val[4],
-                                                   :definition => val[5],
-                                                   :ontology => val[7]
-                                                   )
+    archetype_id = val[0][:archetype_id]
+    adl_version = val[0][:arch_head][:arch_meta_data][:adl_version]
+    concept = val[2]
+    language = val[3][:arch_language]
+    archetype = OpenEHR::AM::Archetype::ARCHETYPE.create(
+                                                         :archetype_id => archetype_id,
+                                                         :adl_version => adl_version,
+                                                         :concept => concept,
+                                                         :description => val[4],
+                                                         :definition => val[5],
+                                                         :ontology => val[7]
+                                                         ) do |archetype|
+      archetype.original_language = language
+    end
+    @@log.info("#{__FILE__}:#{__LINE__}: archetype = #{archetype} at #{@filename}:#{@lineno}")
+    result = archetype
   }
 
@@ -62 +73 @@
   | SYM_ARCHETYPE arch_meta_data
   { 
+    result = val[1]
+  }
+
+arch_meta_data: Left_parenthesis_code arch_meta_data_items Right_parenthesis_code
+  { 
     result = {:arch_meta_data => val[1] }
   }
 
-arch_meta_data: Left_parenthesis_code arch_meta_data_items Right_parenthesis_code
-  { 
-    result = {:arch_meta_data_items => val[1] }
-  }
-
 arch_meta_data_items: arch_meta_data_item
   { 
-    result = Array[val[0]]
+    result = val[0]
   }
   | arch_meta_data_items Semicolon_code arch_meta_data_item
   { 
-    result = (val[0] << val[2])
+    result = val[0].merge(val[2])
   }
 
@@ -82 +93 @@
 arch_meta_data_item: SYM_ADL_VERSION SYM_EQ V_VERSION_STRING
   { 
-    result = {:adl_version => val[2] }
+    result = {:adl_version => val[2], :is_controlled => false }
   }
   | SYM_IS_CONTROLLED
   { 
-    result = val[0]
+    result = {:is_controlled => true }
   }
 
@@ -96 +107 @@
 
 arch_concept: SYM_CONCEPT V_LOCAL_TERM_CODE_REF
+  { 
+    result = {:arch_concept => val[1] }
+  }
   | SYM_CONCEPT error
 
@@ -103 +117 @@
 
 arch_language: #-- empty is ok for ADL 1.4 tools
+  {
+    result = {:arch_language => nil}
+  }
     | SYM_LANGUAGE dadl_section
   {
-    result = {:language => val[1]}
+    result = {:arch_language => val[1]}
   }
   | SYM_LANGUAGE error
@@ -389 +406 @@
 arch_ontology: SYM_ONTOLOGY dadl_section
   { 
-    dadl_sections = val[1]
+    dadl_section = val[1]
     result = OpenEHR::AM::Archetype::Ontology::ARCHETYPE_ONTOLOGY.new
   }
@@ -808 +825 @@
   {
     @@log.info("#{__FILE__}:#{__LINE__}: V_QUALIFIED_TERM_CODE_REF = #{val[0]} at #{@filename}:#{@lineno}")
+    result = val[0]
   }
 
@@ -817 +835 @@
   {
     @@log.info("#{__FILE__}:#{__LINE__}: V_URI = #{val[0]} at #{@filename}:#{@lineno}")
+    result = val[0]
   }
 
@@ -1087 +1106 @@
 
 duration_pattern: V_ISO8601_DURATION_CONSTRAINT_PATTERN
+  { 
+    result = val[0]
+  }
 
 
@@ -1096 +1118 @@
 require 'lib/util.rb'
 require 'lib/scanner.rb'
-#require 'lib/model.rb'
 require 'rubygems'
 require 'am.rb'