summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parser.y2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1772973d..688b6f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-28 Kaz Kylheku <kaz@kylheku.com>
+
+ * parser.y (quasi_item): Switch from var to o_var. This fixes
+ cases like `@a@(foo)@b` where foo was being translated
+ to (foo) rather than (sys:expr foo).
+
2011-12-27 Kaz Kylheku <kaz@kylheku.com>
* mpi-patches/shrink-mpi-int (mpi_int): Fixed terrible bug in this
diff --git a/parser.y b/parser.y
index ba440d91..9703a078 100644
--- a/parser.y
+++ b/parser.y
@@ -772,7 +772,7 @@ quasi_items : quasi_item { $$ = cons($1, nil); }
quasi_item : litchars { $$ = lit_char_helper($1); }
| TEXT { $$ = string_own($1); }
- | var { $$ = $1; }
+ | o_var { $$ = $1; }
| list { $$ = rlcp(cons(expr_s, expand($1)), $1); }
;