summaryrefslogtreecommitdiff
path: root/source4/pidl/idl.yp
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-12 01:10:59 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-12 01:10:59 +0100
commit92950a9f2f300292c237a78b308d9e95fba2bed2 (patch)
tree3c3ce3c1921b6086f30369e95e4febb99d5eb523 /source4/pidl/idl.yp
parent47fff7a1b91c3ae89b8c1c1713366d74ac3497bb (diff)
downloadsamba-92950a9f2f300292c237a78b308d9e95fba2bed2.tar.gz
samba-92950a9f2f300292c237a78b308d9e95fba2bed2.tar.bz2
samba-92950a9f2f300292c237a78b308d9e95fba2bed2.zip
pidl: Remove support for the "declare" keyword in the parser.
(This used to be commit ea3371389226a756ba641a7fc02cfbee78663411)
Diffstat (limited to 'source4/pidl/idl.yp')
-rw-r--r--source4/pidl/idl.yp38
1 files changed, 2 insertions, 36 deletions
diff --git a/source4/pidl/idl.yp b/source4/pidl/idl.yp
index c372569a75..d2543c580c 100644
--- a/source4/pidl/idl.yp
+++ b/source4/pidl/idl.yp
@@ -93,7 +93,7 @@ definitions:
;
-definition: function | const | typedef | declare | typedecl
+definition: function | const | typedef | typedecl
;
const: 'const' identifier pointers identifier '=' anytext ';'
@@ -132,40 +132,6 @@ function: property_list type identifier '(' element_list2 ')' ';'
}}
;
-declare: 'declare' decl_type identifier';'
- {{
- "TYPE" => "DECLARE",
- "NAME" => $_[3],
- "DATA" => $_[2],
- "FILE" => $_[0]->YYData->{FILE},
- "LINE" => $_[0]->YYData->{LINE},
- }}
-;
-
-decl_type: decl_enum | decl_bitmap | decl_union
-;
-
-decl_enum: property_list 'enum'
- {{
- "TYPE" => "ENUM",
- "PROPERTIES" => $_[1]
- }}
-;
-
-decl_bitmap: property_list 'bitmap'
- {{
- "TYPE" => "BITMAP",
- "PROPERTIES" => $_[1]
- }}
-;
-
-decl_union: property_list 'union'
- {{
- "TYPE" => "UNION",
- "PROPERTIES" => $_[1]
- }}
-;
-
typedef: property_list 'typedef' type identifier array_len ';'
{{
"TYPE" => "TYPEDEF",
@@ -476,7 +442,7 @@ again:
if (s/^([\w_]+)//) {
$parser->YYData->{LAST_TOKEN} = $1;
if ($1 =~
- /^(coclass|interface|const|typedef|declare|union|cpp_quote
+ /^(coclass|interface|const|typedef|union|cpp_quote
|struct|enum|bitmap|void|unsigned|signed|import|include
|importlib)$/x) {
return $1;