Changeset 14 for ruby/trunk/adl_parser/lib/parser.y

Timestamp:

Apr 16, 2008, 11:11:40 PM (16 years ago)

Author:

Tatsukawa, Akimichi

Message:

working on V_C_DOMAIN_TYPE mini parser

File:

• ruby/trunk/adl_parser/lib/parser.y (modified) (4 diffs)

ruby/trunk/adl_parser/lib/parser.y

@@ -119 +119 @@
   | c_ordinal
   | c_primitive_object
-  | V_C_DOMAIN_TYPE
+  | v_c_domain_type
+#  | V_C_DOMAIN_TYPE
+  #   this is an attempt to match a dADL section inside cADL. It will
+  #   probably never work 100% properly since there can be '>' inside "||"
+  #   ranges, and also strings containing any character, e.g. units string
+  #   contining "{}" chars. The real solution is to use the dADL parser on
+  #   the buffer from the current point on and be able to fast-forward the
+  #   cursor to the last character matched by the dADL scanner
   | ERR_C_DOMAIN_TYPE
   | error
+
+v_c_domain_type: START_V_C_DOMAIN_TYPE v_c_domain_type_body END_V_C_DOMAIN_TYPE
+v_c_domain_type_body: dadl_section
 
 # 'archetype_internal_ref' is a node that refers to a previously defined object node in the same archetype.
@@ -904 +914 @@
       when /\A\<=/   # <=
         yield :SYM_LE, :SYM_LE
+      when /\A[A-Z][a-zA-Z0-9_]*[ \n]*\</   # V_C_DOMAIN_TYPE
+        @in_c_domain_type = true
+        @adl_type.push(:dadl)
+          yield :START_V_C_DOMAIN_TYPE_BLOCK, :START_V_C_DOMAIN_TYPE_BLOCK
+###         else
+###           raise
+###         end
       when /\A\</   # <
         if @in_interval
@@ -1101 +1118 @@
           @in_interval = false
           yield :SYM_GT, :SYM_GT
+        elsif @in_c_domain_type
+          @in_c_domain_type = false
+          adl_type = @adl_type.pop
+          assert_at(__FILE__,__LINE__){adl_type == :dadl}
+          yield :END_V_C_DOMAIN_TYPE_BLOCK, :END_V_C_DOMAIN_TYPE_BLOCK
         else
           adl_type = @adl_type.pop
@@ -1334 +1356 @@
   @in_regexp = false
   @in_interval = false
+  @in_c_domain_type = false
   yyparse self, :scan
 end