From d09a5b51c2c96e0315ec000589fdf81ca41c3fec Mon Sep 17 00:00:00 2001 From: Damien George Date: Sat, 21 Feb 2015 10:33:20 +0000 Subject: extmod: Pull in upstream changes to re1.5; fixes bug, adds named class. --- extmod/re1.5/charclass.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'extmod/re1.5/charclass.c') diff --git a/extmod/re1.5/charclass.c b/extmod/re1.5/charclass.c index c9df403750..7f6388c93d 100644 --- a/extmod/re1.5/charclass.c +++ b/extmod/re1.5/charclass.c @@ -11,3 +11,23 @@ int _re1_5_classmatch(const char *pc, const char *sp) } return !is_positive; } + +int _re1_5_namedclassmatch(const char *pc, const char *sp) +{ + // pc points to name of class + int off = (*pc >> 5) & 1; + if ((*pc | 0x20) == 'd') { + if (!(*sp >= '0' && *sp <= '9')) { + off ^= 1; + } + } else if ((*pc | 0x20) == 's') { + if (!(*sp == ' ' || (*sp >= '\t' && *sp <= '\r'))) { + off ^= 1; + } + } else { // w + if (!((*sp >= 'A' && *sp <= 'Z') || (*sp >= 'a' && *sp <= 'z') || (*sp >= '0' && *sp <= '9') || *sp == '_')) { + off ^= 1; + } + } + return off; +} -- cgit v1.2.3