diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-15 22:02:42 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-15 22:02:42 +0000 |
| commit | 32ea96f682aaf7d3e2683c5e6fbb886ccf89f3c4 () | |
| tree | 8b7f33ac0aa96a7180842e8adc770c010889eae7 /tool/transcode-tblgen.rb | |
| parent | a9e9169752533858e82a821b46b4e49a3af4ea6b (diff) | |
* tool/transcode-tblgen.rb: refactored to use tree as memo key.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rwxr-xr-x | tool/transcode-tblgen.rb | 113 |
1 files changed, 58 insertions, 55 deletions
@@ -81,6 +81,25 @@ class Action alias == eql? end class ActionMap def self.parse_to_rects(hash) h = {} @@ -173,10 +192,10 @@ class ActionMap def self.parse(hash) rects = parse_to_rects(hash) tree = build_tree(rects) - self.new("", tree) end - def self.merge(*rects_list) if rects_list.length < 2 raise ArgumentError, "not enough arguments" end @@ -194,25 +213,25 @@ class ActionMap yield(prefix, *args) } - self.new("", tree) end def self.expand(prefix, rects, &block) return [] if rects.empty? - has_empty = false - has_nonempty = false - rects.each {|min, max, action| - if min.empty? - has_empty = true - else - has_nonempty = true - end - } - if has_empty && has_nonempty - raise ArgumentError, "ambiguous pattern: #{prefix}" - end - if has_empty - actions = rects.map {|min, max, action| action }.uniq act = block.call(prefix, actions) tree = Action.new(act) else @@ -225,7 +244,7 @@ class ActionMap prefix2 += "{%02X-%02X}" % [byte_min, byte_max] end child_tree = expand(prefix2, rects2, &block) - tree << [byte_min, byte_max, child_tree] } end return tree @@ -235,7 +254,7 @@ class ActionMap a = [] index_from = {} rects.each {|min, max, action| - raise ArgumentError, "emptyable pattern" if min.empty? min_firstbyte = min[0,2].to_i(16) min_rest = min[2..-1] max_firstbyte = max[0,2].to_i(16) @@ -262,23 +281,10 @@ class ActionMap } end - def initialize(prefix, tree) - @prefix = prefix # just for debug @tree = tree end - def hash - return @hash if defined? @hash - @hash = @tree.hash - end - - def eql?(other) - self.class == other.class && - @tree == other.instance_eval { @tree } - end - - alias == eql? - def inspect "\#<#{self.class}:" + @tree.inspect + @@ -290,8 +296,8 @@ class ActionMap when Action 0 else - tree.map {|byte_min, byte_max, child_tree| - max_input_length_rec(child_tree) }.max + 1 end end @@ -412,7 +418,9 @@ class ActionMap code end - def generate_lookup_node(bytes_code, words_code, name, table) offsets = [] infos = [] infomap = {} @@ -470,33 +478,29 @@ End PostMemo = {} NextName = "a" - def generate_node(bytes_code, words_code, name_hint=nil) - if n = PreMemo[self] return n end table = Array.new(0x100, :invalid) - @tree.each {|byte_min, byte_max, child_tree| - prefix = @prefix + (byte_min == byte_max ? "%02X" % byte_min : "{%02X-%02X}" % [byte_min, byte_max]) - rest = ActionMap.new(prefix, child_tree) if a = rest.empty_action - byte_min.upto(byte_max) {|byte| - table[byte] = a - } else name_hint2 = nil if name_hint name_hint2 = "#{name_hint}_#{byte_min == byte_max ? '%02X' % byte_min : '%02Xto%02X' % [byte_min, byte_max]}" end - v = "/*BYTE_LOOKUP*/" + rest.gennode(bytes_code, words_code, name_hint2) - byte_min.upto(byte_max) {|byte| - table[byte] = v - } end } if n = PostMemo[table] - return PreMemo[self] = n end if !name_hint @@ -504,16 +508,16 @@ End NextName.succ! end - PreMemo[self] = PostMemo[table] = name_hint - generate_lookup_node(bytes_code, words_code, name_hint, table) name_hint end def gennode(bytes_code, words_code, name_hint=nil) @bytes_code = bytes_code @words_code = words_code - name = generate_node(bytes_code, words_code, name_hint) @bytes_code = nil @words_code = nil return name @@ -656,9 +660,7 @@ def transcode_compile_tree(name, from, map, valid_encoding=nil) } valid_encoding = ValidEncoding[from] if valid_encoding == nil if valid_encoding - rects = ActionMap.parse_to_rects(h) - undef_rects = ActionMap.parse_to_rects(valid_encoding => :undef) - am = ActionMap.merge(rects, undef_rects) {|prefix, as1, as2| a1 = as1.empty? ? nil : ActionMap.unambiguous_action(as1) a2 = as2.empty? ? nil : ActionMap.unambiguous_action(as2) if !a2 @@ -923,3 +925,4 @@ if __FILE__ == $0 print result end end |