summaryrefslogtreecommitdiffstats
path: root/parser.l
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2010-01-19 14:43:40 -0800
committerKaz Kylheku <kaz@kylheku.com>2010-01-19 14:43:40 -0800
commitda3ffa806c910ba2d03dcca145eea52b90ebdbdf (patch)
tree39ea11c9d746df8307a4f3353bb9ce610269ace8 /parser.l
parent667a0b7d777cfdd479f260f32e5344c28ebb30a1 (diff)
downloadtxr-da3ffa806c910ba2d03dcca145eea52b90ebdbdf.tar.gz
txr-da3ffa806c910ba2d03dcca145eea52b90ebdbdf.tar.bz2
txr-da3ffa806c910ba2d03dcca145eea52b90ebdbdf.zip
Resolving parser conflicts.
Diffstat (limited to 'parser.l')
-rw-r--r--parser.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/parser.l b/parser.l
index f869892f..7bde063d 100644
--- a/parser.l
+++ b/parser.l
@@ -440,7 +440,7 @@ UONLY {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
yyerror("newline in regex");
}
-<REGEX>[.*?+^~&%] {
+<REGEX>[.*?+~&%] {
yylval.chr = yytext[0];
return yytext[0];
}