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

Timestamp:

Oct 12, 2009, 4:20:00 PM (15 years ago)

Author:

Tatsukawa, Akimichi

Message:

refactoring ADL scanners to handle the syntax more properly

File:

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

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

@@ -77 +77 @@
                 @@logger.debug("ADLScanner#scan: COMMENT = #{$&} at #{@filename}:#{@lineno}")
                 ;
-              when /\Adescription/   # description
+              when /\Alanguage/   # language section
+                assert_at(__FILE__,__LINE__){@adl_type.pop == :adl}
+                @adl_type.push(:dadl)
+                yield :SYM_LANGUAGE, :SYM_LANGUAGE
+              when /\Adescription/   # description section
+                assert_at(__FILE__,__LINE__){@adl_type.pop == :dadl}
+                @adl_type.push(:dadl)
                 yield :SYM_DESCRIPTION, :SYM_DESCRIPTION
-              when /\Adefinition/   # definition
+              when /\Adefinition/   # definition section
+                assert_at(__FILE__,__LINE__){@adl_type.pop == :dadl}
+                @adl_type.push(:cadl)
                 yield :SYM_DEFINITION, :SYM_DEFINITION
+              when /\Aontology/   # ontology section
+                assert_at(__FILE__,__LINE__){@adl_type.pop == :cadl}
+                @adl_type.push(:dadl)
+                yield :SYM_ONTOLOGY, :SYM_ONTOLOGY
+              when /\Ainvariatn/   # invariant section
+                raise
               ###----------/* symbols */ ------------------------------------------------- 
               when /\A[A-Z][a-zA-Z0-9_]*/
@@ -316 +330 @@
                       yield :SYM_END_DBLOCK, :SYM_END_DBLOCK
                     end
-#                     adl_type = @adl_type.pop
-#                     if adl_type == :dadl
-#                       yield :SYM_END_DBLOCK, :SYM_END_DBLOCK
-#                     else
-#                       @in_c_domain_type = false
-#                       yield :END_V_C_DOMAIN_TYPE_BLOCK, :END_V_C_DOMAIN_TYPE_BLOCK
-#                     end
                   else
                     adl_type = @adl_type.pop