gtk2 0.90.2-x86-mingw32 → 0.90.3-x86-mingw32

data/ext/gtk2/rbgtkpapersize.c

@@ -26,7 +26,7 @@ ps_initialize(int argc, VALUE *argv, VALUE self)
     if (argc <= 1) {
         VALUE name;
         rb_scan_args(argc, argv, "01", &name);
-        size = gtk_paper_size_new(RVAL2CSTR2(name));
+        size = gtk_paper_size_new(RVAL2CSTR_ACCEPT_NIL(name));
     } else if (argc == 4) {
         size = gtk_paper_size_new_from_ppd(RVAL2CSTR(argv[0]),
                                            RVAL2CSTR(argv[1]),
@@ -144,14 +144,14 @@ Init_gtk_paper_size()
 
     rb_define_singleton_method(gPaperSize, "default", ps_s_get_default, 0);
 
-    rb_define_const(gPaperSize, "A3", rb_str_new2(GTK_PAPER_NAME_A3));
-    rb_define_const(gPaperSize, "A4", rb_str_new2(GTK_PAPER_NAME_A4));
-    rb_define_const(gPaperSize, "A5", rb_str_new2(GTK_PAPER_NAME_A5));
-    rb_define_const(gPaperSize, "B5", rb_str_new2(GTK_PAPER_NAME_B5));
-    rb_define_const(gPaperSize, "LETTER", rb_str_new2(GTK_PAPER_NAME_LETTER));
+    rb_define_const(gPaperSize, "A3", CSTR2RVAL(GTK_PAPER_NAME_A3));
+    rb_define_const(gPaperSize, "A4", CSTR2RVAL(GTK_PAPER_NAME_A4));
+    rb_define_const(gPaperSize, "A5", CSTR2RVAL(GTK_PAPER_NAME_A5));
+    rb_define_const(gPaperSize, "B5", CSTR2RVAL(GTK_PAPER_NAME_B5));
+    rb_define_const(gPaperSize, "LETTER", CSTR2RVAL(GTK_PAPER_NAME_LETTER));
     rb_define_const(gPaperSize, "EXECUTIVE",
-                    rb_str_new2(GTK_PAPER_NAME_EXECUTIVE));
-    rb_define_const(gPaperSize, "LEGAL", rb_str_new2(GTK_PAPER_NAME_LEGAL));
+                    CSTR2RVAL(GTK_PAPER_NAME_EXECUTIVE));
+    rb_define_const(gPaperSize, "LEGAL", CSTR2RVAL(GTK_PAPER_NAME_LEGAL));
 
     rb_define_method(gPaperSize, "initialize", ps_initialize, -1);
     rb_define_method(gPaperSize, "==", ps_is_equal, 1);

data/ext/gtk2/rbgtkprintsettings.c

@@ -78,7 +78,7 @@ ps_get(VALUE self, VALUE key)
 static VALUE
 ps_set(VALUE self, VALUE key, VALUE value)
 {
-    gtk_print_settings_set(_SELF(self), RVAL2CSTR(key), RVAL2CSTR2(value));
+    gtk_print_settings_set(_SELF(self), RVAL2CSTR(key), RVAL2CSTR_ACCEPT_NIL(value));
     return self;
 }
 
@@ -285,7 +285,7 @@ ps_get_printer(VALUE self)
 static VALUE
 ps_set_printer(VALUE self, VALUE printer)
 {
-    gtk_print_settings_set_printer(_SELF(self), RVAL2CSTR2(printer));
+    gtk_print_settings_set_printer(_SELF(self), RVAL2CSTR_ACCEPT_NIL(printer));
     return self;
 }
 
@@ -546,7 +546,7 @@ static VALUE
 ps_set_default_source(VALUE self, VALUE default_source)
 {
     gtk_print_settings_set_default_source(_SELF(self),
-                                          RVAL2CSTR2(default_source));
+                                          RVAL2CSTR_ACCEPT_NIL(default_source));
     return self;
 }
 
@@ -559,7 +559,7 @@ ps_get_media_type(VALUE self)
 static VALUE
 ps_set_media_type(VALUE self, VALUE media_type)
 {
-    gtk_print_settings_set_media_type(_SELF(self), RVAL2CSTR2(media_type));
+    gtk_print_settings_set_media_type(_SELF(self), RVAL2CSTR_ACCEPT_NIL(media_type));
     return self;
 }
 
@@ -572,7 +572,7 @@ ps_get_dither(VALUE self)
 static VALUE
 ps_set_dither(VALUE self, VALUE dither)
 {
-    gtk_print_settings_set_dither(_SELF(self), RVAL2CSTR2(dither));
+    gtk_print_settings_set_dither(_SELF(self), RVAL2CSTR_ACCEPT_NIL(dither));
     return self;
 }
 
@@ -585,7 +585,7 @@ ps_get_finishings(VALUE self)
 static VALUE
 ps_set_finishings(VALUE self, VALUE finishings)
 {
-    gtk_print_settings_set_finishings(_SELF(self), RVAL2CSTR2(finishings));
+    gtk_print_settings_set_finishings(_SELF(self), RVAL2CSTR_ACCEPT_NIL(finishings));
     return self;
 }
 
@@ -598,7 +598,7 @@ ps_get_output_bin(VALUE self)
 static VALUE
 ps_set_output_bin(VALUE self, VALUE output_bin)
 {
-    gtk_print_settings_set_output_bin(_SELF(self), RVAL2CSTR2(output_bin));
+    gtk_print_settings_set_output_bin(_SELF(self), RVAL2CSTR_ACCEPT_NIL(output_bin));
     return self;
 }
 #endif
@@ -620,7 +620,7 @@ ps_to_key_file(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &key_file, &group_name);
     gtk_print_settings_to_key_file(_SELF(self),
                                    (GKeyFile*)RVAL2BOXED(key_file, G_TYPE_KEY_FILE),
-                                   RVAL2CSTR2(group_name));
+                                   RVAL2CSTR_ACCEPT_NIL(group_name));
     return self;
 }
 #endif
@@ -666,59 +666,59 @@ Init_gtk_print_settings()
     rb_define_method(gPrintSettings, "each", ps_foreach, 0);
 
     rb_define_const(gPrintSettings, "PRINTER",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PRINTER));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PRINTER));
     rb_define_const(gPrintSettings, "ORIENTATION",
-                    rb_str_new2(GTK_PRINT_SETTINGS_ORIENTATION));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_ORIENTATION));
     rb_define_const(gPrintSettings, "PAPER_FORMAT",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PAPER_FORMAT));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PAPER_FORMAT));
     rb_define_const(gPrintSettings, "PAPER_WIDTH",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PAPER_WIDTH));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PAPER_WIDTH));
     rb_define_const(gPrintSettings, "PAPER_HEIGHT",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PAPER_HEIGHT));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PAPER_HEIGHT));
     rb_define_const(gPrintSettings, "N_COPIES",
-                    rb_str_new2(GTK_PRINT_SETTINGS_N_COPIES));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_N_COPIES));
     rb_define_const(gPrintSettings, "DEFAULT_SOURCE",
-                    rb_str_new2(GTK_PRINT_SETTINGS_DEFAULT_SOURCE));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_DEFAULT_SOURCE));
     rb_define_const(gPrintSettings, "QUALITY",
-                    rb_str_new2(GTK_PRINT_SETTINGS_QUALITY));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_QUALITY));
     rb_define_const(gPrintSettings, "RESOLUTION",
-                    rb_str_new2(GTK_PRINT_SETTINGS_RESOLUTION));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_RESOLUTION));
     rb_define_const(gPrintSettings, "USE_COLOR",
-                    rb_str_new2(GTK_PRINT_SETTINGS_USE_COLOR));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_USE_COLOR));
     rb_define_const(gPrintSettings, "DUPLEX",
-                    rb_str_new2(GTK_PRINT_SETTINGS_DUPLEX));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_DUPLEX));
     rb_define_const(gPrintSettings, "COLLATE",
-                    rb_str_new2(GTK_PRINT_SETTINGS_COLLATE));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_COLLATE));
     rb_define_const(gPrintSettings, "REVERSE",
-                    rb_str_new2(GTK_PRINT_SETTINGS_REVERSE));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_REVERSE));
     rb_define_const(gPrintSettings, "MEDIA_TYPE",
-                    rb_str_new2(GTK_PRINT_SETTINGS_MEDIA_TYPE));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_MEDIA_TYPE));
     rb_define_const(gPrintSettings, "DITHER",
-                    rb_str_new2(GTK_PRINT_SETTINGS_DITHER));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_DITHER));
     rb_define_const(gPrintSettings, "SCALE",
-                    rb_str_new2(GTK_PRINT_SETTINGS_SCALE));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_SCALE));
     rb_define_const(gPrintSettings, "PRINT_PAGES",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PRINT_PAGES));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PRINT_PAGES));
     rb_define_const(gPrintSettings, "PAGE_RANGES",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PAGE_RANGES));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PAGE_RANGES));
     rb_define_const(gPrintSettings, "PAGE_SET",
-                    rb_str_new2(GTK_PRINT_SETTINGS_PAGE_SET));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_PAGE_SET));
     rb_define_const(gPrintSettings, "FINISHINGS",
-                    rb_str_new2(GTK_PRINT_SETTINGS_FINISHINGS));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_FINISHINGS));
     rb_define_const(gPrintSettings, "NUMBER_UP",
-                    rb_str_new2(GTK_PRINT_SETTINGS_NUMBER_UP));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_NUMBER_UP));
     rb_define_const(gPrintSettings, "OUTPUT_BIN",
-                    rb_str_new2(GTK_PRINT_SETTINGS_OUTPUT_BIN));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_OUTPUT_BIN));
 
     rb_define_const(gPrintSettings, "OUTPUT_FILE_FORMAT",
-                    rb_str_new2(GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT));
     rb_define_const(gPrintSettings, "OUTPUT_URI",
-                    rb_str_new2(GTK_PRINT_SETTINGS_OUTPUT_URI));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_OUTPUT_URI));
 
     rb_define_const(gPrintSettings, "WIN32_DRIVER_VERSION",
-                    rb_str_new2(GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION));
     rb_define_const(gPrintSettings, "WIN32_DRIVER_EXTRA",
-                    rb_str_new2(GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA));
+                    CSTR2RVAL(GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA));
 
     /* Helpers: */
     rb_define_method(gPrintSettings, "printer", ps_get_printer, 0);

data/ext/gtk2/rbgtkrc.c

@@ -156,7 +156,7 @@ static VALUE
 rc_find_module_in_path(self, module_file)
     VALUE self, module_file;
 {
-    return CSTR2RVAL2(gtk_rc_find_module_in_path(RVAL2CSTR(module_file)));
+    return CSTR2RVAL_FREE(gtk_rc_find_module_in_path(RVAL2CSTR(module_file)));
 }
 
 /*
@@ -169,7 +169,7 @@ static VALUE
 rc_get_module_dir(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_rc_get_module_dir());
+    return CSTR2RVAL_FREE(gtk_rc_get_module_dir());
 }
 
 static VALUE
@@ -190,7 +190,7 @@ static VALUE
 rc_get_theme_dir(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_rc_get_theme_dir());
+    return CSTR2RVAL_FREE(gtk_rc_get_theme_dir());
 }
 
 void 

data/ext/gtk2/rbgtkrecentchooserdialog.c

@@ -27,14 +27,14 @@ rcd_initialize(argc, argv, self)
       VALUE manager;
       rb_scan_args(argc, argv, "03*", &title, &parent, &manager, &button_ary);
 
-      dialog = gtk_recent_chooser_dialog_new_for_manager((const gchar*)RVAL2CSTR2(title),
+      dialog = gtk_recent_chooser_dialog_new_for_manager((const gchar*)RVAL2CSTR_ACCEPT_NIL(title),
 							 GTK_WINDOW(RVAL2GOBJ(parent)),
 							 GTK_RECENT_MANAGER(RVAL2GOBJ(manager)),
 							 (const gchar*)NULL, NULL);
     } else {
       rb_scan_args(argc, argv, "02*", &title, &parent, &button_ary);
 
-      dialog = gtk_recent_chooser_dialog_new((const gchar*)RVAL2CSTR2(title),
+      dialog = gtk_recent_chooser_dialog_new((const gchar*)RVAL2CSTR_ACCEPT_NIL(title),
 					     GTK_WINDOW(RVAL2GOBJ(parent)),
 					     (const gchar*)NULL, NULL);
     }

data/ext/gtk2/rbgtkselectiondata.c

@@ -105,7 +105,8 @@ static VALUE
 gtkselectiondata_data(self)
     VALUE self;
 {
-    return rb_str_new((const char*)_SELF(self)->data, _SELF(self)->length);
+    return RBG_STRING_SET_UTF8_ENCODING(rb_str_new((const char*)_SELF(self)->data,
+                                                   _SELF(self)->length));
 }
 
 #if GTK_CHECK_VERSION(2,2,0)

data/ext/gtk2/rbgtktextbuffer.c

@@ -489,7 +489,7 @@ deserialize_func(register_buffer, content_buffer, iter, data, length, create_tag
     argv[0] = GOBJ2RVAL(register_buffer);
     argv[1] = GOBJ2RVAL(content_buffer);
     argv[2] = ITR2RVAL(iter);
-    argv[3] = rb_str_new((char*)data, length);
+    argv[3] = RBG_STRING_SET_UTF8_ENCODING(rb_str_new((char*)data, length));
     argv[4] = CBOOL2RVAL(create_tags);
 
     arg.callback = (VALUE)func;
@@ -590,7 +590,7 @@ txt_serialize(self, content_buffer, format, start, end)
                                             RVAL2ATOM(format),
                                             RVAL2ITR(start), RVAL2ITR(end),
                                             &length);
-    return rb_str_new((char*)ret, length);
+    return RBG_STRING_SET_UTF8_ENCODING(rb_str_new((char*)ret, length));
 }
 
 static VALUE

data/ext/gtk2/rbgtkwidget.c

@@ -644,7 +644,7 @@ widget_create_pango_layout(argc, argv, self)
 {
     VALUE text;
     rb_scan_args(argc, argv, "01", &text);
-    return GOBJ2RVALU(gtk_widget_create_pango_layout(_SELF(self), RVAL2CSTR2(text)));
+    return GOBJ2RVALU(gtk_widget_create_pango_layout(_SELF(self), RVAL2CSTR_ACCEPT_NIL(text)));
 }
 
 static VALUE
@@ -657,7 +657,7 @@ widget_render_icon(argc, argv, self)
     rb_scan_args(argc, argv, "21", &stock_id, &size, &detail);
     return GOBJ2RVALU(gtk_widget_render_icon(_SELF(self), rb_id2name(SYM2ID(stock_id)),
                                              RVAL2GENUM(size, GTK_TYPE_ICON_SIZE),
-                                             RVAL2CSTR2(detail)));
+                                             RVAL2CSTR_ACCEPT_NIL(detail)));
 }
 
 static VALUE
@@ -796,8 +796,7 @@ widget_s_find_style_property(self, property_name)
     if (SYMBOL_P(property_name)) {
         name = rb_id2name(SYM2ID(property_name));
     } else {
-        StringValue(property_name);
-        name = StringValuePtr(property_name);
+        name = RVAL2CSTR(property_name);
     }
 
     oclass = (GtkWidgetClass*)g_type_class_ref(CLASS2GTYPE(self));
@@ -879,8 +878,7 @@ widget_style_get_property(self, prop_name)
     if (SYMBOL_P(prop_name)) {
         name = rb_id2name(SYM2ID(prop_name));
     } else {
-        StringValue(prop_name);
-        name = StringValuePtr(prop_name);
+        name = RVAL2CSTR(prop_name);
     }
 #if GTK_CHECK_VERSION(2,2,0)
     pspec = gtk_widget_class_find_style_property((GtkWidgetClass*)g_type_class_ref(RVAL2GTYPE(self)), name);

data/test/run-test.rb

@@ -3,11 +3,11 @@
 ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
 ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
 
-glib_base = File.join(ruby_gnome2_base, "glib")
+glib_base = File.join(ruby_gnome2_base, "glib2")
 atk_base = File.join(ruby_gnome2_base, "atk")
 pango_base = File.join(ruby_gnome2_base, "pango")
-gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdkpixbuf")
-gtk_base = File.join(ruby_gnome2_base, "gtk")
+gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
+gtk_base = File.join(ruby_gnome2_base, "gtk2")
 
 [[glib_base, "glib2"],
  [atk_base, "atk"],

data/vendor/local/bin/glib-gettextize

@@ -38,11 +38,11 @@ Usage: glib-gettextize [OPTION]... [package-dir]
   -f, --force          force writing of new files even if old exist
 Report bugs to http://bugzilla.gnome.org/."
 package=glib
-version=2.24.2
+version=2.26.0
 try_ln_s=:
 
 # Directory where the sources are stored.
-prefix=c:/devel/target/fd56e00a6de2dc0ebdb82aea42c4eec0
+prefix=c:/devel/target/c2a2ac5b8143772ac09bf90d51bafa5f
 case `uname` in
 MINGW32*)
     prefix="`dirname $0`/.."

data/vendor/local/bin/glib-mkenums

@@ -1,6 +1,7 @@
 #!/bin/perl -w
 
 use File::Basename;
+use Safe;
 
 # glib-mkenums.pl 
 # Information about the current enumeration
@@ -21,6 +22,7 @@ my $enumname_prefix;		# prefix of $enumname
 my $enumindex = 0;		# Global enum counter
 my $firstenum = 1;		# Is this the first enumeration per file?
 my @entries;			# [ $name, $val ] for each entry
+my $sandbox = Safe->new;        # sandbox for safe evaluation of expressions
 
 sub parse_trigraph {
     my $opts = shift;
@@ -110,10 +112,10 @@ sub parse_entries {
 	    if (defined $options) {
 		my %options = parse_trigraph($options);
 		if (!defined $options{skip}) {
-		    push @entries, [ $name, $options{nick} ];
+		    push @entries, [ $name, $value, $options{nick} ];
 		}
 	    } else {
-		push @entries, [ $name ];
+		push @entries, [ $name, $value ];
 	    }
 	} elsif (m@^\s*\#@) {
 	    # ignore preprocessor directives
@@ -126,7 +128,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.24.2\n";
+    print "glib-mkenums version glib-2.26.0\n";
     print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
     print "You may redistribute copies of glib-mkenums under the terms of\n";
     print "the GNU General Public License which can be found in the\n";
@@ -158,6 +160,7 @@ sub usage {
     print "  \@ENUMPREFIX\@          PREFIX\n";
     print "  \@VALUENAME\@           PREFIX_THE_XVALUE\n";
     print "  \@valuenick\@           the-xvalue\n";
+    print "  \@valuenum\@            the integer value (limited support, Since: 2.26)\n";
     print "  \@type\@                either enum or flags\n";
     print "  \@Type\@                either Enum or Flags\n";
     print "  \@TYPE\@                either ENUM or FLAGS\n";
@@ -174,8 +177,7 @@ my $eprod = "";   # per enum text (produced prior to value itarations)
 my $vhead = "";   # value header, produced before iterating over enum values
 my $vprod = "";   # value text, produced for each enum value
 my $vtail = "";   # value tail, produced after iterating over enum values
-# other options
-my $comment_tmpl = "/* \@comment\@ */";
+my $comment_tmpl = "";   # comment template
 
 sub read_template_file {
   my ($file) = @_;
@@ -218,6 +220,9 @@ sub read_template_file {
   $vprod = $tmpl{'value-production'};
   $vtail = $tmpl{'value-tail'};
   $comment_tmpl = $tmpl{'comment'};
+
+  # default to C-style comments
+  $comment_tmpl = "/* \@comment\@ */" if $comment_tmpl eq "";
 }
 
 if (!defined $ARGV[0]) {
@@ -329,7 +334,7 @@ while (<>) {
 	# Autogenerate a prefix
 	if (!defined $enum_prefix) {
 	    for (@entries) {
-		my $nick = $_->[1];
+		my $nick = $_->[2];
 		if (!defined $nick) {
 		    my $name = $_->[0];
 		    if (defined $enum_prefix) {
@@ -355,12 +360,12 @@ while (<>) {
 	}
 	
 	for $entry (@entries) {
-	    my ($name,$nick) = @{$entry};
+	    my ($name,$num,$nick) = @{$entry};
             if (!defined $nick) {
  	        ($nick = $name) =~ s/^$enum_prefix//;
 	        $nick =~ tr/_/-/;
 	        $nick = lc($nick);
-	        @{$entry} = ($name, $nick);
+	        @{$entry} = ($name, $num, $nick);
             }
 	}
 	
@@ -452,13 +457,34 @@ while (<>) {
 
 	if (length($vprod)) {
 	    my $prod = $vprod;
+            my $next_num = 0;
 	    
 	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
 	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
 	    for (@entries) {
-		my ($name,$nick) = @{$_};
+		my ($name,$num,$nick) = @{$_};
 		my $tmp_prod = $prod;
 
+                if ($prod =~ /\@valuenum\@/) {
+                    # only attempt to eval the value if it is requested
+                    # this prevents us from throwing errors otherwise
+                    if (defined $num) {
+                        # use sandboxed perl evaluation as a reasonable
+                        # approximation to C constant folding
+                        $num = $sandbox->reval ($num);
+
+                        # make sure it parsed to an integer
+                        if (!defined $num or $num !~ /^-?\d+$/) {
+                            die "Unable to parse enum value '$num'";
+                        }
+                    } else {
+                        $num = $next_num;
+                    }
+
+                    $tmp_prod =~ s/\@valuenum\@/$num/g;
+                    $next_num = $num + 1;
+                }
+
 		$tmp_prod =~ s/\@VALUENAME\@/$name/g;
 		$tmp_prod =~ s/\@valuenick\@/$nick/g;
 		if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }