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

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.rb (modified) (8 diffs)

ruby/trunk/adl_parser/lib/parser.rb

@@ -10 +10 @@
 
 $:.unshift File.join(File.dirname(__FILE__))
+require 'logger'
 require 'lib/util.rb'
+require 'lib/scanner.rb'
 $DEBUG = true
 
 
 
+
 module OpenEHR
 
@@ -21 +24 @@
     class Parser < Racc::Parser
 
-module_eval <<'..end lib/parser.y modeval..id35ef94ed29', 'lib/parser.y', 642
+module_eval <<'..end lib/parser.y modeval..idbb16065644', 'lib/parser.y', 644
+
+@@log = Logger.new('log/parser.log')
+@@dadl_scanner = OpenEHR::ADL::Scanner::DADL::RootScanner.new
+
 ###----------/* keywords */ --------------------------------------------- 
 @@adl_reserved = {
@@ -478 +485 @@
     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
@@ -566 +585 @@
         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
@@ -774 +793 @@
 
 
-..end lib/parser.y modeval..id35ef94ed29
+..end lib/parser.y modeval..idbb16065644
 
 ##### racc 1.4.5 generates ###
@@ -2010 +2029 @@
  # reduce 18 omitted
 
-module_eval <<'.,.,', 'lib/parser.y', 74
+module_eval <<'.,.,', 'lib/parser.y', 73
   def _reduce_19( val, _values, result )
     result = {:language => val[1]}
@@ -2039 +2058 @@
  # reduce 30 omitted
 
-module_eval <<'.,.,', 'lib/parser.y', 111
+module_eval <<'.,.,', 'lib/parser.y', 110
   def _reduce_31( val, _values, result )
     result = {:c_complex_object_id => {:type_identifier => val[0]}}
@@ -2046 +2065 @@
 .,.,
 
-module_eval <<'.,.,', 'lib/parser.y', 115
+module_eval <<'.,.,', 'lib/parser.y', 114
   def _reduce_32( val, _values, result )
     result = {:c_complex_object_id => {:type_identifier => val[0], :V_LOCAL_TERM_CODE_REF => val[1]}}