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

Timestamp:

Apr 26, 2008, 8:04:21 PM (16 years ago)

Author:

Tatsukawa, Akimichi

Message:

begin to add scanner module using yaparc

File:

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

ruby/trunk/adl_parser/lib/parser.y

@@ -1 @@
-
 
 class OpenEHR::ADL::Parser
@@ -635 +634 @@
 
 $:.unshift File.join(File.dirname(__FILE__))
+require 'logger'
 require 'lib/util.rb'
+require 'lib/scanner.rb'
 $DEBUG = true
 
 
+
 ---- inner
+
+@@log = Logger.new('log/parser.log')
+@@dadl_scanner = OpenEHR::ADL::Scanner::DADL::RootScanner.new
+
 ###----------/* keywords */ --------------------------------------------- 
 @@adl_reserved = {
@@ -1096 +1102 @@
     when :dadl
 #      puts "Entering scan_dadl"
+      case scanned = @@dadl_scanner.parse(data)
+      when Yaparc::Result::OK
+        yield scanned.value
+        data = scanned.input
+###       when Yaparc::Result::Fail
+###         raise "Scan Failed: #{scanned}"
+###       when Yaparc::Result::Error
+###         raise "Scan Error: #{scanned}"
+      else
+        
+      end
+
       case data
       when /\A\n/ # carriage return
@@ -1184 +1202 @@
         end
         yield :SYM_INTERVAL_DELIM, :SYM_INTERVAL_DELIM
-      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\._-]+\]/   #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._\-]*\]/   #V_LOCAL_TERM_CODE_REF
+###         yield :V_LOCAL_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