kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

eventids2.c: reduce size

Browse source 
* ext/ripper/eventids2.c (token_assoc): reduce size.  unsigned
  short can hold 65535 at least.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-28 02:53:24 +00:00
parent d3dc67350a
commit b5524d9f8a
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/ripper/eventids2.c
View file

@ -125,11 +125,13 @@ ripper_init_eventids2(void)
set_id2(CHAR); set_id2(CHAR);
} }
STATIC_ASSERT(k__END___range, k__END__ < SHRT_MAX);
STATIC_ASSERT(ripper_scanner_ids_size, sizeof(ripper_scanner_ids) < SHRT_MAX);
#define O(member) (int)offsetof(ripper_scanner_ids_t, ripper_id_##member) #define O(member) (int)offsetof(ripper_scanner_ids_t, ripper_id_##member)
static const struct token_assoc { static const struct token_assoc {
int token; unsigned short token;
int id_offset; unsigned short id_offset;
} token_to_eventid[] = { } token_to_eventid[] = {
{' ', O(words_sep)}, {' ', O(words_sep)},
{'!', O(op)}, {'!', O(op)},

10
ext/ripper/tools/generate.rb
View file

@ -149,9 +149,13 @@ def read_ids1_with_locations(path)
end end
def read_ids2(path) def read_ids2(path)
File.open(path) {|f| src = File.open(path) {|f| f.read}
return f.read.scan(/ID\s+ripper_id_(\w+)/).flatten.uniq.sort ids2 = src.scan(/ID\s+ripper_id_(\w+)/).flatten.uniq.sort
} diff = src.scan(/set_id2\((\w+)\);/).flatten - ids2
unless diff.empty?
abort "missing scanner IDs: #{diff}"
end
return ids2
end end
main main