Mercurial > octave

changeset 24726:10c7e236a567

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* mk-builtins.pl: Don't generate functions that do nothing.
author John W. Eaton <jwe@octave.org>
date Sat, 10 Feb 2018 15:57:32 -0500
parents edef866fba7b
children 11e359eb63f4
files libinterp/mk-builtins.pl
diffstat 1 files changed, 19 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/mk-builtins.pl	Sat Feb 10 15:45:22 2018 -0500
+++ b/libinterp/mk-builtins.pl	Sat Feb 10 15:57:32 2018 -0500
@@ -176,15 +176,10 @@
     $fcn =~ s/-/_/g;
     $fcn = "install_${fcn}_fcns";
 
-    push (@installer_functions, $fcn);
-
-    print "
-static void
+    $fcn_header = "\nstatic void
 $fcn (void)
 {
-  std::string file = \"$arg\";
-
-";
+  std::string file = \"$arg\";";
 
     open($fh, "<", $file) || die "mk-builtins.pl: failed to open file $file\n";
 
@@ -196,6 +191,7 @@
     $fname = "";
     $name = "";
     $alias = "";
+    $fcn_body = "";
 
     %dispatch_map = ();
 
@@ -258,11 +254,11 @@
 
         if ($const)
         {
-          print "  install_builtin_function ($fname, \"$name\", file, \"external-doc:$name\", true);\n"
+          $fcn_body .= "\n  install_builtin_function ($fname, \"$name\", file, \"external-doc:$name\", true);"
         }
         else
         {
-          print "  install_builtin_function ($fname, \"$name\", file, \"external-doc:$name\");\n"
+          $fcn_body .= "\n  install_builtin_function ($fname, \"$name\", file, \"external-doc:$name\");"
         }
 
         $type = "";
@@ -272,7 +268,7 @@
       }
       elsif ($type eq "alias")
       {
-        print "  alias_builtin (\"$alias\", \"$name\");\n";
+        $fcn_body .= "\n  alias_builtin (\"$alias\", \"$name\");";
 
         ## Preserve dispatch info (if any) that we have for the
         ## original function.
@@ -295,17 +291,27 @@
 
     foreach $fcn (sort (keys (%dispatch_map)))
     {
-      print "\n";
+      $dispatch_code = "";
 
       @classes =  @{$dispatch_map{$fcn}};
 
       foreach $class (@classes)
       {
-        print "  install_builtin_dispatch (\"$fcn\", \"$class\");\n";
+        $dispatch_code .= "\n  install_builtin_dispatch (\"$fcn\", \"$class\");";
       }
+
+      if ($dispatch_code)
+        {
+          $fcn_body .= "\n$dispatch_code";
+        }
     }
 
-    print "}\n";
+    if ($fcn_body)
+      {
+        push (@installer_functions, $fcn);
+
+        print "$fcn_header\n$fcn_body\n}\n";
+      }
   }
 
   print "