shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

don't optimise anything with TARGET_TRANS to avoid intefering with the matcher's counting

Browse Source
This commit is contained in:
Alasdair Kergon 2010-04-22 23:09:18 +00:00
parent e07803f976
commit 616eda51e3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdm/regex/matcher.c
View File

@ -37,8 +37,6 @@ struct dm_regex { /* Instance variables for the lexer */
struct dm_pool *scratch, *mem; struct dm_pool *scratch, *mem;
}; };
#define TARGET_TRANS '\0'
static int _count_nodes(struct rx_node *rx) static int _count_nodes(struct rx_node *rx)
{ {
int r = 1; int r = 1;

7
libdm/regex/parse_rx.c
View File

@ -452,7 +452,12 @@ static int _nodes_equal(struct rx_node *l, struct rx_node *r)
return _nodes_equal(l->left, r->left); return _nodes_equal(l->left, r->left);
case CHARSET: case CHARSET:
return dm_bitset_equal(l->charset, r->charset); /*
* Never change anything containing TARGET_TRANS
* used by matcher as boundary marker between concatenated
* expressions.
*/
return (!dm_bit(l->charset, TARGET_TRANS) && dm_bitset_equal(l->charset, r->charset));
} }
/* NOTREACHED */ /* NOTREACHED */

2
libdm/regex/parse_rx.h
View File

@ -33,6 +33,8 @@ enum {
#define HAT_CHAR 0x2 #define HAT_CHAR 0x2
#define DOLLAR_CHAR 0x3 #define DOLLAR_CHAR 0x3
#define TARGET_TRANS '\0'
struct rx_node { struct rx_node {
int type; int type;
dm_bitset_t charset; dm_bitset_t charset;