summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2010-01-13 17:37:56 -0800
committerKaz Kylheku <kaz@kylheku.com>2010-01-13 17:37:56 -0800
commit1fedfc67446065a4b00eb194505eed5e15851811 (patch)
tree5e2899ae9de6e19f9ef52493bb149d0681b39cac
parent56cfdc348955495dbd11fc70fb7ac04a8bba1f71 (diff)
downloadtxr-1fedfc67446065a4b00eb194505eed5e15851811.tar.gz
txr-1fedfc67446065a4b00eb194505eed5e15851811.tar.bz2
txr-1fedfc67446065a4b00eb194505eed5e15851811.zip
* parser.y (precedence): bugfix: character classes like this [^*]
being treated as a non-complemented set of two characters.
-rw-r--r--ChangeLog5
-rw-r--r--parser.y3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a134673..00158574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-01-13 Kaz Kylheku <kkylheku@gmail.com>
+ * parser.y (precedence): bugfix: character classes like this [^*]
+ being treated as a non-complemented set of two characters.
+
+2010-01-13 Kaz Kylheku <kkylheku@gmail.com>
+
Dynamically determine which regex implementation to use:
NFA or derivatives. The default behavior is NFA, with
derivatives used if the regular expression contains
diff --git a/parser.y b/parser.y
index 57692704..e8be187d 100644
--- a/parser.y
+++ b/parser.y
@@ -78,10 +78,11 @@ static val parsed_spec;
%nonassoc OUTPUT REPEAT REP FIRST LAST EMPTY DEFINE
%nonassoc '{' '}' '[' ']' '(' ')'
%right IDENT TEXT NUMBER
+%left '^'
%left '|' '/'
%left '&'
%right '~' '*' '?' '+'
-%right '^' '.' '\\' REGCHAR LITCHAR
+%right '.' '\\' REGCHAR LITCHAR
%%