[Pspp-cvs] pspp/src/language/expressions ChangeLog evaluat...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/07/18 03:18:32

Modified files:
        src/language/expressions: ChangeLog evaluate.h.pl 
                                  evaluate.inc.pl generate.pl 
                                  operations.h.pl optimize.inc.pl 
                                  parse.inc.pl 

Log message:
        Use strict and all warnings.  Fix warnings that this triggers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/ChangeLog?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/evaluate.h.pl?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/evaluate.inc.pl?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/generate.pl?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/operations.h.pl?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/optimize.inc.pl?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/parse.inc.pl?cvsroot=pspp&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ChangeLog   16 Apr 2007 03:06:50 -0000      1.11
+++ ChangeLog   18 Jul 2007 03:18:31 -0000      1.12
@@ -1,3 +1,20 @@
+2007-07-17  Ben Pfaff  <address@hidden>
+
+       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  <address@hidden>
 
        * parse.c (expr_get_function): New function.

Index: evaluate.h.pl
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/evaluate.h.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- evaluate.h.pl       4 Mar 2006 01:11:57 -0000       1.1
+++ evaluate.h.pl       18 Jul 2007 03:18:31 -0000      1.2
@@ -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";
 

Index: evaluate.inc.pl
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/evaluate.inc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- evaluate.inc.pl     8 Jul 2006 03:05:51 -0000       1.2
+++ evaluate.inc.pl     18 Jul 2007 03:18:31 -0000      1.3
@@ -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};

Index: generate.pl
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/generate.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- generate.pl 11 Dec 2006 15:56:49 -0000      1.5
+++ generate.pl 18 Jul 2007 03:18:31 -0000      1.6
@@ -16,7 +16,7 @@
 
 # Parse input file.
 our (%ops);
-our (@funcs, @opers);
+our (@funcs, @opers, @order);
 parse_input ();
 
 # Produce output.
@@ -380,7 +380,7 @@
                       $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.

Index: operations.h.pl
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/operations.h.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- operations.h.pl     4 Mar 2006 01:11:57 -0000       1.1
+++ operations.h.pl     18 Jul 2007 03:18:31 -0000      1.2
@@ -1,4 +1,8 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
+our (@types, @funcs, @opers);
 
 sub generate_output {
     print "#include <stdlib.h>\n";

Index: optimize.inc.pl
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/optimize.inc.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- optimize.inc.pl     8 Jul 2006 03:05:51 -0000       1.2
+++ optimize.inc.pl     18 Jul 2007 03:18:31 -0000      1.3
@@ -1,4 +1,8 @@
+use strict;
+use warnings 'all';
+
 do 'generate.pl';
+our (@order, %ops);
 
 sub generate_output {
     for my $opname (@order) {

Index: parse.inc.pl
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/parse.inc.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- parse.inc.pl        11 Dec 2006 15:56:49 -0000      1.3
+++ parse.inc.pl        18 Jul 2007 03:18:31 -0000      1.4
@@ -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 @@
     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";
     }