1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* tool/transcode-tblgen.rb: refactored to use tree as memo key.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-03-15 22:02:42 +00:00
parent a9e9169752
commit 32ea96f682
2 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Mar 16 07:01:43 2010 Tanaka Akira <akr@fsij.org>
* tool/transcode-tblgen.rb: refactored to use tree as memo key.
Tue Mar 16 04:05:13 2010 Tanaka Akira <akr@fsij.org> Tue Mar 16 04:05:13 2010 Tanaka Akira <akr@fsij.org>
* tool/transcode-tblgen.rb: more info in generating macro names. * tool/transcode-tblgen.rb: more info in generating macro names.

113
tool/transcode-tblgen.rb
View File

@ -81,6 +81,25 @@ class Action
alias == eql? alias == eql?
end end
class Branch
def initialize(byte_min, byte_max, child_tree)
@byte_min = byte_min
@byte_max = byte_max
@child_tree = child_tree
@hash = byte_min.hash ^ byte_max.hash ^ child_tree.hash
end
attr_reader :byte_min, :byte_max, :child_tree, :hash
def eql?(other)
self.class == other.class &&
@hash == other.hash &&
@byte_min == other.byte_min &&
@byte_max == other.byte_max &&
@child_tree == other.child_tree
end
alias == eql?
end
class ActionMap class ActionMap
def self.parse_to_rects(hash) def self.parse_to_rects(hash)
h = {} h = {}
@ -173,10 +192,10 @@ class ActionMap
def self.parse(hash) def self.parse(hash)
rects = parse_to_rects(hash) rects = parse_to_rects(hash)
tree = build_tree(rects) tree = build_tree(rects)
self.new("", tree) self.new(tree)
end end
def self.merge(*rects_list) def self.merge_rects(*rects_list)
if rects_list.length < 2 if rects_list.length < 2
raise ArgumentError, "not enough arguments" raise ArgumentError, "not enough arguments"
end end
@ -194,25 +213,25 @@ class ActionMap
yield(prefix, *args) yield(prefix, *args)
} }
self.new("", tree) self.new(tree)
end
def self.merge(*mappings, &block)
merge_rects(*mappings.map {|m| parse_to_rects(m) }, &block)
end end
def self.expand(prefix, rects, &block) def self.expand(prefix, rects, &block)
#if prefix == ''
# numsing = numrang = 0
# rects.each {|min, max, action| if min == max then numsing += 1 else numrang += 1 end }
# puts "#{numsing} singleton mappings and #{numrang} range mappings."
#end
return [] if rects.empty? return [] if rects.empty?
has_empty = false if rects[0][0].empty?
has_nonempty = false actions = rects.map {|min, max, action|
rects.each {|min, max, action| raise ArgumentError, "ambiguous pattern: #{prefix}" if !min.empty?
if min.empty? action
has_empty = true }.uniq
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) act = block.call(prefix, actions)
tree = Action.new(act) tree = Action.new(act)
else else
@ -225,7 +244,7 @@ class ActionMap
prefix2 += "{%02X-%02X}" % [byte_min, byte_max] prefix2 += "{%02X-%02X}" % [byte_min, byte_max]
end end
child_tree = expand(prefix2, rects2, &block) child_tree = expand(prefix2, rects2, &block)
tree << [byte_min, byte_max, child_tree] tree << Branch.new(byte_min, byte_max, child_tree)
} }
end end
return tree return tree
@ -235,7 +254,7 @@ class ActionMap
a = [] a = []
index_from = {} index_from = {}
rects.each {|min, max, action| rects.each {|min, max, action|
raise ArgumentError, "emptyable pattern" if min.empty? raise ArgumentError, "ambiguous pattern: #{prefix}" if min.empty?
min_firstbyte = min[0,2].to_i(16) min_firstbyte = min[0,2].to_i(16)
min_rest = min[2..-1] min_rest = min[2..-1]
max_firstbyte = max[0,2].to_i(16) max_firstbyte = max[0,2].to_i(16)
@ -262,23 +281,10 @@ class ActionMap
} }
end end
def initialize(prefix, tree) def initialize(tree)
@prefix = prefix # just for debug
@tree = tree @tree = tree
end 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 def inspect
"\#<#{self.class}:" + "\#<#{self.class}:" +
@tree.inspect + @tree.inspect +
@ -290,8 +296,8 @@ class ActionMap
when Action when Action
0 0
else else
tree.map {|byte_min, byte_max, child_tree| tree.map {|branch|
max_input_length_rec(child_tree) max_input_length_rec(branch.child_tree)
}.max + 1 }.max + 1
end end
end end
@ -412,7 +418,9 @@ class ActionMap
code code
end end
def generate_lookup_node(bytes_code, words_code, name, table) def generate_lookup_node(name, table)
bytes_code = @bytes_code
words_code = @words_code
offsets = [] offsets = []
infos = [] infos = []
infomap = {} infomap = {}
@ -470,33 +478,29 @@ End
PostMemo = {} PostMemo = {}
NextName = "a" NextName = "a"
def generate_node(bytes_code, words_code, name_hint=nil) def generate_node(name_hint=nil)
if n = PreMemo[self] if n = PreMemo[@tree]
return n return n
end end
table = Array.new(0x100, :invalid) table = Array.new(0x100, :invalid)
@tree.each {|byte_min, byte_max, child_tree| @tree.each {|branch|
prefix = @prefix + (byte_min == byte_max ? "%02X" % byte_min : "{%02X-%02X}" % [byte_min, byte_max]) byte_min, byte_max, child_tree = branch.byte_min, branch.byte_max, branch.child_tree
rest = ActionMap.new(prefix, child_tree) rest = ActionMap.new(child_tree)
if a = rest.empty_action if a = rest.empty_action
byte_min.upto(byte_max) {|byte| table.fill(a, byte_min..byte_max)
table[byte] = a
}
else else
name_hint2 = nil name_hint2 = nil
if name_hint if name_hint
name_hint2 = "#{name_hint}_#{byte_min == byte_max ? '%02X' % byte_min : '%02Xto%02X' % [byte_min, byte_max]}" name_hint2 = "#{name_hint}_#{byte_min == byte_max ? '%02X' % byte_min : '%02Xto%02X' % [byte_min, byte_max]}"
end end
v = "/*BYTE_LOOKUP*/" + rest.gennode(bytes_code, words_code, name_hint2) v = "/*BYTE_LOOKUP*/" + rest.gennode(@bytes_code, @words_code, name_hint2)
byte_min.upto(byte_max) {|byte| table.fill(v, byte_min..byte_max)
table[byte] = v
}
end end
} }
if n = PostMemo[table] if n = PostMemo[table]
return PreMemo[self] = n return PreMemo[@tree] = n
end end
if !name_hint if !name_hint
@ -504,16 +508,16 @@ End
NextName.succ! NextName.succ!
end end
PreMemo[self] = PostMemo[table] = name_hint PreMemo[@tree] = PostMemo[table] = name_hint
generate_lookup_node(bytes_code, words_code, name_hint, table) generate_lookup_node(name_hint, table)
name_hint name_hint
end end
def gennode(bytes_code, words_code, name_hint=nil) def gennode(bytes_code, words_code, name_hint=nil)
@bytes_code = bytes_code @bytes_code = bytes_code
@words_code = words_code @words_code = words_code
name = generate_node(bytes_code, words_code, name_hint) name = generate_node(name_hint)
@bytes_code = nil @bytes_code = nil
@words_code = nil @words_code = nil
return name return name
@ -656,9 +660,7 @@ def transcode_compile_tree(name, from, map, valid_encoding=nil)
} }
valid_encoding = ValidEncoding[from] if valid_encoding == nil valid_encoding = ValidEncoding[from] if valid_encoding == nil
if valid_encoding if valid_encoding
rects = ActionMap.parse_to_rects(h) am = ActionMap.merge(h, {valid_encoding => :undef}) {|prefix, as1, as2|
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) a1 = as1.empty? ? nil : ActionMap.unambiguous_action(as1)
a2 = as2.empty? ? nil : ActionMap.unambiguous_action(as2) a2 = as2.empty? ? nil : ActionMap.unambiguous_action(as2)
if !a2 if !a2
@ -923,3 +925,4 @@ if __FILE__ == $0
print result print result
end end
end end