mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 13:58:22 +00:00
Code Issues Releases Wiki Activity

Add char node, and char node set merging. This does not have a substantive

Browse Source 
impact on performance but makes tree debugging nicer.
This commit is contained in:
John Johansen
2008-11-20 13:23:13 +00:00
parent c0533b390b
commit 0491e8d707
1 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
parser/libapparmor_re/regexp.y
View File

@@ -513,6 +513,12 @@ void normalize_tree(Node *t, int dir)
c->child[dir] = c->child[!dir]; c->child[dir] = c->child[!dir];
c->child[!dir] = t->child[!dir]; c->child[!dir] = t->child[!dir];
t->child[!dir] = c; t->child[!dir] = c;
} else if (dynamic_cast<AltNode *>(t) &&
dynamic_cast<CharSetNode *>(t->child[dir]) &&
dynamic_cast<CharNode *>(t->child[!dir])) {
Node *c = t->child[dir];
t->child[dir] = t->child[!dir];
t->child[!dir] = c;
} else { } else {
break; break;
} }
@@ -559,10 +565,35 @@ Node *simplify_tree_base(Node *t, int dir, bool &mod)
t = t->child[dir]->dup(); t = t->child[dir]->dup();
continue; continue;
} }
if (dynamic_cast<AltNode *>(t) && t->child[dir]->eq(t->child[!dir])) {
// (a | a) -> a if (dynamic_cast<AltNode *>(t)) {
t = t->child[dir]->dup(); if (t->child[dir]->eq(t->child[!dir])) {
continue; // (a | a) -> a
t = t->child[dir]->dup();
continue;
} else if (dynamic_cast<CharNode *>(t->child[dir]) &&
dynamic_cast<CharNode *>(t->child[!dir])) {
Chars chars;
chars.insert(dynamic_cast<CharNode *>(t->child[dir])->c);
chars.insert(dynamic_cast<CharNode *>(t->child[!dir])->c);
CharSetNode *n = new CharSetNode(chars);
t = n;
continue;
} else if (dynamic_cast<CharNode *>(t->child[dir]) &&
dynamic_cast<CharSetNode *>(t->child[!dir])) {
Chars *chars = &dynamic_cast<CharSetNode *>(t->child[!dir])->chars;
chars->insert(dynamic_cast<CharNode *>(t->child[dir])->c);
t = t->child[!dir]->dup();
continue;
} else if (dynamic_cast<CharSetNode *>(t->child[dir]) &&
dynamic_cast<CharSetNode *>(t->child[!dir])) {
Chars *from = &dynamic_cast<CharSetNode *>(t->child[dir])->chars;
Chars *to = &dynamic_cast<CharSetNode *>(t->child[!dir])->chars;
for (Chars::iterator i = from->begin(); i != from->end(); i++)
to->insert(*i);
t = t->child[!dir]->dup();
continue;
}
} }
if (dynamic_cast<AltNode *>(t) && if (dynamic_cast<AltNode *>(t) &&