summaryrefslogtreecommitdiffstats
path: root/parser.y
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2011-10-01 12:46:12 -0700
committerKaz Kylheku <kaz@kylheku.com>2011-10-01 12:46:12 -0700
commit0db4948c41acbf4424762c82bb5022d457d2537e (patch)
tree451435b5258d0986a789869d98e0dcbf8811cac4 /parser.y
parent43d57181bce58c8f34d1b6a7e0235aa9d729a717 (diff)
parenta1349b59841b14b2a458b46ba36ed085becbdbd9 (diff)
downloadtxr-0db4948c41acbf4424762c82bb5022d457d2537e.tar.gz
txr-0db4948c41acbf4424762c82bb5022d457d2537e.tar.bz2
txr-0db4948c41acbf4424762c82bb5022d457d2537e.zip
Merge commit '4afe959'
Conflicts: ChangeLog Lost commit.
Diffstat (limited to 'parser.y')
-rw-r--r--parser.y2
1 files changed, 1 insertions, 1 deletions
diff --git a/parser.y b/parser.y
index 51f45042..93a8eb4d 100644
--- a/parser.y
+++ b/parser.y
@@ -473,7 +473,7 @@ var : IDENT { $$ = list(var_s, intern(string_own($1), nil),
yybadtoken(yychar, lit("variable spec")); }
;
-var_op : '*' { $$ = t; }
+var_op : '*' { $$ = list(t, nao); }
;
list : '(' exprs ')' { $$ = $2; }