Merge pull request #16 from cxw42/master

Added -v/--version; added devel info to README

Author: cxw42

README.md

@@ -317,6 +317,14 @@ and create corresponding *~/.vim/after/syntax/FILETYPE.vim*
 
 FILETYPE can be determined with `:set ft?`
 
+## Developing PerlPP
+
+Perlpp should run on any Perl v5.10+.  However, it does require `Getopt::Long`
+v2.50 or higher, so you might have to grab that from CPAN.
+To run the tests, you also need to grab `IPC::Run3`.
+
+The `Makefile` just runs the tests in `t/`; there is no build step.
+
 ## Copyright
 
 Distributed under the MIT license --- see

perlpp.pl

@@ -5,7 +5,7 @@
 # http://darkness.codefu.org/wordpress/2003/03/perl-scoping/
 
 package PerlPP;
-our $VERSION = '0.3.0-pre.2';
+our $VERSION = '0.3.0';
 
 use v5.10;		# provides // - http://perldoc.perl.org/perl5100delta.html
 use strict;
@@ -500,16 +500,17 @@ sub OutputResult {
 	# They are listed in alphabetical order by option name,
 	# lowercase before upper, although the code does not require that order.
 
-	EVAL => ['e','|eval=s', ''],
 	DEBUG => ['d','|E|debug', false],
+	DEFS => ['D','|define:s%'],		# In %D, and text substitution
+	EVAL => ['e','|eval=s', ''],
 	# -h and --help reserved
-	# --man reserved
 	# INPUT_FILENAME assigned by parse_command_line_into()
 	KEEP_GOING => ['k','|keep-going',false],
+	# --man reserved
 	OUTPUT_FILENAME => ['o','|output=s', ""],
-	DEFS => ['D','|define:s%'],		# In %D, and text substitution
 	SETS => ['s','|set:s%'],		# Extra data in %S, without text substitution
 	# --usage reserved
+	PRINT_VERSION => ['v','|version'],
 	# -? reserved
 );
 
@@ -565,6 +566,11 @@ sub parse_command_line_into {
 sub Main {
 	parse_command_line_into \%Opts;
 
+	if($Opts{PRINT_VERSION}) {
+		print "PerlPP version $VERSION\n";
+		return EXIT_OK;
+	}
+
 	# Preamble
 
 	$Package = $Opts{INPUT_FILENAME};
@@ -662,14 +668,15 @@ sub Main {
 
 		if($result) {	# Report errors to console and shell
 			print STDERR $result;
-			exit 1;
+			return EXIT_PROC_ERR;
 		} else {		# Save successful output
 			OutputResult( \EndOB(), $Opts{OUTPUT_FILENAME} );
 		}
 	}
+	return EXIT_OK;
 } #Main()
 
-Main( @ARGV );
+exit Main( @ARGV );
 
 __END__
 # ### Documentation #######################################################
@@ -684,7 +691,7 @@ =head1 NAME
 
 =head1 USAGE
 
-perl perlpp.pl [options] [filename]
+perl perlpp.pl [options] [--] [filename]
 
 If no [filename] is given, input will be read from stdin.
 
@@ -767,6 +774,10 @@ =head1 OPTIONS
 
 =back
 
+=item --version
+
+Show the version number of perlpp
+
 =head1 DEFINITIONS
 
 B<-D> and B<-s> items may be evaluated in any order ---

t/cmdline.t

@@ -10,6 +10,10 @@ my @testcases=(
 	# [$cmdline_options, $in (the script), $out_re (expected output),
 	#	$err_re (stderr output, if any)]
 
+	# version
+	['-v','',qr/\bversion\b/],
+	['--version','',qr/\bversion\b/],
+
 	# Debug output
 	['-d','',qr/^package PPP_;/],
 	['-d', '<?= 2+2 ?>', qr{print\s+2\+2\s*;}],