* parser.y (texts, elem): Fixed incorrect use of rl rather

than rlcp.  Added forgotten rlcp on result of optimize_text.

* RELNOTES: Updated.

3 files changed, 20 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9536796b..2533d4c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-24  Kaz Kylheku  <kaz@kylheku.com>
+
+	* parser.y (texts, elem): Fixed incorrect use of rl rather
+	than rlcp.  Added forgotten rlcp on result of optimize_text.
+
+	* RELNOTES: Updated.
+
 2011-11-20  Kaz Kylheku  <kaz@kylheku.com>
 
 	Version 043
diff --git a/RELNOTES b/RELNOTES
index 981c08ff..810e8d0d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,12 @@
+                                    TXR 044
+                                   201?-??-??
+
+  Bugs
+
+  - Fixed regression in source location tracking (line numbers
+    shown in debugger and trace output).
+
+
                                     TXR 043
                                    2011-11-23
 
diff --git a/parser.y b/parser.y
index 27a668de..5a5c340b 100644
--- a/parser.y
+++ b/parser.y
@@ -283,12 +283,12 @@ text : TEXT                     { $$ = rl(string_own($1), num(lineno)); }
                                   rl($$, num(lineno)); }
      ;
 
-texts : text %prec LOW          { $$ = rl(cons($1, nil), $1); }
-      | text texts              { $$ = rl(cons($1, $2), $2); }
+texts : text %prec LOW          { $$ = rlcp(cons($1, nil), $1); }
+      | text texts              { $$ = rlcp(cons($1, $2), $2); }
       ;
 
-elem : texts                    { $$ = rl(cons(text_s, $1), $1);
-                                  $$ = optimize_text($$); }
+elem : texts                    { $$ = rlcp(cons(text_s, $1), $1);
+                                  $$ = rlcp(optimize_text($$), $$); }
      | var                      { $$ = rl($1, num(lineno)); }
      | list                     { $$ = $1; }
      | COLL exprs_opt ')' elems END     { $$ = list(coll_s, $4, nil, $2, nao);