better error checking

Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/dca7dba2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/dca7dba2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/dca7dba2

Branch: refs/heads/master
Commit: dca7dba22889fad2626f2e5176ee63bf15ab8a85
Parents: 090cb8c
Author: Matt Post <[email protected]>
Authored: Mon Mar 28 10:56:17 2016 -0400
Committer: Matt Post <[email protected]>
Committed: Mon Mar 28 10:56:17 2016 -0400

----------------------------------------------------------------------
 scripts/support/grammar-packer.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/dca7dba2/scripts/support/grammar-packer.pl
----------------------------------------------------------------------
diff --git a/scripts/support/grammar-packer.pl 
b/scripts/support/grammar-packer.pl
index f5e8481..d2b1627 100755
--- a/scripts/support/grammar-packer.pl
+++ b/scripts/support/grammar-packer.pl
@@ -27,6 +27,7 @@ my %opts = (
   v => 0,         # verbose
 );
 getopts("m:T:vg:o:", \%opts) || die usage();
+die usage() if (@ARGV);
 
 my $JOSHUA = $ENV{JOSHUA} or die "you must defined \$JOSHUA";
 my $CAT    = "$JOSHUA/scripts/training/scat";
@@ -40,7 +41,7 @@ my @grammars = split(' ', $opts{g});
 my @outputs = split(' ', $opts{o});
 
 # make sure outputs is same size as inputs, or 0
-die usage() if (scalar(@outputs) != 0 && scalar(@outputs) != 
scalar(@grammars));
+die usage() if (scalar(@outputs) == 0 || scalar(@grammars) == 0 || 
scalar(@outputs) != scalar(@grammars));
 
 # if no outputs given, generate default names
 if (scalar(@outputs) < scalar(@grammars)) {

Reply via email to