Added initial tests of -s

Author: Chris White

perlpp.pl

@@ -453,7 +453,8 @@ sub OutputResult {
 	# --man reserved
 	# INPUT_FILENAME assigned by parse_command_line_into
 	OUTPUT_FILENAME => ['o','|output=s', ""],
-	DEFS => ['D','|define:s%'],
+	DEFS => ['D','|define:s%'],		# In %D, and text substitution
+	SETS => ['s','|set:s%'],		# Extra data in %S, without text substitution
 	# --usage reserved
 	# -? reserved
 );
@@ -526,7 +527,7 @@ sub Main {
 
 	# Transfer parameters from the command line (-D) to the processed file,
 	# as textual representations of expressions.
-	# The parameters are in %D at runtime, by analogy with -S and %S.
+	# The parameters are in %D at runtime.
 	print "my %D = (\n";
 	for my $defname (keys %{$opts{DEFS}}) {
 		my $val = ${$opts{DEFS}}{$defname} // 'true';
@@ -563,6 +564,20 @@ sub Main {
 			keys %{$opts{DEFS}};
 	}
 
+	# Now do SETS: -s or --set, into %S by analogy with -D and %D.
+	print "my %S = (\n";
+	for my $defname (keys %{$opts{SETS}}) {
+		my $val = ${$opts{SETS}}{$defname};
+		if(!defined($val)) {
+		}
+		$val = 'true' if $val eq '';
+			# "-s foo" (without a value) sets it to _true_ so
+			# "if($S{foo})" will work.  Getopt::Long gives us '' as the
+			# value in that situation.
+		print "    $defname => $val,\n";
+	}
+	print ");\n";
+
 	# Initial code from the command line, if any
 	print $opts{EVAL}, "\n" if $opts{EVAL};
 

t/cmdline.t

@@ -61,6 +61,10 @@ my @testcases=(
 	['-Dfoo=\"bar\" --define barfoo','_foo foo foobar barfoo',
 		qr/^_foo bar foobar barfoo$/ ],
 
+	# Sets, which do not textually substitute
+	['-sfoo=42','<? my $foo; ?>foo',qr/^foo$/ ],
+	['-sfoo=42','<? my $foo; ?><?= $S{foo} ?>',qr/^42$/ ],
+
 	# Conditionals
 	['-Dfoo=42','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^no$/ ],
 	['-Dfoo=2','<?:if foo==2?>yes<?:else?>no<?:endif?>',qr/^yes$/ ],