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

Timestamp:

Apr 26, 2008, 12:47:03 AM (16 years ago)

Author:

Tatsukawa, Akimichi

Message:

working on dADL language tag

File:

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

ruby/trunk/adl_parser/lib/parser.y

@@ -70 +70 @@
 arch_language: #-- empty is ok for ADL 1.4 tools
     | SYM_LANGUAGE dadl_section
-    | SYM_LANGUAGE error
+  {
+    result = {:language => val[1]}
+  }
+  | SYM_LANGUAGE error
 
 #arch_description: #-- no meta-data ok
@@ -104 +107 @@
 
 c_complex_object_id: type_identifier
+  {
+    result = {:c_complex_object_id => {:type_identifier => val[0]}}
+  }
   | type_identifier V_LOCAL_TERM_CODE_REF
+  {
+    result = {:c_complex_object_id => {:type_identifier => val[0], :V_LOCAL_TERM_CODE_REF => val[1]}}
+  }
 
 c_complex_object_body: c_any #-- used to indicate that any value of a type is ok
@@ -130 +139 @@
   | error
 
-v_c_domain_type: START_V_C_DOMAIN_TYPE v_c_domain_type_body END_V_C_DOMAIN_TYPE
-v_c_domain_type_body: dadl_section
+v_c_domain_type: START_V_C_DOMAIN_TYPE_BLOCK dadl_section END_V_C_DOMAIN_TYPE_BLOCK
 
 # 'archetype_internal_ref' is a node that refers to a previously defined object node in the same archetype.
@@ -246 +254 @@
 single_attr_object_block: untyped_single_attr_object_block
   | type_identifier untyped_single_attr_object_block
-untyped_single_attr_object_block: single_attr_object_complex_head SYM_END_DBLOCK
+untyped_single_attr_object_block: single_attr_object_complex_head SYM_END_DBLOCK # <>
   | single_attr_object_complex_head attr_vals SYM_END_DBLOCK
 single_attr_object_complex_head: SYM_START_DBLOCK
@@ -763 +771 @@
 #          @start_block_received = true
           @adl_type.push(:dadl)
-          yield :SYM_START_DBLOCK, :SYM_START_DBLOCK
+          yield :SYM_START_DBLOCK,  $&
         end
       when /\A\>/   # >
@@ -781 +789 @@
 #        puts "Escaping #{adl_type}"
         assert_at(__FILE__,__LINE__){adl_type == :cadl}
-        yield :SYM_END_CBLOCK, :SYM_END_CBLOCK
+        yield :SYM_END_CBLOCK, $&
       when /\A\-/   # -
         yield :Minus_code, :Minus_code
@@ -917 +925 @@
         @in_c_domain_type = true
         @adl_type.push(:dadl)
-          yield :START_V_C_DOMAIN_TYPE_BLOCK, :START_V_C_DOMAIN_TYPE_BLOCK
+          yield :START_V_C_DOMAIN_TYPE_BLOCK, $&
 ###         else
 ###           raise
@@ -926 +934 @@
         else
           @adl_type.push(:dadl)
-          yield :SYM_START_DBLOCK, :SYM_START_DBLOCK
+          yield :SYM_START_DBLOCK,  $&
         end
       when /\A\>/   # >
@@ -1118 +1126 @@
           @in_interval = false
           yield :SYM_GT, :SYM_GT
-        elsif @in_c_domain_type
-          @in_c_domain_type = false
+        elsif @in_c_domain_type == true
+          assert_at(__FILE__,__LINE__){@adl_type.last == :dadl}
           adl_type = @adl_type.pop
-          assert_at(__FILE__,__LINE__){adl_type == :dadl}
-          yield :END_V_C_DOMAIN_TYPE_BLOCK, :END_V_C_DOMAIN_TYPE_BLOCK
-        else
+          if @adl_type.last == :cadl
+            @in_c_domain_type = false
+            yield :END_V_C_DOMAIN_TYPE_BLOCK, $&
+          else
+            yield :SYM_END_DBLOCK, $&
+          end
+        elsif @in_c_domain_type == false
           adl_type = @adl_type.pop
 #          puts "Escaping #{adl_type}"
           assert_at(__FILE__,__LINE__){adl_type == :dadl}
-          yield :SYM_END_DBLOCK, :SYM_END_DBLOCK
+          yield :SYM_END_DBLOCK, $&
+        else
+          raise
         end
       when /\A\-/   # -
@@ -1166 +1180 @@
         if @in_interval
           @in_interval = false
-#        elsif @start_block_received
-#          @start_block_received = false
         else
           @in_interval = false
         end
         yield :SYM_INTERVAL_DELIM, :SYM_INTERVAL_DELIM
-      when /\A\[[a-zA-Z0-9()\._-]+::[a-zA-Z0-9\._-]+\]/
-#      when /\A\[[a-zA-Z0-9()\._-]+\:\:[a-zA-Z0-9\._-]+\]/   #V_QUALIFIED_TERM_CODE_REF form [ICD10AM(1998)::F23]
+      when /\A\[[a-zA-Z0-9()\._-]+::[a-zA-Z0-9\._-]+\]/   #V_QUALIFIED_TERM_CODE_REF form [ICD10AM(1998)::F23]
         yield :V_QUALIFIED_TERM_CODE_REF, $&
+      when /\A\[[a-zA-Z0-9._\- ]+::[a-zA-Z0-9._\- ]+\]/   #ERR_V_QUALIFIED_TERM_CODE_REF
+        yield :ERR_V_QUALIFIED_TERM_CODE_REF, $&
+      when /\A\[[a-zA-Z0-9][a-zA-Z0-9._\-]*\]/   #V_LOCAL_TERM_CODE_REF
+        yield :V_LOCAL_TERM_CODE_REF, $&
       when /\A\[/   # [
         yield :Left_bracket_code, :Left_bracket_code
       when /\A\]/   # ]
         yield :Right_bracket_code, :Right_bracket_code
-      when /\A[A-Z][a-zA-Z0-9_]*/
+      when /\A[A-Z][a-zA-Z0-9_-]*/
         yield :V_TYPE_IDENTIFIER, $&
       when /\A[A-Z][a-zA-Z0-9_]*<[a-zA-Z0-9,_<>]+>/   #V_GENERIC_TYPE_IDENTIFIER
@@ -1190 +1205 @@
           yield :V_ATTRIBUTE_IDENTIFIER, $&
         end
-      when /\A\[[a-zA-Z0-9._\- ]+::[a-zA-Z0-9._\- ]+\]/   #ERR_V_QUALIFIED_TERM_CODE_REF
-        yield :ERR_V_QUALIFIED_TERM_CODE_REF, $&
-      when /\A\[[a-zA-Z0-9][a-zA-Z0-9._\-]*\]/   #V_LOCAL_TERM_CODE_REF
-        yield :V_LOCAL_TERM_CODE_REF, $&
       when /\Aa[ct][0-9.]+/   #V_LOCAL_CODE
         yield :V_LOCAL_CODE, $&