Ignore:
Timestamp:
Sep 14, 2009, 5:12:29 PM (15 years ago)
Author:
Tatsukawa, Akimichi
Message:

renamed scanner.rb to adl_scanner.rb

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ruby/trunk/lib/adl_parser/lib/parser.y

    r258 r261  
    5555      archetype.original_language = language
    5656    end
    57     @@log.info("#{__FILE__}:#{__LINE__}: archetype = #{archetype} at #{@filename}:#{@lineno}")
     57    @@logger.debug("#{__FILE__}:#{__LINE__}: archetype = #{archetype} at #{@filename}:#{@lineno}")
    5858    result = archetype
    5959  }
    … …  
    155155  {
    156156    assert_at(__FILE__,__LINE__){val[0].instance_of?(OpenEHR::AM::Archetype::Constraint_Model::C_COMPLEX_OBJECT)}
    157     @@log.info("#{__FILE__}:#{__LINE__}: c_complex_object = #{val[0]} at #{@filename}:#{@lineno}")
     157    @@logger.debug("#{__FILE__}:#{__LINE__}: c_complex_object = #{val[0]} at #{@filename}:#{@lineno}")
    158158    result = val[0]
    159159  }
    … …  
    206206
    207207#------------------------- node types -----------------------
    208 
    209 c_object: v_c_domain_type
    210   {
    211     result = val[0]
    212   }
    213   | c_complex_object
    214   {
    215     @@log.info("#{__FILE__}:#{__LINE__}: c_complex_object = #{val[0].inspect} at #{@filename}:#{@lineno}")
     208### http://www.openehr.org/svn/ref_impl_eiffel/TRUNK/components/adl_parser/src/syntax/cadl/parser/cadl_validator.html
     209### c_object:  c_complex_object
     210### | archetype_internal_ref
     211### | archetype_slot
     212### | constraint_ref
     213### | c_code_phrase
     214### | c_ordinal
     215### | c_primitive_object
     216### | V_C_DOMAIN_TYPE
     217### | ERR_C_DOMAIN_TYPE
     218### | error
     219c_object: c_complex_object
     220  {
     221    @@logger.debug("#{__FILE__}:#{__LINE__}: c_complex_object = #{val[0].inspect} at #{@filename}:#{@lineno}")
    216222    result = val[0]
    217223  }
    … …  
    246252    result = val[0]
    247253  }
     254  | v_c_domain_type
     255  {
     256    result = val[0]
     257  }
     258
    248259#  | v_c_domain_type
    249260#  | V_C_DOMAIN_TYPE
    … …  
    302313c_primitive: c_integer
    303314  {
    304     @@log.info("#{__FILE__}:#{__LINE__}: c_integer = #{val[0]} at #{@filename}:#{@lineno}")
     315    @@logger.debug("#{__FILE__}:#{__LINE__}: c_integer = #{val[0]} at #{@filename}:#{@lineno}")
    305316    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_INTEGER.create do |c_integer|
    306317      c_integer.list
    … …  
    311322  | c_real
    312323  {
    313     @@log.info("#{__FILE__}:#{__LINE__}: c_real = #{val[0]} at #{@filename}:#{@lineno}")
     324    @@logger.debug("#{__FILE__}:#{__LINE__}: c_real = #{val[0]} at #{@filename}:#{@lineno}")
    314325    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_REAL.new
    315326  }
    316327  | c_date
    317328  {
    318     @@log.info("#{__FILE__}:#{__LINE__}: c_date = #{val[0]} at #{@filename}:#{@lineno}")
     329    @@logger.debug("#{__FILE__}:#{__LINE__}: c_date = #{val[0]} at #{@filename}:#{@lineno}")
    319330    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DATE.new
    320331  }
    321332  | c_time
    322333  {
    323     @@log.info("#{__FILE__}:#{__LINE__}: c_time = #{val[0]} at #{@filename}:#{@lineno}")
     334    @@logger.debug("#{__FILE__}:#{__LINE__}: c_time = #{val[0]} at #{@filename}:#{@lineno}")
    324335    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_TIME.new
    325336  }
    326337  | c_date_time
    327338  {
    328     @@log.info("#{__FILE__}:#{__LINE__}: c_date_time = #{val[0]} at #{@filename}:#{@lineno}")
     339    @@logger.debug("#{__FILE__}:#{__LINE__}: c_date_time = #{val[0]} at #{@filename}:#{@lineno}")
    329340    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DATE_TIME.new
    330341  }
    331342  | c_duration
    332343  {
    333     @@log.info("#{__FILE__}:#{__LINE__}: c_duration = #{val[0]} at #{@filename}:#{@lineno}")
     344    @@logger.debug("#{__FILE__}:#{__LINE__}: c_duration = #{val[0]} at #{@filename}:#{@lineno}")
    334345    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_DURATION.new
    335346  }
    336347  | c_string
    337348  {
    338     @@log.info("#{__FILE__}:#{__LINE__}: c_string = #{val[0]} at #{@filename}:#{@lineno}")
     349    @@logger.debug("#{__FILE__}:#{__LINE__}: c_string = #{val[0]} at #{@filename}:#{@lineno}")
    339350    result = OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_STRING.new
    340351  }
    … …  
    342353  {
    343354    assert_at(__FILE__,__LINE__){val[0].instance_of?(OpenEHR::AM::Archetype::Constraint_Model::Primitive::C_BOOLEAN)}
    344     @@log.info("#{__FILE__}:#{__LINE__}: c_boolean = #{val[0]} at #{@filename}:#{@lineno}")
     355    @@logger.debug("#{__FILE__}:#{__LINE__}: c_boolean = #{val[0]} at #{@filename}:#{@lineno}")
    345356    result = val[0]
    346357  }
    … …  
    382393c_attr_head: V_ATTRIBUTE_IDENTIFIER c_existence
    383394  {
    384     @@log.info("#{__FILE__}:#{__LINE__}: V_ATTRIBUTE_IDENTIFIER = #{val[0]}, c_existence = #{val[1]} at #{@filename}")
     395    @@logger.debug("#{__FILE__}:#{__LINE__}: V_ATTRIBUTE_IDENTIFIER = #{val[0]}, c_existence = #{val[1]} at #{@filename}")
    385396    result = OpenEHR::AM::Archetype::Constraint_Model::C_SINGLE_ATTRIBUTE.new(
    386397                                                                              :rm_attribute_name => val[0],
    … …  
    392403  {
    393404    assert_at(__FILE__,__LINE__){ val[2].instance_of?(OpenEHR::AM::Archetype::Constraint_Model::CARDINALITY) }
    394     @@log.info("#{__FILE__}:#{__LINE__}: V_ATTRIBUTE_IDENTIFIER: #{val[0]}, c_existence = #{val[1]}, c_cardinality = #{val[2]} at #{@filename}")
     405    @@logger.debug("#{__FILE__}:#{__LINE__}: V_ATTRIBUTE_IDENTIFIER: #{val[0]}, c_existence = #{val[1]}, c_cardinality = #{val[2]} at #{@filename}")
    395406    result = OpenEHR::AM::Archetype::Constraint_Model::C_MULTIPLE_ATTRIBUTE.new(
    396407                                                                                :rm_attribute_name => val[0],
    … …  
    474485attr_val: attr_id SYM_EQ object_block
    475486  {
    476     @@log.info("#{__FILE__}:#{__LINE__}: attr_id = #{val[0]}, object_block = #{val[2]} at #{@filename}:#{@lineno}")
     487    @@logger.debug("#{__FILE__}:#{__LINE__}: attr_id = #{val[0]} at #{@filename}:#{@lineno}")
    477488    result = {:attr_id => val[0], :object_block => val[2]}
    478489  }
    … …  
    480491attr_id: V_ATTRIBUTE_IDENTIFIER
    481492  {
    482     @@log.info("#{__FILE__}:#{__LINE__}: V_ATTRIBUTE_IDENTIFIER = #{val[0]} at #{@filename}:#{@lineno}")
     493    @@logger.debug("#{__FILE__}:#{__LINE__}: V_ATTRIBUTE_IDENTIFIER = #{val[0]} at #{@filename}:#{@lineno}")
    483494    result = val[0]
    484495  }
    … …  
    519530multiple_attr_object_block_head: SYM_START_DBLOCK
    520531  {
    521     @@log.info("SYM_START_DBLOCK: #{val[0]} at #{@filename}:#{@lineno}")
     532    @@logger.debug("SYM_START_DBLOCK: #{val[0]} at #{@filename}:#{@lineno}")
    522533    result = val[0]
    523534  }
    … …  
    534545keyed_object: object_key SYM_EQ object_block
    535546  {
    536     @@log.info("#{__FILE__}:#{__LINE__}: keyed_object = #{val[0]}, object_block = #{val[2]} at #{@filename}:#{@lineno}")
     547    @@logger.debug("#{__FILE__}:#{__LINE__}: keyed_object = #{val[0]} at #{@filename}:#{@lineno}")
    537548    result = {:object_key => val[0], :object_block => val[1]}
    538549  }
    … …  
    540551object_key: Left_bracket_code simple_value Right_bracket_code
    541552  {
    542     @@log.info("object_key: [#{val[1]}] at #{@filename}:#{@lineno}")
     553    @@logger.debug("object_key: [#{val[1]}] at #{@filename}:#{@lineno}")
    543554    result = val[1]
    544555  }
    … …  
    555566untyped_single_attr_object_block: single_attr_object_complex_head SYM_END_DBLOCK # >
    556567  {
    557     @@log.info("#{__FILE__}:#{__LINE__}: single_attr_object_complex_head = #{val[0]} at #{@filename}:#{@lineno}")
     568    @@logger.debug("#{__FILE__}:#{__LINE__}: single_attr_object_complex_head = #{val[0]} at #{@filename}:#{@lineno}")
    558569    result = {:single_attr_object_complex_head => val[0]}
    559570  }
    560571  | single_attr_object_complex_head attr_vals SYM_END_DBLOCK
    561572  {
    562     @@log.info("#{__FILE__}:#{__LINE__}: single_attr_object_complex_head = #{val[0]}, attr_vals = #{val[1]} at #{@filename}:#{@lineno}")
     573    @@logger.debug("#{__FILE__}:#{__LINE__}: attr_vals = #{val[1]} at #{@filename}:#{@lineno}")
    563574    result = {:single_attr_object_complex_head => val[0], :attr_vals => val[1]}
    564575  }
    … …  
    566577primitive_object_block: untyped_primitive_object_block
    567578  {
    568     @@log.info("#{__FILE__}:#{__LINE__}: untyped_primitive_object_block = #{val[0]} at #{@filename}:#{@lineno}")
     579    @@logger.debug("#{__FILE__}:#{__LINE__}: untyped_primitive_object_block = #{val[0]} at #{@filename}:#{@lineno}")
    569580    result = {:untyped_primitive_object_block => val[0]}
    570581  }
    571582  | type_identifier untyped_primitive_object_block
    572583  {
    573     @@log.info("#{__FILE__}:#{__LINE__}: type_identifier = #{val[0]}, untyped_primitive_object_block = #{val[1]} at #{@filename}:#{@lineno}")
     584    @@logger.debug("#{__FILE__}:#{__LINE__}: type_identifier = #{val[0]}, untyped_primitive_object_block = #{val[1]} at #{@filename}:#{@lineno}")
    574585    result = {:type_identifier => val[0], :untyped_primitive_object_block => val[1]}
    575586  }
    576587untyped_primitive_object_block: SYM_START_DBLOCK primitive_object_value SYM_END_DBLOCK
    577588  {
    578     @@log.info("#{__FILE__}:#{__LINE__}: primitive_object_block = <#{val[1]}> at #{@filename}:#{@lineno}")
     589    @@logger.debug("#{__FILE__}:#{__LINE__}: primitive_object_block = <#{val[1]}> at #{@filename}:#{@lineno}")
    579590    result = val[1]
    580591  }
    … …  
    601612simple_value: string_value
    602613  {
    603     @@log.info("string_value: #{val[0]} at #{@filename}:#{@lineno}")
     614    @@logger.debug("string_value: #{val[0]} at #{@filename}:#{@lineno}")
    604615    result = val[0]
    605616  }
    606617  | integer_value
    607618  {
    608     @@log.info("integer_value: #{val[0]} at #{@filename}:#{@lineno}")
     619    @@logger.debug("integer_value: #{val[0]} at #{@filename}:#{@lineno}")
    609620    result = val[0]
    610621  }
    611622  | real_value
    612623  {
    613     @@log.info("real_value: #{val[0]} at #{@filename}:#{@lineno}")
     624    @@logger.debug("real_value: #{val[0]} at #{@filename}:#{@lineno}")
    614625    result = val[0]
    615626  }
    616627  | boolean_value
    617628  {
    618     @@log.info("boolean_value: #{val[0]} at #{@filename}:#{@lineno}")
     629    @@logger.debug("boolean_value: #{val[0]} at #{@filename}:#{@lineno}")
    619630    result = val[0]
    620631  }
    621632  | character_value
    622633  {
    623     @@log.info("character_value: #{val[0]} at #{@filename}:#{@lineno}")
     634    @@logger.debug("character_value: #{val[0]} at #{@filename}:#{@lineno}")
    624635    result = val[0]
    625636  }
    626637  | date_value
    627638  {
    628     @@log.info("date_value: #{val[0]} at #{@filename}:#{@lineno}")
     639    @@logger.debug("date_value: #{val[0]} at #{@filename}:#{@lineno}")
    629640    result = val[0]
    630641  }
    631642  | time_value
    632643  {
    633     @@log.info("time_value: #{val[0]} at #{@filename}:#{@lineno}")
     644    @@logger.debug("time_value: #{val[0]} at #{@filename}:#{@lineno}")
    634645    result = val[0]
    635646  }
    636647  | date_time_value
    637648  {
    638     @@log.info("date_time_value: #{val[0]} at #{@filename}:#{@lineno}")
     649    @@logger.debug("date_time_value: #{val[0]} at #{@filename}:#{@lineno}")
    639650    result = val[0]
    640651  }
    641652  | duration_value
    642653  {
    643     @@log.info("duration_value: #{val[0]} at #{@filename}:#{@lineno}")
     654    @@logger.debug("duration_value: #{val[0]} at #{@filename}:#{@lineno}")
    644655    result = val[0]
    645656  }
    646657  | uri_value
    647658  {
    648     @@log.info("uri_value: #{val[0]} at #{@filename}:#{@lineno}")
     659    @@logger.debug("uri_value: #{val[0]} at #{@filename}:#{@lineno}")
    649660    result = val[0]
    650661  }
    … …  
    669680type_identifier: V_TYPE_IDENTIFIER
    670681  {
    671     @@log.info("V_TYPE_IDENTIFIER: #{val[0]} at #{@filename}:#{@lineno}")
     682    @@logger.debug("V_TYPE_IDENTIFIER: #{val[0]} at #{@filename}:#{@lineno}")
    672683    result = val[0]
    673684  }
    674685  | V_GENERIC_TYPE_IDENTIFIER
    675686  {
    676     @@log.info("V_GENERIC_TYPE_IDENTIFIER: #{val[0]} at #{@filename}:#{@lineno}")
     687    @@logger.debug("V_GENERIC_TYPE_IDENTIFIER: #{val[0]} at #{@filename}:#{@lineno}")
    677688    result = val[0]
    678689  }
    … …  
    680691string_value: V_STRING
    681692  {
    682     @@log.info("V_STRING: #{val[0]} at #{@filename}:#{@lineno}")
     693    @@logger.debug("V_STRING: #{val[0]} at #{@filename}:#{@lineno}")
    683694    result = val[0]
    684695  }
    … …  
    844855duration_value: V_ISO8601_DURATION
    845856  {
    846     @@log.info("V_ISO8601_DURATION: #{val[0]} at #{@filename}:#{@lineno}")
     857    @@logger.debug("V_ISO8601_DURATION: #{val[0]} at #{@filename}:#{@lineno}")
    847858    result = val[0]
    848859  }
    … …  
    864875term_code: V_QUALIFIED_TERM_CODE_REF
    865876  {
    866     @@log.info("#{__FILE__}:#{__LINE__}: V_QUALIFIED_TERM_CODE_REF = #{val[0]} at #{@filename}:#{@lineno}")
     877    @@logger.debug("#{__FILE__}:#{__LINE__}: V_QUALIFIED_TERM_CODE_REF = #{val[0]} at #{@filename}:#{@lineno}")
    867878    result = val[0]
    868879  }
    … …  
    874885uri_value: V_URI
    875886  {
    876     @@log.info("#{__FILE__}:#{__LINE__}: V_URI = #{val[0]} at #{@filename}:#{@lineno}")
     887    @@logger.debug("#{__FILE__}:#{__LINE__}: V_URI = #{val[0]} at #{@filename}:#{@lineno}")
    877888    result = val[0]
    878889  }
    … …  
    944955path_segment: V_ATTRIBUTE_IDENTIFIER V_LOCAL_TERM_CODE_REF
    945956  {
    946     @@log.info("#{__FILE__}:#{__LINE__}, V_ATTRIBUTE_IDENTIFIER = #{val[0]} at #{@filename}")
     957    @@logger.debug("#{__FILE__}:#{__LINE__}, V_ATTRIBUTE_IDENTIFIER = #{val[0]} at #{@filename}")
    947958  }
    948959  | V_ATTRIBUTE_IDENTIFIER
    949960  {
    950     @@log.info("#{__FILE__}:#{__LINE__}, V_ATTRIBUTE_IDENTIFIER = #{val[0]} at #{@filename}")
     961    @@logger.debug("#{__FILE__}:#{__LINE__}, V_ATTRIBUTE_IDENTIFIER = #{val[0]} at #{@filename}")
    951962  }
    952963
    … …  
    11211132  {
    11221133    @in_interval = false
    1123     @@log.info("#{__FILE__}:#{__LINE__}, #{val[0]}|#{val[2]} at #{@filename}")
     1134    @@logger.debug("#{__FILE__}:#{__LINE__}, #{val[0]}|#{val[2]} at #{@filename}")
    11241135  }
    11251136
    … …  
    11341145  }
    11351146
    1136 #term_code_constraint_section: START_TERM_CODE_CONSTRAINT term_code_body Right_bracket_code
     1147#                             [[a-zA-Z0-9\(\)\._\-]+::[ \t\n]*          [[a-zA-Z0-9\._\-]*[ \t]*]
    11371148term_code_constraint_section: START_TERM_CODE_CONSTRAINT term_code_body END_TERM_CODE_CONSTRAINT
     1149  {
     1150    @@logger.debug("#{__FILE__}:#{__LINE__}, START_TERM_CODE_CONSTRAINT = #{val[0]} at #{@filename}")
     1151    @@logger.debug("#{__FILE__}:#{__LINE__}, term_code_body = #{val[1]}")
     1152    @@logger.debug("#{__FILE__}:#{__LINE__}, END_TERM_CODE_CONSTRAINT = #{val[2]}")
     1153    result = val[1]
     1154  }
     1155
     1156
    11381157term_code_body: # empty
    11391158  | TERM_CODE
    11401159  | term_code_body TERM_CODE
    1141 ### term_code_constraint_section: START_TERM_CODE_CONSTRAINT term_code_body END_TERM_CODE_CONSTRAINT
    11421160### term_code_body: TERM_CODE
    11431161###   | term_code_body TERM_CODE
    … …  
    11551173  | V_ATTRIBUTE_IDENTIFIER
    11561174  {
    1157     @@log.info("#{__FILE__}:#{__LINE__}, V_ATTRIBUTE_IDENTIFIER = #{word} at #{@filename}")
     1175    @@logger.debug("#{__FILE__}:#{__LINE__}, V_ATTRIBUTE_IDENTIFIER = #{word} at #{@filename}")
    11581176      result = val[0]
    11591177  }
    … …  
    11941212
    11951213if $DEBUG
    1196   @@log = Logger.new('log/parser.log','daily')
    1197   @@log.level = Logger::INFO
     1214  @@logger = Logger.new('log/parser.log','daily')
     1215  @@logger.level = Logger::INFO
    11981216else
    1199   @@log = Logger.new(STDOUT)
    1200   @@log.level = Logger::WARN
     1217  @@logger = Logger.new(STDOUT)
     1218  @@logger.level = Logger::WARN
    12011219end
    12021220
    … …  
    12631281
    12641282def scan
     1283  @@logger.debug("#{__FILE__}:#{__LINE__}: Entering scan at #{@filename}:#{@lineno}:")
    12651284  until @data.nil?  do
    12661285    case @adl_type.last
    … …  
    12791298    when :regexp
    12801299      @data = scan_regexp(@data) do |sym, val|
     1300        yield sym, val
     1301      end
     1302    when :term_constraint
     1303      @@logger.debug("#{__FILE__}:#{__LINE__}: scan: Entering scan_term_constraint at #{@filename}:#{@lineno}: data = #{data.inspect}")
     1304      @data = scan_term_constraint(@data) do |sym, val|
    12811305        yield sym, val
    12821306      end
    … …  
    12911315
    12921316def scan_adl(data)
     1317  @@logger.debug("#{__FILE__}:#{__LINE__}: Entering scan_adl at #{@filename}:#{@lineno}: data = #{data.inspect}")
    12931318  until data.nil?  do
    12941319    case @adl_type.last
    12951320    when :adl
    1296 #      puts "Entering scan_adl"
    12971321      case data
    12981322      when /\A\n/ # carriage return
    … …  
    13031327      when /\A--.*\n/ # single line comment
    13041328        @lineno += 1
    1305         @@log.info("#{__FILE__}:#{__LINE__}: scan_adl: COMMENT = #{$&} at #{@filename}:#{@lineno}")
     1329        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_adl: COMMENT = #{$&} at #{@filename}:#{@lineno}")
    13061330        ;
    13071331      when /\Adescription/   # description
    … …  
    13091333      when /\Adefinition/   # definition
    13101334        yield :SYM_DEFINITION, :SYM_DEFINITION
    1311 #        @adl_type.push(:cadl)
    13121335        ###----------/* symbols */ -------------------------------------------------
    13131336      when /\A[A-Z][a-zA-Z0-9_]*/
    13141337        yield :V_TYPE_IDENTIFIER, $&
    13151338#      when /\A[a-zA-Z][a-zA-Z0-9_-]+\.[a-zA-Z][a-zA-Z0-9_-]+\.[a-zA-Z0-9]+/   #V_ARCHETYPE_ID
    1316       when /\A(\w+)-(\w+)-(\w+)\.(\w+)(-\w+)?\.(v[0-9]+)/   #V_ARCHETYPE_ID
     1339      when /\A(\w+)-(\w+)-(\w+)\.(\w+)(-\w+)?\.(v\w+)/   #V_ARCHETYPE_ID
    13171340        object_id, rm_originator, rm_name, rm_entity, concept_name, specialisation, version_id = $&, $1, $2, $3, $4, $5, $6
    13181341        archetype_id = OpenEHR::RM::Support::Identification::Archetype_ID.new(object_id, concept_name, rm_name, rm_entity, rm_originator, specialisation, version_id)
    … …  
    13231346        word = $&
    13241347        if @@adl_reserved[word]
    1325           @@log.info("#{__FILE__}:#{__LINE__}: scan_adl: @@adl_reserved = #{@@adl_reserved[word]} at #{@filename}:#{@lineno}")
     1348          @@logger.debug("#{__FILE__}:#{__LINE__}: scan_adl: @@adl_reserved = #{@@adl_reserved[word]} at #{@filename}:#{@lineno}")
    13261349          yield @@adl_reserved[word], @@adl_reserved[word]
    13271350        elsif #/\A[A-Z][a-zA-Z0-9_]*/
    1328           @@log.info("#{__FILE__}:#{__LINE__}: scan_adl: V_ATTRIBUTE_IDENTIFIER = #{$&} at #{@filename}:#{@lineno}")
     1351          @@logger.debug("#{__FILE__}:#{__LINE__}: scan_adl: V_ATTRIBUTE_IDENTIFIER = #{$&} at #{@filename}:#{@lineno}")
    13291352          yield :V_ATTRIBUTE_IDENTIFIER, $&
    13301353        end
    … …  
    13491372        else
    13501373          adl_type = @adl_type.pop
    1351 #          puts "Escaping #{adl_type}"
    13521374          assert_at(__FILE__,__LINE__){adl_type == :dadl}
    13531375          yield :SYM_END_DBLOCK, :SYM_END_DBLOCK
    … …  
    13551377      when /\A\{/   # {
    13561378        @adl_type.push(:cadl)
    1357         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: entering cADL at #{@filename}:#{@lineno}")
     1379        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: entering cADL at #{@filename}:#{@lineno}")
    13581380        yield :SYM_START_CBLOCK, :SYM_START_CBLOCK
    13591381      when /\A\}/   # }
    … …  
    13611383#        puts "Escaping #{adl_type}"
    13621384        assert_at(__FILE__,__LINE__){adl_type == :cadl}
    1363         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: exiting cADL at #{@filename}:#{@lineno}")
     1385        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: exiting cADL at #{@filename}:#{@lineno}")
    13641386        yield :SYM_END_CBLOCK, $&
    13651387      when /\A\-/   # -
    … …  
    14461468      data = $' # variable $' receives the string after the match
    14471469    when :dadl
    1448 #      puts "Entering scan_dadl"
    14491470      data = scan_dadl(data) do |sym, val|
    14501471        yield sym, val
    14511472      end
    14521473    when :cadl
    1453 #      puts "Entering scan_cadl"
    14541474      data = scan_cadl(data) do |sym, val|
    14551475        yield sym, val
    14561476      end
    14571477    when :regexp
    1458 #      puts "Entering scan_regexp"
    14591478      data = scan_regexp(data) do |sym, val|
    14601479        yield sym, val
    14611480      end
    14621481    when :term_constraint
    1463 #      puts "Entering scan_term_constraint"
     1482      @@logger.debug("#{__FILE__}:#{__LINE__}: scan_adl: Entering scan_term_constraint at #{@filename}:#{@lineno}: data = #{data.inspect}")
     1483
    14641484      data = scan_term_constraint(data) do |sym, val|
    14651485        yield sym, val
    … …  
    14731493
    14741494def scan_cadl(data)
     1495  @@logger.debug("#{__FILE__}:#{__LINE__}: Entering scan_cadl at #{@filename}:#{@lineno}: data = #{data.inspect}")
    14751496  until data.nil?  do
    14761497    case @adl_type.last
    14771498    when :cadl
    1478 #      puts "Entering scan_cadl"
    14791499      case scanned = @@cadl_scanner.parse(data)
    14801500      when Yaparc::Result::OK
    … …  
    14971517      when /\A--.*\n/ # single line comment
    14981518        @lineno += 1
    1499         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: COMMENT = #{$&} at #{@filename}:#{@lineno}")
     1519        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: COMMENT = #{$&} at #{@filename}:#{@lineno}")
    15001520        ;
    15011521        ###----------/* symbols */ -------------------------------------------------
    … …  
    15651585      when /\A\{/   # {
    15661586        @adl_type.push(:cadl)
    1567         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: entering cADL at #{@filename}:#{@lineno}")
     1587        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: entering cADL at #{@filename}:#{@lineno}")
    15681588        yield :SYM_START_CBLOCK, :SYM_START_CBLOCK
    15691589      when /\A\}/   # }
    … …  
    15711591#        puts "Escaping #{adl_type}"
    15721592        assert_at(__FILE__,__LINE__){adl_type == :cadl}
    1573         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: exiting cADL at #{@filename}:#{@lineno}")
     1593        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: exiting cADL at #{@filename}:#{@lineno}")
    15741594        yield :SYM_END_CBLOCK, :SYM_END_CBLOCK
    15751595      when /\A\$/   # $
    … …  
    15801600        yield :Question_mark_code, :Question_mark_code
    15811601      when /\A\|/   # |
    1582         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: @in_interval = #{@in_interval} at #{@filename}:#{@lineno}")
     1602        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: @in_interval = #{@in_interval} at #{@filename}:#{@lineno}")
    15831603        if @in_interval
    15841604          @in_interval = false
    … …  
    15871607          @in_interval = true
    15881608        end
    1589         @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: SYM_INTERVAL_DELIM at #{@filename}:#{@lineno}")
     1609        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: SYM_INTERVAL_DELIM at #{@filename}:#{@lineno}")
    15901610        yield :SYM_INTERVAL_DELIM, :SYM_INTERVAL_DELIM
    15911611
    1592       when /\A\[[a-zA-Z0-9._\-]+::[a-zA-Z0-9._\-]+\]/   #V_QUALIFIED_TERM_CODE_REF form [ICD10AM(1998)::F23]
     1612      when /\A\[[a-zA-Z0-9()\._-]+::[a-zA-Z0-9\._-]+\]/  #V_QUALIFIED_TERM_CODE_REF form [ICD10AM(1998)::F23]
     1613#      when /\A\[[a-zA-Z0-9._\-]+::[a-zA-Z0-9._\-]+\]/   #V_QUALIFIED_TERM_CODE_REF form [ICD10AM(1998)::F23]
    15931614        yield :V_QUALIFIED_TERM_CODE_REF, $&
    15941615      when /\A\[[a-zA-Z0-9._\- ]+::[a-zA-Z0-9._\- ]+\]/   #ERR_V_QUALIFIED_TERM_CODE_REF
    15951616        yield :ERR_V_QUALIFIED_TERM_CODE_REF, $&
    1596       when /\A\[([a-zA-Z0-9()._\-]+::[a-zA-Z0-9._\_-]+)\]/
    1597         yield :V_TERM_CODE_CONSTRAINT, :V_TERM_CODE_CONSTRAINT
    1598       when /\A\[[a-zA-Z0-9\(\)\._\-]+::[ \t\n]*/
     1617      when /\A\[([a-zA-Z0-9\(\)\._\-]+)::[ \t\n]*/
    15991618        @adl_type.push(:term_constraint)
    1600         yield :START_TERM_CODE_CONSTRAINT, $&
     1619        yield :START_TERM_CODE_CONSTRAINT, $1
    16011620      when /\A\[[a-zA-Z0-9][a-zA-Z0-9._\-]*\]/   #V_LOCAL_TERM_CODE_REF
    16021621        yield :V_LOCAL_TERM_CODE_REF, $&
    … …  
    16181637          yield @@cadl_reserved[word.downcase], @@cadl_reserved[word.downcase]
    16191638        else
    1620           @@log.info("#{__FILE__}:#{__LINE__}: scan_cadl: V_ATTRIBUTE_IDENTIFIER = #{word} at #{@filename}:#{@lineno}")
     1639          @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: V_ATTRIBUTE_IDENTIFIER = #{word} at #{@filename}:#{@lineno}")
    16211640          yield :V_ATTRIBUTE_IDENTIFIER, word #V_ATTRIBUTE_IDENTIFIER /\A[a-z][a-zA-Z0-9_]*/
    16221641        end
    … …  
    16541673      data = $' # variable $' receives the string after the match
    16551674    when :adl
    1656 #      puts "Entering scan_adl"
    16571675      data = scan_adl(data) do |sym, val|
    16581676        yield sym, val
    16591677      end
    16601678    when :dadl
    1661 #      puts "Entering scan_dadl"
    16621679      data = scan_dadl(data) do |sym, val|
    16631680        yield sym, val
    16641681      end
    16651682    when :regexp
    1666 #      puts "Entering scan_regexp"
    16671683      data = scan_regexp(data) do |sym, val|
    16681684        yield sym, val
    16691685      end
    16701686    when :term_constraint
    1671 #      puts "Entering scan_term_constraint"
     1687      @@logger.debug("#{__FILE__}:#{__LINE__}: scan_cadl: Entering scan_term_constraint at #{@filename}:#{@lineno}: data = #{data.inspect}")
     1688     
    16721689      data = scan_term_constraint(data) do |sym, val|
    16731690        yield sym, val
    … …  
    16801697
    16811698def scan_dadl(data)
     1699  @@logger.debug("#{__FILE__}:#{__LINE__}: Entering scan_dadl at #{@filename}:#{@lineno}: data = #{data.inspect}")
    16821700  until data.nil?  do
    16831701    case @adl_type.last
    16841702    when :dadl
    1685 #      puts "Entering scan_dadl"
    16861703      case scanned = @@dadl_scanner.parse(data)
    16871704      when Yaparc::Result::OK
    … …  
    16991716      when /\A--.*\n/ # single line comment
    17001717        @lineno += 1
    1701         @@log.info("#{__FILE__}:#{__LINE__}: scan_dadl: COMMENT = #{$&} at #{@filename}:#{@lineno}")
     1718        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_dadl: COMMENT = #{$&} at #{@filename}:#{@lineno}")
    17021719        ;
    17031720        ###----------/* symbols */ -------------------------------------------------
    … …  
    17301747        elsif @in_c_domain_type == false
    17311748          adl_type = @adl_type.pop
    1732 #          puts "Escaping #{adl_type}"
    17331749          assert_at(__FILE__,__LINE__){adl_type == :dadl}
    17341750          yield :SYM_END_DBLOCK, $&
    … …  
    17711787        yield :Question_mark_code, :Question_mark_code
    17721788      when /\A\|/   # |
    1773         @@log.info("#{__FILE__}:#{__LINE__}: scan_dadl: @in_interval = #{@in_interval} at #{@filename}:#{@lineno}")
     1789        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_dadl: @in_interval = #{@in_interval} at #{@filename}:#{@lineno}")
    17741790        if @in_interval
    17751791          @in_interval = false
    … …  
    17781794          @in_interval = true
    17791795        end
    1780         @@log.info("#{__FILE__}:#{__LINE__}: scan_dadl: SYM_INTERVAL_DELIM at #{@filename}:#{@lineno}")
     1796        @@logger.debug("#{__FILE__}:#{__LINE__}: scan_dadl: SYM_INTERVAL_DELIM at #{@filename}:#{@lineno}")
    17811797        yield :SYM_INTERVAL_DELIM, :SYM_INTERVAL_DELIM
    17821798###       when /\A\[[a-zA-Z0-9()\._-]+::[a-zA-Z0-9\._-]+\]/   #V_QUALIFIED_TERM_CODE_REF form [ICD10AM(1998)::F23]
    … …  
    18271843      data = $' # variable $' receives the string after the match
    18281844    when :adl
    1829 #      puts "Entering scan_adl"
    18301845      data = scan_adl(data) do |sym, val|
    18311846        yield sym, val
    18321847      end
    18331848    when :cadl
    1834 #      puts "Entering scan_cadl"
    18351849      data = scan_cadl(data) do |sym, val|
    18361850        yield sym, val
    … …  
    18421856      end
    18431857    when :term_constraint
    1844 #      puts "Entering scan_term_constraint"
     1858      @@logger.debug("#{__FILE__}:#{__LINE__}: scan_dadl: Entering scan_term_constraint at #{@filename}:#{@lineno}: data = #{data.inspect}")
     1859
    18451860      data = scan_term_constraint(data) do |sym, val|
    18461861        yield sym, val
    … …  
    18531868
    18541869def scan_regexp(data)
     1870  @@logger.debug("#{__FILE__}:#{__LINE__}: Entering scan_regexp at #{@filename}:#{@lineno}: data = #{data.inspect}")
    18551871  until data.nil?  do
    18561872    case @adl_type.last
    18571873    when :regexp
    1858 #      puts "Entering scan_regexp"
    18591874      case data
    18601875      when /\A\/\}/ #V_REGEXP
    … …  
    18801895      data = $' # variable $' receives the string after the match
    18811896    when :adl
    1882 #      puts "Entering scan_adl"
    18831897      data = scan_adl(data) do |sym, val|
    18841898        yield sym, val
    18851899      end
    18861900    when :dadl
    1887 #      puts "Entering scan_dadl"
    18881901      data = scan_dadl(data) do |sym, val|
    18891902        yield sym, val
    18901903      end
    18911904    when :cadl
    1892 #      puts "Entering scan_cadl"
    18931905      data = scan_cadl(data) do |sym, val|
    18941906        yield sym, val
    18951907      end
    18961908    when :term_constraint
    1897 #      puts "Entering scan_term_constraint"
     1909      @@logger.debug("#{__FILE__}:#{__LINE__}: scan_regexp: Entering scan_term_constraint at #{@filename}:#{@lineno}")
    18981910      data = scan_term_constraint(data) do |sym, val|
    18991911        yield sym, val
    … …  
    19061918
    19071919def scan_term_constraint(data)
     1920  @@logger.debug("#{__FILE__}:#{__LINE__}: Entering scan_term_constraint")
    19081921  until data.nil?  do
    19091922    case @adl_type.last
    19101923    when :term_constraint
    1911 #      puts "Entering scan_term_constraint"
    19121924      case data
    19131925      when /\A\n/ # carriage return
    … …  
    19181930      when /\A--.*$/ # single line comment
    19191931        @lineno += 1
    1920         @@log.info("#{__FILE__}:#{__LINE__}: scan_term_constraint: COMMENT = #{$&} at #{@filename}:#{@lineno}")
     1932        #@@logger.debug("#{__FILE__}:#{__LINE__}: scan_term_constraint: COMMENT = #{$&} at #{@filename}:#{@lineno}")
    19211933        ;
    1922       when /\A[a-zA-Z0-9\._\-]+[ \t]*,/ # match any line, with ',' termination
    1923         yield :TERM_CODE, $&
    1924       when /\A[a-zA-Z0-9\._\-]+[ \t]*;/ #match second last line with ';' termination (assumed value)
    1925         yield :TERM_CODE, $&
    1926 #      when /\A[a-zA-Z0-9\._\-]+[ \t]*\]/ # match final line, terminating in ']'
    1927       when /\A[a-zA-Z0-9\._\-]*[ \t]*\]/ # match final line, terminating in ']'
     1934      when /\A([a-zA-Z0-9\._\-])+[ \t]*,/ # match any line, with ',' termination
     1935        yield :TERM_CODE, $1
     1936      when /\A([a-zA-Z0-9\._\-])+[ \t]*;/ # match second last line with ';' termination (assumed value)
     1937        yield :TERM_CODE, $1
     1938      when /\A([a-zA-Z0-9\._\-])*[ \t]*\]/ # match final line, terminating in ']'
    19281939        adl_type = @adl_type.pop
    19291940        assert_at(__FILE__,__LINE__){adl_type == :term_constraint}
    1930         yield :END_TERM_CODE_CONSTRAINT, $&
     1941        yield :END_TERM_CODE_CONSTRAINT, $1
    19311942      else
    19321943        raise "data = #{data}"
    … …  
    19341945      data = $' # variable $' receives the string after the match
    19351946    when :adl
    1936 #      puts "Entering scan_adl"
    19371947      data = scan_adl(data) do |sym, val|
    19381948        yield sym, val
    19391949      end
    19401950    when :dadl
    1941 #      puts "Entering scan_dadl"
    19421951      data = scan_dadl(data) do |sym, val|
    19431952        yield sym, val
    19441953      end
    19451954    when :cadl
    1946 #      puts "Entering scan_cadl"
    19471955      data = scan_cadl(data) do |sym, val|
    19481956        yield sym, val
Note: See TracChangeset for help on using the changeset viewer.