From 2cc5333157d15f51bc6e3c2889f5a9f7be947f7f Mon Sep 17 00:00:00 2001 From: jj Date: Fri, 27 Apr 2012 03:02:37 +0200 Subject: [PATCH] ruby: cleanup codegen enum --- plugins/ruby/codegen.pl | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/plugins/ruby/codegen.pl b/plugins/ruby/codegen.pl index 47930a5da..55985fc0b 100755 --- a/plugins/ruby/codegen.pl +++ b/plugins/ruby/codegen.pl @@ -47,13 +47,11 @@ my %item_renderer = ( my %global_types; -our %seen_enum_name; sub render_global_enum { my ($name, $type) = @_; my $rbname = rb_ucase($name); push @lines_rb, "class $rbname"; - %seen_enum_name = (); indent_rb { render_enum_fields($type); }; @@ -64,8 +62,6 @@ sub render_enum_fields { my $value = -1; my $idxname = 'ENUM'; - $idxname .= '_' while ($seen_enum_name{$idxname}); - $seen_enum_name{$idxname}++; push @lines_rb, "$idxname = Hash.new"; my %attr_type; @@ -100,8 +96,6 @@ sub render_enum_fields { if ($elemname) { my $rbelemname = rb_ucase($elemname); - $rbelemname .= '_' while ($seen_enum_name{$rbelemname}); - $seen_enum_name{$rbelemname}++; push @lines_rb, "$rbelemname = $value ; ${idxname}[$value] = :$rbelemname"; for my $iattr ($item->findnodes('child::item-attr')) { my $ian = $iattr->getAttribute('name'); @@ -169,7 +163,6 @@ sub render_global_class { return if $seen_class{$name}; $seen_class{$name}++; - %seen_enum_name = (); my $rtti_name = $type->getAttribute('original-name') || $type->getAttribute('type-name'); @@ -228,8 +221,6 @@ sub render_global_objects { my $sname = 'global_objects'; my $rbname = rb_ucase($sname); - %seen_enum_name = (); - push @lines_cpp, "}" if @include_cpp; push @lines_cpp, "void cpp_$sname(FILE *fout) {"; push @include_cpp, $sname; @@ -356,7 +347,6 @@ sub render_item_compound { my @namecomponents = split('::', $cppns); shift @namecomponents; my $enumclassname = join('_', map { rb_ucase($_) } @namecomponents); - local %seen_enum_name; push @lines_rb, "class ::DFHack::$enumclassname"; indent_rb { # declare constants