Cleanup; added --version and some perldoc [minor]

Author: Chris White

lib/Object/TinyDefaults.pm

@@ -35,7 +35,7 @@ my %defaults;
 sub import {
     my $class = shift;
     return unless $class eq __PACKAGE__;
-        # Without this, it also gets imported into XML::Axk::V1 and
+        # Without this, it also gets imported into XML::Axk::L1 and
         # axk_script_*, trashing symbols and preventing execution.
     my $pkg   = caller;
     #print "Import into $pkg: (", join(', ', @_), ")\n";

lib/XML/Axk/App.pm

@@ -47,15 +47,19 @@ my %CMDLINE_OPTS = (
     #INCLUDE => ['i','|include=s@'],
     #KEEP_GOING => ['k','|keep-going',false], #not in gawk
     #LIB => ['l','|load=s@'],
-    #LINT => ['L','|lint:s'],
+    LANGUAGE => ['L','|language:s'],
     # --man reserved
     # OUTPUT_FILENAME => ['o','|output=s', ""], # conflict with gawk
+    # OPTIMIZE => ['O','|optimize'],
     #SANDBOX => ['S','|sandbox',false],
     #SOURCES reserved
     # --usage reserved
-    PRINT_VERSION => ['V','|version', false],
+    PRINT_VERSION => ['version','', false],
     DEFS => ['v','|var:s%'],
     # -? reserved
+    #
+    # gawk(1) long options: --dump-variables, --exec, --gen-po, --lint,
+    # --profile
 
     # Long-only options that are specific to axk.
     NO_INPUT => ['no-input'],   # When set, don't read any files.  This is so
@@ -131,6 +135,11 @@ sub Main {
     my %opts;
     parse_command_line(from => $lrArgs, into => \%opts);
 
+    if($opts{PRINT_VERSION}) {
+        say "axk $VERSION";
+        return 0;
+    }
+
     # Treat the first non-option arg as a script if appropriate
     unless(@{$opts{SOURCES}}) {
         croak "No scripts to run" unless @$lrArgs;
@@ -149,7 +158,7 @@ sub Main {
         } else {
             $core->load_script_text($text,
                 "(cmd line script #@{[++$cmd_line_idx]})",
-                true);  # true => add a Vn if there isn't one in the script
+                true);  # true => add a Ln if there isn't one in the script
         }
     } #foreach source
 
@@ -185,19 +194,59 @@ Version 0.1.0
 
     axk [options] [--] [script] [input filename(s)]
 
-=head1 OPTIONS
+=head1 INPUTS
 
 A filename of C<-> represents standard input.  To actually process a file
 named C<->, you will need to use shell redirection (e.g., C<< axk < - >>).
 Standard input is the default if no input filenames are given.
 
 The first non-option argument is a program if no -e or -f are given.
 The script language version for a -e will default to the latest if the text
-on the command line doesn't match C</^\s*V\s*\d+[\s;]+/>.
+on the command line doesn't specify a language version.
+
+=head1 OPTIONS
+
+=over
+
+=item -e, --source B<text>
+
+Run the axk code given as B<text>.
+
+=item -f, --file B<filename>
+
+Run the axk code given in the file called B<filename>.
+
+=item -L, --language B<language>
+
+B<Not yet implemented:>
+Interpret the following B<-e> in axk language B<language>.
+
+=item --show B<what>
+
+Show debugging information.  Currently implemented are:
+
+=over
+
+=item source
+
+Show the Perl source generated from the provided axk code.
+
+=back
+
+=item -v, --var B<name>=B<value>
+
+B<Not yet implemented:>
+Set B<name>=B<value>.
+
+=item --version
+
+Print the version of axk and exit
+
+=back
 
 =head1 AUTHOR
 
-Christopher White, C<< <cxwembedded at gmail.com> >>
+Christopher White, C<cxwembedded at gmail.com>
 
 =head1 BUGS
 

lib/XML/Axk/Core.pm

@@ -392,7 +392,7 @@ sub new {
     };
     my $self = bless($data, $class);
 
-    # Load this instance into the global namespace so the Vn packages can
+    # Load this instance into the global namespace so the Ln packages can
     # get at it
     do {
         no strict 'refs';

run

@@ -1,6 +1,6 @@
 #!/bin/sh
 if [[ $# -eq 0 ]]; then
-    args=(-f ex/xml1.axk t/ex1.xml)
+    args=(-f t/ex/xml1.axk t/ex1.xml)
 else
     args=("$@")
 fi

t/03-TODO.t

@@ -0,0 +1,35 @@
+#!perl
+
+use 5.018;
+use strict;
+use warnings;
+use Test::More;
+use Capture::Tiny 'capture_stdout';
+use XML::Axk::Core;
+
+sub localpath {
+    state $voldir = [File::Spec->splitpath(__FILE__)];
+    return File::Spec->catpath($voldir->[0], $voldir->[1], shift)
+}
+
+# Inline script, operation at runtime ============================= {{{1
+{
+    my $core = XML::Axk::Core->new();
+    $core->load_script_text(q{
+        L1
+        perform { say $E; } xpath("//item");
+        perform { say $E; } xpath(q<//@attrname>);
+    });
+    # Note: q<> is because Perl tries to interpolate an array into "//@attrname"
+
+    my $out = capture_stdout { $core->run(localpath 'ex/ex1.xml'); };
+    like($out, qr<(XML::DOM::Element[^\n]*\n){2}>, 'matched multiple elements');
+}
+
+# }}}1
+
+done_testing();
+__END__
+
+
+# vi: set ts=4 sts=4 sw=4 et ai fdm=marker fdl=1: #

t/03-additional.t

@@ -1,5 +1,5 @@
 say "hello from foo!";
-V1
+L1
 #BEGIN { no strict 'refs'; say Dumper(\%{"axk_script_0::"}); };
 
 pre_all {

ex/1.axk renamed to t/ex/1.axk

@@ -1,4 +1,4 @@
-V1
+L1
 perform {
     my $x = $C;
     chomp $x;