summaryrefslogtreecommitdiff
path: root/pyparsing/core.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyparsing/core.py')
-rw-r--r--pyparsing/core.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pyparsing/core.py b/pyparsing/core.py
index 9fbb6d0..71c2690 100644
--- a/pyparsing/core.py
+++ b/pyparsing/core.py
@@ -4147,7 +4147,7 @@ class Or(ParseExpression):
raise max_fatal
if maxException is not None:
- maxException.msg = self.errmsg
+ # maxException.msg = self.errmsg
raise maxException
else:
raise ParseException(
@@ -4260,7 +4260,8 @@ class MatchFirst(ParseExpression):
maxExcLoc = len(instring)
if maxException is not None:
- maxException.msg = self.errmsg
+ if maxException.msg == self.exprs[0].errmsg:
+ maxException.msg = self.errmsg
raise maxException
else:
raise ParseException(