Added %Sets at generation time; updated docs.

Author: Chris White

README.md

@@ -16,11 +16,20 @@ Usage
 	Usage: perl perlpp.pl [options] [filename]
 	Options:
 		-o, --output filename	Output to the file instead of STDOUT.
-		-D, --define name=value	Set $D{name}=value in the generated code.
-					The hash %D always exists, but is empty
-					if you haven't specified any -D options.
-		-e, --eval statement	Evaluate the statement(s) before any Perl code.
-		-E, --debug		Don't evaluate Perl code, just write it to STDERR.
+		-D, --define name=value	Set $D{name}=value in the generated
+					code.  The hash %D always exists, but
+					is empty if you haven't specified any
+					-D options.
+					Also substitutes _name_ with _value_
+					in the output file.
+					_value_ is optional and defaults to
+					true.
+		-e, --eval statement	Evaluate the statement(s) before any
+					Perl code of the input files.
+		-E, --debug		Don't evaluate Perl code, just write
+					it to STDERR.
+		-s, --set name=value	As -D, but gneerates into %S and does
+					not substitute in the text body.
 		-h, --help		Usage help.
 
 In a **-D** command, the `value` must be a valid Perl value, e.g., `"foo"`
@@ -282,3 +291,9 @@ and create corresponding *~/.vim/after/syntax/FILETYPE.vim*
 
 FILETYPE can be determined with `:set ft?`
 
+## Copyright
+
+Distributed under the MIT license --- see
+[LICENSE.txt](LICENSE.txt) for details.
+By Andrey Shubin (d-ash at Github) and Chris White (cxw42 at Github).
+

perlpp.pl

@@ -69,6 +69,9 @@ package PerlPP;
 my $Defs_RE = false;		# Regex that matches any -D name
 my %Defs_repl_text = ();	# Replacement text for -D names
 
+# -s definitions.
+my %Sets = ();				# Command-line -s arguments
+
 # Output-buffer stack
 my @OutputBuffers = ();		# each entry is a two-element array
 
@@ -565,6 +568,15 @@ sub Main {
 	}
 
 	# Now do SETS: -s or --set, into %S by analogy with -D and %D.
+
+	# Save a copy for use at generation time
+	%Sets = map {	my $v = eval(${$opts{SETS}}{$_});
+					warn "Could not evaluate -s \"$_\": $@" if $@;
+					$_ => ($v // true)
+				}
+			keys %{$opts{SETS}};
+
+	# Make the copy for runtime
 	print "my %S = (\n";
 	for my $defname (keys %{$opts{SETS}}) {
 		my $val = ${$opts{SETS}}{$defname};
@@ -636,14 +648,18 @@ =head1 OPTIONS
 
 Output to B<filename> instead of STDOUT.
 
-=item -D, --define B<name>=B<value>
+=item -D, --define B<name>[=B<value>]
 
 In the generated script, set C<< $D{B<name>} >> to B<value>.
 The hash C<%D> always exists, but is empty if no B<-D> options are
 given on the command line.
 
+The B<name> will also be replaced with the B<value> in the text of the file.
+If B<value> cannot be evaluated, no substitution is made for B<name>.
+
 If you omit the B<< =value >>, the value will be the constant C<true>
-(see L</"The generated script">, below).
+(see L</"The generated script">, below), and no text substitution
+will be performed.
 
 This also saves the value, or C<undef>, in the generation-time
 hash C<< %Defs >>.  This can be used, e.g., to select include filenames
@@ -661,6 +677,26 @@ =head1 OPTIONS
 Don't evaluate Perl code, just write the generated code to STDOUT.
 By analogy with the C<-E> option of gcc.
 
+=item -s, --set B<name>[=B<value>]
+
+As B<-D>, but:
+
+=over
+
+=item *
+
+Does not substitute text in the body of the document;
+
+=item *
+
+Saves into C<< %Sets >> at generation time; and
+
+=item *
+
+Saves into C<< %S >> in the generated script.
+
+=back
+
 =item --man
 
 Full documentation, viewed in your default pager if configured.
@@ -677,7 +713,8 @@ =head1 OPTIONS
 
 =head1 DEFINITIONS
 
-B<-D> items may be evaluated in any order --- do not rely on left-to-right
+B<-D> and B<-s> items may be evaluated in any order ---
+do not rely on left-to-right
 evaluation in the order given on the command line.
 
 If your shell strips quotes, you may need to escape them: B<value> must
@@ -722,8 +759,8 @@ =head1 COPYRIGHT
 
 Code at L<https://github.com/d-ash/perlpp>.
 Distributed under MIT license.
-By Andrey Shubin (L<[email protected]>); additional contributions by
-Chris White (cxw42 at Github).
+By Andrey Shubin (d-ash at Github; L<[email protected]>) and
+Chris White (cxw42 at Github; L<[email protected]>).
 
 =cut
 

t/cmdline.t

@@ -64,6 +64,8 @@ my @testcases=(
 	# Sets, which do not textually substitute
 	['-sfoo=42','<? my $foo; ?>foo',qr/^foo$/ ],
 	['-sfoo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ ],
+	['--set foo=42','<? my $foo; ?>foo',qr/^foo$/ ],
+	['--set foo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ ],
 
 	# Conditionals
 	['-Dfoo=42','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ ],

t/macro.t

@@ -18,6 +18,8 @@ my @testcases=(
 	['-D foo=42', '<?:macro say $Defs{foo}; ?>', qr/^42/],
 	['-D incfile=' . $incfn , '<?:macro Include $Defs{incfile}; ?>',
 		qr/^a4b/],
+	['-s incfile=' . $incfn , '<?:macro Include $Sets{incfile}; ?>',
+		qr/^a4b/],
 	['', '<?:immediate say "print 128;"; ?>',qr/^128$/],
 
 ); #@testcases