summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2011-11-12 23:45:50 -0800
committerKaz Kylheku <kaz@kylheku.com>2011-11-12 23:45:50 -0800
commit7400f0f0e7821bc3f7b6cc6ab4af4438d8949209 (patch)
treef6b114d0de0f708dd5ddb924d1a4e6e4308a6a23
parentb9a2ba820bca9ab6e8e67132b8a5c0931b7ab9b2 (diff)
downloadtxr-7400f0f0e7821bc3f7b6cc6ab4af4438d8949209.tar.gz
txr-7400f0f0e7821bc3f7b6cc6ab4af4438d8949209.tar.bz2
txr-7400f0f0e7821bc3f7b6cc6ab4af4438d8949209.zip
* parser.y: Correctly record line number info for regex.
-rw-r--r--ChangeLog4
-rw-r--r--parser.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c9baf418..044c2b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-11-12 Kaz Kylheku <kaz@kylheku.com>
+ * parser.y: Correctly record line number info for regex.
+
+2011-11-12 Kaz Kylheku <kaz@kylheku.com>
+
Improved line number reporting in errors and debug traces.
* match.c (debugf): Function removed.
diff --git a/parser.y b/parser.y
index 117262fb..3c0823e3 100644
--- a/parser.y
+++ b/parser.y
@@ -279,7 +279,7 @@ elem : TEXT { $$ = rl(string_own($1), num(lineno)); }
| list { $$ = $1; }
| regex { $$ = cons(regex_compile(rest($1)),
rest($1));
- rl($1, num(lineno)); }
+ rl($$, num(lineno)); }
| COLL exprs_opt ')' elems END { $$ = list(coll_s, $4, nil, $2, nao);
rl($$, num($1)); }
| COLL exprs_opt ')' elems