Use strict and all warnings. Fix warnings that this triggers.

diff --git a/src/language/expressions/ChangeLog b/src/language/expressions/ChangeLog
index a2bdf3858a94170e43882d5cd419ad8bea837488..a5895b66a9da8d4f2e46678e312856145c6f430b 100644 (file)
--- a/src/language/expressions/ChangeLog
+++ b/src/language/expressions/ChangeLog
@@ -1,3 +1,20 @@
+2007-07-17  Ben Pfaff  <blp@gnu.org>
+
+       Patch #19335.  Reviewed by John Darrington.
+
+       * evaluate.h.pl: Use strict and all warnings.  Fix warnings that
+       this triggers.
+
+       * evaluate.inc.pl: Ditto.
+
+       * generate.pl: Ditto.
+
+       * operations.h.pl: Ditto.
+
+       * optimize.inc.pl: Ditto.
+
+       * parse.inc.pl: Ditto.
+
 2007-04-15  Ben Pfaff  <blp@gnu.org>
 
        * parse.c (expr_get_function): New function.

diff --git a/src/language/expressions/evaluate.h.pl b/src/language/expressions/evaluate.h.pl
index e1a762fc71c64db465e2e1e9ad6400798a53a170..c26a7cc9c6907156d34a6d1a45a64dd4b586a19f 100644 (file)
--- a/src/language/expressions/evaluate.h.pl
+++ b/src/language/expressions/evaluate.h.pl
@@ -1,5 +1,10 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
 
+our (%ops);
+our (@order);
 sub generate_output {
     print "#include \"helpers.h\"\n\n";
 

diff --git a/src/language/expressions/evaluate.inc.pl b/src/language/expressions/evaluate.inc.pl
index 7b6b1a3e683bae87511bcc36cef811d95aeba5a3..e2fccab8d558d491055295574fe77520b66db995 100644 (file)
--- a/src/language/expressions/evaluate.inc.pl
+++ b/src/language/expressions/evaluate.inc.pl
@@ -1,5 +1,11 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
 
+our (@order);
+our (%ops);
+
 sub generate_output {
     for my $opname (@order) {
        my ($op) = $ops{$opname};

diff --git a/src/language/expressions/generate.pl b/src/language/expressions/generate.pl
index c730cf071ed3f00d5aa5ecf7162cc18235e61705..def34255c838d780cb1c30845e677ca196ca1948 100644 (file)
--- a/src/language/expressions/generate.pl
+++ b/src/language/expressions/generate.pl
@@ -16,7 +16,7 @@ init_all_types ();
 
 # Parse input file.
 our (%ops);
-our (@funcs, @opers);
+our (@funcs, @opers, @order);
 parse_input ();
 
 # Produce output.
@@ -380,7 +380,7 @@ sub parse_input {
                       $ops{$a}->{OPNAME} cmp $ops{$b}->{OPNAME}}
       @funcs;
     @opers = sort {$ops{$a}->{NAME} cmp $ops{$b}->{NAME}} @opers;
-    our (@order) = (@funcs, @opers);
+    @order = (@funcs, @opers);
 }
 
 # Reads the next token into $token, $toktype.

diff --git a/src/language/expressions/operations.h.pl b/src/language/expressions/operations.h.pl
index d43a502126bdd71299d93b18f9c3798cea7ec85e..8e6e120b9828418b66b1eb19474403fb098c7793 100644 (file)
--- a/src/language/expressions/operations.h.pl
+++ b/src/language/expressions/operations.h.pl
@@ -1,4 +1,8 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
+our (@types, @funcs, @opers);
 
 sub generate_output {
     print "#include <stdlib.h>\n";

diff --git a/src/language/expressions/optimize.inc.pl b/src/language/expressions/optimize.inc.pl
index fce530f74de5b958e9d607e1e9a60e2137e76574..c44177456cb353e3dd59de8ff3aa81f6781d8612 100644 (file)
--- a/src/language/expressions/optimize.inc.pl
+++ b/src/language/expressions/optimize.inc.pl
@@ -1,4 +1,8 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
+our (@order, %ops);
 
 sub generate_output {
     for my $opname (@order) {

diff --git a/src/language/expressions/parse.inc.pl b/src/language/expressions/parse.inc.pl
index bab06d24517a423502e5ac0b7ffa3e5a61382aa0..4e7243c16086b8c8efb0d1e6c6ce2f36c13c4ee2 100644 (file)
--- a/src/language/expressions/parse.inc.pl
+++ b/src/language/expressions/parse.inc.pl
@@ -1,4 +1,8 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
+our (@types, @order, %ops);
 
 sub generate_output {
     my (@members) = ("\"\"", "\"\"", 0, 0, 0, "{}", 0, 0);
@@ -7,7 +11,10 @@ sub generate_output {
     for my $type (@types) {
        next if $type->{ROLE} eq 'fixed';
 
-       my (@members) = ("\"$type->{NAME}\"", "\"$type->{HUMAN_NAME}\"",
+       my ($human_name) = $type->{HUMAN_NAME};
+       $human_name = "" if !defined $human_name;
+       
+       my (@members) = ("\"$type->{NAME}\"", "\"\"",
                         0, "OP_$type->{NAME}", 0, "{}", 0, 0);
        print "{", join (', ', @members), "},\n";
     }