Bugfix to line-number counting

Author: Chris White

lib/XML/Axk/Core.pm

@@ -126,18 +126,18 @@ files.
         my $length_delta = 0;   # how much to adjust pos($text) by
         #say "Old pos: ", $oldpos;
 
-        # Get line number in the original file
-        my $orig_lineno = 1 + ( () = substr($text, 0, $idxes[0]) =~ /\n/g );
+        # Get line number in the present, possibly modified, text
+        my $curr_lineno = 1 + ( () = substr($text, 0, $idxes[0]) =~ /\n/g );
             # Thanks to ikegami, http://www.perlmonks.org/?node_id=968352
-        $orig_lineno -= $lines_added;
+        $curr_lineno -= $lines_added;
 
         # Ln must be followed by whitespace and a newline.
         # This is to keep the line numbering vaguely consistent.
         my ($removed) = (substr($text, $idxes[1]) =~ s/\A(\h*\n)//);
 
         unless($removed) {
             # Tell the caller where in the source file the problem is
-            eval "#line $orig_lineno \"$fn\"\n" .
+            eval "#line $curr_lineno \"$fn\"\n" .
                     "die(\"L$lang indicator must be on its own line\");";
             die $@;
         }
@@ -149,10 +149,10 @@ files.
 
         # End an existing capture if we're switching languages
         if($curr_trailer) {
-            $replacement .= "\n$curr_trailer\n" .
-                            "#line $orig_lineno \"$fn\"\n";
+            $replacement .= "$curr_trailer\n" .
+                            "#line $curr_lineno \"$fn\"\n";
             $curr_trailer='';
-            ++$lines_added;
+            $lines_added += 2;
         }
 
         # Does this language parse the source text itself?
@@ -171,7 +171,7 @@ files.
             $curr_trailer =
                 "AXK_EMBEDDED_SOURCE_DO_NOT_TYPE_THIS_YOURSELF_OR_ELSE";
 
-            my $following_lineno = $orig_lineno+1;
+            my $following_lineno = $curr_lineno+1;
                 # Number of first line of the text in that language
             $replacement .=
                 "use XML::Axk::L$lang \"$fn\", $following_lineno, " .

lib/XML/Axk/L0.pm

@@ -23,7 +23,7 @@ sub import {
     );
     my $class = shift;
     my ($fn, $lineno, $source_text) = @_;
-    say "Got source text at $fn:$lineno:\n-----------------\n$source_text\n-----------------";
+    say "Got source text len ", length($source_text), " at $fn:$lineno:\n-----------------\n$source_text\n-----------------";
 } #import()
 
 #}}}1

t/04-languages.t

@@ -0,0 +1,30 @@
+#!perl
+# 04-languages.t: Multi-language support
+
+use 5.018;
+use strict;
+use warnings;
+use Test::More; # tests=>27;
+use Capture::Tiny 'capture_stdout';
+use File::Spec;
+use XML::Axk::App;
+
+sub localpath {
+    state $voldir = [File::Spec->splitpath(__FILE__)];
+    return File::Spec->catpath($voldir->[0], $voldir->[1], shift)
+}
+
+# Inline script =================================================== {{{1
+{
+    my $out = capture_stdout
+        { XML::Axk::App::Main(['--no-input', '-e',
+            "say __LINE__;\nL1\nL0\nL1\nL0\nL0\nL1\nL1\nsay __LINE__;" ])
+        };
+   like($out, qr/1\n9\n\Z/, 'line number counting works');
+}
+
+# }}}1
+
+done_testing();
+
+# vi: set ts=4 sts=4 sw=4 et ai fdm=marker fdl=1: #