Changeset 20 for ruby/trunk/adl_parser/lib/scanner.rb

Timestamp:

Apr 29, 2008, 9:57:31 AM (16 years ago)

Author:

Tatsukawa, Akimichi

Message:

successful parsing 27 archtypes

File:

• ruby/trunk/adl_parser/lib/scanner.rb (modified) (2 diffs)

ruby/trunk/adl_parser/lib/scanner.rb

@@ -114 +114 @@
             @parser = lambda do |input|
               Yaparc::Apply.new(
-                                Yaparc::Alt.new(Yaparc::Regex.new(/\AP([0-9]+[yY])?([0-9]+[mM])?([0-9]+[wW])?([0-9]+[dD])?T([0-9]+[hH])?([0-9]+[mM])?([0-9]+[sS])?/),
-                                                Yaparc::Regex.new(/AP([0-9]+[yY])?([0-9]+[mM])?([0-9]+[wW])?([0-9]+[dD])?/))) do |match|
+                                Yaparc::Alt.new(Yaparc::Regex.new(/\AP([0-9]+|[yY])?([0-9]+|[mM])?([0-9]+|[wW])?([0-9]+|[dD])?T([0-9]+|[hH])?([0-9]+|[mM])?([0-9]+|[sS])?/),
+                                                Yaparc::Regex.new(/AP([0-9]+|[yY])?([0-9]+|[mM])?([0-9]+|[wW])?([0-9]+|[dD])?/))) do |match|
+#                                 Yaparc::Alt.new(Yaparc::Regex.new(/\AP([0-9]+[yY])?([0-9]+[mM])?([0-9]+[wW])?([0-9]+[dD])?T([0-9]+[hH])?([0-9]+[mM])?([0-9]+[sS])?/),
+#                                                 Yaparc::Regex.new(/AP([0-9]+[yY])?([0-9]+[mM])?([0-9]+[wW])?([0-9]+[dD])?/))) do |match|
                 LOG.info("V_ISO8601_DURATION: #{match}")
                 [:V_ISO8601_DURATION, match]
@@ -255 +257 @@
                 [:START_V_C_DOMAIN_TYPE_BLOCK, match]
               end
-#               parser = Yaparc::Regex.new(/\A[A-Z][a-zA-Z0-9_]*[ \n]*\</)
-#               case result = parser.parse(input)
-#               when Yaparc::Result::OK
-#                 OpenEHR::ADL::Scanner::Common::LOG.info("V_C_DOMAIN_TYPE: #{result.value}")
-#                 Yaparc::Result::Fail.new
-#               else
-#                 Yaparc::Result::Fail.new
-#               end
             end
           end