Changeset 34

Timestamp:

May 6, 2008, 3:17:07 AM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

fix some test erors

Location:

ruby/trunk/adl_parser/lib

Files:

• parser.rb (modified) (1 diff)
• scanner.rb (modified) (2 diffs)

ruby/trunk/adl_parser/lib/parser.rb

@@ -14 +14 @@
 require 'lib/scanner.rb'
 require 'rubygems'
-require 'am.rb'
+require '../models/am.rb'
 $DEBUG = true
 

ruby/trunk/adl_parser/lib/scanner.rb

@@ -159 +159 @@
               reserved_parsers = OpenEHR::ADL::Scanner::DADL::RESERVED.map do |keyword| 
                 Yaparc::Tokenize.new(
-                                     Yaparc::Literal.new(keyword[0], false)
+                                     Yaparc::Literal.new(keyword[0])
                                      )
               end
@@ -307 +307 @@
               orderd_reserved = RESERVED.keys.sort{|x,y| y.length <=> x.length  }
               reserved_parsers = orderd_reserved.map do |keyword| 
-                Yaparc::Literal.new(keyword, false)
+                Yaparc::Literal.new(keyword)
               end
               Yaparc::Alt.new(Yaparc::Apply.new(Yaparc::Alt.new(*reserved_parsers)) do |match|