Changeset 315 for ruby/trunk/lib/adl_parser/lib/adl_scanner.rb

Timestamp:

Oct 12, 2009, 3:56:13 PM (15 years ago)

Author:

Tatsukawa, Akimichi

Message:

adl_scanner should properly change cADL or dADL scanners

File:

• ruby/trunk/lib/adl_parser/lib/adl_scanner.rb (modified) (3 diffs)

ruby/trunk/lib/adl_parser/lib/adl_scanner.rb

@@ -271 +271 @@
                 ;
               when /\A[ \t\r\f]+/ #just drop it
-                #@@logger.debug("DADLScanner#scan:  white space, data = #{data.inspect}")
+                ##@@logger.debug("DADLScanner#scan:  white space, data = #{data.inspect}")
                 ;
               when /\A--.*/ # single line comment
-#                @lineno += 1
                 @@logger.debug("DADLScanner#scan: COMMENT = #{$&} at #{@filename}:#{@lineno}")
                 ;
@@ -399 +398 @@
                 @@logger.debug("DADLScanner#scan: V_STRING, #{$1}")
                 yield :V_STRING, $1
+              when /\A[0-9]+\.[0-9]+|[0-9]+\.[0-9]+[eE][+-]?[0-9]+ /   #V_REAL
+                yield :V_REAL, $&
               when /\A[0-9]+|[0-9]+[eE][+-]?[0-9]+/   #V_INTEGER
                 @@logger.debug("DADLScanner#scan: V_INTEGER = #{$&}")
@@ -631 +632 @@
               when /\A[0-9]{4}-[0-1][0-9]-[0-3][0-9]|[0-9]{4}-[0-1][0-9]/   #V_ISO8601_EXTENDED_DATE YYYY-MM-DD
                 yield :V_ISO8601_EXTENDED_DATE, $&
-              when /\A[0-9]+|[0-9]+[eE][+-]?[0-9]+/   #V_INTEGER
-                @@logger.debug("CADLScanner#scan: V_INTEGER = #{$&}")
-                yield :V_INTEGER, $&
-              when /\A[0-9]+\.[0-9]+|[0-9]+\.[0-9]+[eE][+-]?[0-9]+ /   #V_REAL
-                yield :V_REAL, $&
               when /\A"((?:[^"\\]+|\\.)*)"/ #V_STRING
                 yield :V_STRING, $1
               when /\A"([^"]*)"/m #V_STRING
                 yield :V_STRING, $1
+              when /\A[0-9]+\.[0-9]+|[0-9]+\.[0-9]+[eE][+-]?[0-9]+ /   #V_REAL
+                yield :V_REAL, $&
+              when /\A[0-9]+|[0-9]+[eE][+-]?[0-9]+/   #V_INTEGER
+                @@logger.debug("CADLScanner#scan: V_INTEGER = #{$&}")
+                yield :V_INTEGER, $&
               when /\A[a-z]+:\/\/[^<>|\\{}^~"\[\] ]*/ #V_URI
                 yield :V_URI, $&