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

* tool/transcode-tblgen.rb: gather offsets array at top.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-01 12:52:58 +00:00
parent b6b1931b7b
commit 03ec9b1aac
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Sep 1 21:46:18 2008 Tanaka Akira <akr@fsij.org>
* tool/transcode-tblgen.rb: gather offsets array at top.
Mon Sep 1 21:09:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> Mon Sep 1 21:09:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* ./: removed rubyspec from svn:ignore subversion property. * ./: removed rubyspec from svn:ignore subversion property.

24
tool/transcode-tblgen.rb
View File

@ -298,7 +298,7 @@ class ActionMap
code code
end end
def generate_lookup_node(name, table) def generate_lookup_node(bytes_code, code, name, table)
offsets = [] offsets = []
infos = [] infos = []
infomap = {} infomap = {}
@ -330,6 +330,7 @@ static const unsigned char
#{offsets_name}[#{2+max-min+1}] = #{format_offsets(min,max,offsets)}; #{offsets_name}[#{2+max-min+1}] = #{format_offsets(min,max,offsets)};
End End
OffsetsMemo[offsets_key] = offsets_name OffsetsMemo[offsets_key] = offsets_name
bytes_code << offsets_code
end end
if n = InfosMemo[infos] if n = InfosMemo[infos]
@ -344,7 +345,7 @@ End
InfosMemo[infos] = infos_name InfosMemo[infos] = infos_name
end end
r = offsets_code + infos_code + <<"End" r = infos_code + <<"End"
static const BYTE_LOOKUP static const BYTE_LOOKUP
#{name} = { #{name} = {
#{offsets_name}, #{offsets_name},
@ -352,14 +353,14 @@ static const BYTE_LOOKUP
}; };
End End
r code << r
end end
PreMemo = {} PreMemo = {}
PostMemo = {} PostMemo = {}
NextName = "a" NextName = "a"
def generate_node(code, name_hint=nil, valid_encoding=nil) def generate_node(bytes_code, code, name_hint=nil, valid_encoding=nil)
if n = PreMemo[[self,valid_encoding]] if n = PreMemo[[self,valid_encoding]]
return n return n
end end
@ -371,7 +372,7 @@ End
else else
name_hint2 = nil name_hint2 = nil
name_hint2 = "#{name_hint}_#{'%02X' % byte}" if name_hint name_hint2 = "#{name_hint}_#{'%02X' % byte}" if name_hint
table[byte] = "&" + rest.generate_node(code, name_hint2, rest_valid_encoding) table[byte] = "&" + rest.generate_node(bytes_code, code, name_hint2, rest_valid_encoding)
end end
} }
@ -386,13 +387,13 @@ End
PreMemo[[self,valid_encoding]] = PostMemo[table] = name_hint PreMemo[[self,valid_encoding]] = PostMemo[table] = name_hint
code << generate_lookup_node(name_hint, table) generate_lookup_node(bytes_code, code, name_hint, table)
name_hint name_hint
end end
def gennode(name_hint=nil, valid_encoding=nil) def gennode(bytes_code, name_hint=nil, valid_encoding=nil)
code = '' code = ''
name = generate_node(code, name_hint, valid_encoding) name = generate_node(bytes_code, code, name_hint, valid_encoding)
return name, code return name, code
end end
end end
@ -535,11 +536,12 @@ def transcode_compile_tree(name, from, map)
valid_encoding = nil valid_encoding = nil
end end
defined_name, code = am.gennode(name, valid_encoding) defined_name, code = am.gennode(TRANSCODE_GENERATED_BYTES_CODE, name, valid_encoding)
return defined_name, code, max_input return defined_name, code, max_input
end end
TRANSCODERS = [] TRANSCODERS = []
TRANSCODE_GENERATED_BYTES_CODE = ''
TRANSCODE_GENERATED_CODE = '' TRANSCODE_GENERATED_CODE = ''
def transcode_tblgen(from, to, map) def transcode_tblgen(from, to, map)
@ -577,13 +579,13 @@ end
def transcode_generate_node(am, name_hint=nil) def transcode_generate_node(am, name_hint=nil)
STDERR.puts "converter for #{name_hint}" if VERBOSE_MODE STDERR.puts "converter for #{name_hint}" if VERBOSE_MODE
name, code = am.gennode(name_hint) name, code = am.gennode(TRANSCODE_GENERATED_BYTES_CODE, name_hint)
TRANSCODE_GENERATED_CODE << code TRANSCODE_GENERATED_CODE << code
'' ''
end end
def transcode_generated_code def transcode_generated_code
TRANSCODE_GENERATED_CODE TRANSCODE_GENERATED_BYTES_CODE + TRANSCODE_GENERATED_CODE
end end
def transcode_register_code def transcode_register_code