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

This is part of a serious of patches to cleanup expr nodes, by separating

Browse Source 
out functionality and reducing the number of dynamic casts.
This commit is contained in:
John Johansen 2010-11-09 11:34:59 -08:00
parent adb0973d61
commit d2581332db
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
parser/libapparmor_re/regexp.y
View File

@ -114,6 +114,13 @@
} }
}; };
class InnerNode : public Node {
public:
InnerNode() : Node() { };
InnerNode(Node *left) : Node(left) {};
InnerNode(Node *left, Node *right) : Node(left, right) { };
};
/* Match nothing (//). */ /* Match nothing (//). */
class EpsNode : public Node { class EpsNode : public Node {
public: public:
@ -331,10 +338,10 @@
}; };
/* Match a pair of consecutive nodes. */ /* Match a pair of consecutive nodes. */
class CatNode : public Node { class CatNode : public InnerNode {
public: public:
CatNode(Node *left, Node *right) : CatNode(Node *left, Node *right) :
Node(left, right) { } InnerNode(left, right) { }
void compute_nullable() void compute_nullable()
{ {
nullable = child[0]->nullable && child[1]->nullable; nullable = child[0]->nullable && child[1]->nullable;
@ -378,10 +385,10 @@
}; };
/* Match a node zero or more times. (This is a unary operator.) */ /* Match a node zero or more times. (This is a unary operator.) */
class StarNode : public Node { class StarNode : public InnerNode {
public: public:
StarNode(Node *left) : StarNode(Node *left) :
Node(left) InnerNode(left)
{ {
nullable = true; nullable = true;
} }
@ -414,10 +421,10 @@
}; };
/* Match a node one or more times. (This is a unary operator.) */ /* Match a node one or more times. (This is a unary operator.) */
class PlusNode : public Node { class PlusNode : public InnerNode {
public: public:
PlusNode(Node *left) : PlusNode(Node *left) :
Node(left) { } InnerNode(left) { }
void compute_nullable() void compute_nullable()
{ {
nullable = child[0]->nullable; nullable = child[0]->nullable;
@ -451,10 +458,10 @@
}; };
/* Match one of two alternative nodes. */ /* Match one of two alternative nodes. */
class AltNode : public Node { class AltNode : public InnerNode {
public: public:
AltNode(Node *left, Node *right) : AltNode(Node *left, Node *right) :
Node(left, right) { } InnerNode(left, right) { }
void compute_nullable() void compute_nullable()
{ {
nullable = child[0]->nullable || child[1]->nullable; nullable = child[0]->nullable || child[1]->nullable;