extract bind_names

Author: mohawk2

utils/common.pl

@@ -32,4 +32,9 @@ sub save_file {
     }
 }
 
+sub bind_names {
+  my ($name, $s) = @_;
+  $s->{has_ptr_arg} ? $name . '_c' : $name;
+}
+
 1;

utils/generate-XS.pl

@@ -34,41 +34,41 @@ sub munge_GL_args {
 }
 
 sub generate_glew_xs {
-    my $content;
-    for my $name (@_ ? @_ : sort keys %signature) {
-        my $item = $signature{$name};
-        if ( is_manual($name) ) {
-            print "Skipping $name, already implemented in Modern.xs\n";
-            next;
-        }
-        my $argdata = $item->{argdata};
-        my @argdata = @{$argdata || []};
-        my $type = $item->{restype};
-        my $glewImpl = $item->{glewImpl};
-        my $args = join ', ', map $_->[0], @argdata;
-        my $xs_args = join '', map "     $_->[1]$_->[0];\n", @argdata;
-        my $binding_name = $item->{has_ptr_arg} ? $name . '_c' : $name;
-        my $decl = <<XS;
+  my $content;
+  for my $name (@_ ? @_ : sort keys %signature) {
+    my $item = $signature{$name};
+    if ( is_manual($name) ) {
+      print "Skipping $name, already implemented in Modern.xs\n";
+      next;
+    }
+    my $argdata = $item->{argdata};
+    my @argdata = @{$argdata || []};
+    my $type = $item->{restype};
+    my $glewImpl = $item->{glewImpl};
+    my $args = join ', ', map $_->[0], @argdata;
+    my $xs_args = join '', map "     $_->[1]$_->[0];\n", @argdata;
+    my ($binding_name) = bind_names($name, $item);
+    my $decl = <<XS;
 $type
 $binding_name($args);
 XS
-        $decl .= $xs_args;
-        my $error_check = $name eq "glGetError" ? "" : "OGLM_CHECK_ERR($name)";
-        my $res = $decl . <<XS;
+    $decl .= $xs_args;
+    my $error_check = $name eq "glGetError" ? "" : "OGLM_CHECK_ERR($name)";
+    my $res = $decl . <<XS;
 CODE:
-    OGLM_GLEWINIT@{[$error_check && "\n    $error_check"]}
-XS
-        if ( $item->{glewtype} eq 'fun' and $glewImpl ) {
-            $res .= "    OGLM_AVAIL_CHECK($glewImpl, $name)\n";
-        }
-        my ($retcap, $retout) = $type eq 'void' ? ('','') : ('RETVAL = ', "\nOUTPUT:\n    RETVAL");
-        my $arg_list = $item->{glewtype} eq 'var' ? "" : "($args)";
-        $res .= <<XS;
-    $retcap$name$arg_list;@{[$error_check && "\n    $error_check"]}$retout
+OGLM_GLEWINIT@{[$error_check && "\n    $error_check"]}
 XS
-        $content .= "$res\n";
+    if ( $item->{glewtype} eq 'fun' and $glewImpl ) {
+        $res .= "    OGLM_AVAIL_CHECK($glewImpl, $name)\n";
     }
-    return $content;
+    my ($retcap, $retout) = $type eq 'void' ? ('','') : ('RETVAL = ', "\nOUTPUT:\n    RETVAL");
+    my $arg_list = $item->{glewtype} eq 'var' ? "" : "($args)";
+    $res .= <<XS;
+$retcap$name$arg_list;@{[$error_check && "\n    $error_check"]}$retout
+XS
+    $content .= "$res\n";
+  }
+  return $content;
 }
 
 my $xs_code = generate_glew_xs(@ARGV);

utils/generate-registry.pl

@@ -150,11 +150,11 @@ sub preprocess_for_registry {
 my (%features, %gltags);
 for my $name (sort {uc$a cmp uc$b} keys %signature) {
   my $s = $signature{$name};
-  my $binding_name = $s->{has_ptr_arg} ? $name . '_c' : $name;
-  push @exported_functions, $binding_name if !is_manual($name);
+  my @binding_names = bind_names($name, $s);
+  push @exported_functions, @binding_names if !is_manual($name);
   next if !$s->{feature};
   for ($s->{feature}, grep defined, $feature2version{$s->{feature}}) {
-    $gltags{$_}{$binding_name} = undef;
+    @{ $gltags{$_} }{ @binding_names } = ();
     $features{$_}{$name} = undef;
   }
 }