pidl: Remove support for the "declare" keyword in the parser.

[ira/wip.git] / source / pidl / idl.yp

diff --git a/source/pidl/idl.yp b/source/pidl/idl.yp
index c372569a75a044559505a3d9364ee752047b1163..d2543c580cf54f5ac406739a92f5d0f1e38bae4a 100644 (file)
--- a/source/pidl/idl.yp
+++ b/source/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 ';' 
 ;
 
 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", 
 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 =~ 
                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;
                              |struct|enum|bitmap|void|unsigned|signed|import|include
                                  |importlib)$/x) {
                                return $1;