[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-384-g1fe5c1a
Jelmer Vernooij
jelmer at samba.org
Sun Jan 13 00:26:38 GMT 2008
The branch, v4-0-test has been updated
via 1fe5c1ad07c574dc094f59f728025dfcafa0cf22 (commit)
via 4f4dfa6042178c157a09df61d72a42af7aa5c67b (commit)
via 893f4102c93c1c2cd6b836f12644d06d9e31800c (commit)
via d91af936ae51e33c8598d88c77575abbeb0e556b (commit)
via c1e0570506d7c77112065a03a876cda4e4db7769 (commit)
via e8ab241ff47f2c3e6f80f9c62373139e4c9f5a1e (commit)
via 169e91b07c29a69113f40214543be2653d7fecf5 (commit)
via 7569fd5fce55fdc5c2639ec5c0a8e39e37a21fe8 (commit)
via e44ee3e60ac4eb56cca02b58fdecb171269daca4 (commit)
via a13f51dae591684dbc9620f385d2fbccf31ec137 (commit)
via 254bf85c2eb69fc2ee22d3a92a6b027a25594250 (commit)
via ce40890ef0166ad11dd835249f52e2ab5876efba (commit)
via 2fe013f715bdee6c01a833bc6c883e830bdc5dfd (commit)
via 3fd750bd54f150ff62fd8165406bd26d03d624cf (commit)
via ea3371389226a756ba641a7fc02cfbee78663411 (commit)
from 79344c9c5e0e38155facb0c7b16e84a0dca3d2eb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 1fe5c1ad07c574dc094f59f728025dfcafa0cf22
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jan 13 00:05:24 2008 +0100
pidl: Avoid accidently filling in empty body for types without body.
commit 4f4dfa6042178c157a09df61d72a42af7aa5c67b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 23:38:05 2008 +0100
pidl/ejs: Fix bug that filled in the body for types without body.
commit 893f4102c93c1c2cd6b836f12644d06d9e31800c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 23:10:28 2008 +0100
pidl: Add function for determining whether a type has a body.
commit d91af936ae51e33c8598d88c77575abbeb0e556b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 23:06:00 2008 +0100
pidl: Move more stuff outside ifdef when defining enums and generate pretty code for enums without body.
commit c1e0570506d7c77112065a03a876cda4e4db7769
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 22:35:28 2008 +0100
pidl: Prevent empty declarations for enums without body.
commit e8ab241ff47f2c3e6f80f9c62373139e4c9f5a1e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 22:15:12 2008 +0100
pidl: Add ability to write type metadata to a file.
commit 169e91b07c29a69113f40214543be2653d7fecf5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 22:03:05 2008 +0100
pidl: Remove obsolete smb_interfaces code.
commit 7569fd5fce55fdc5c2639ec5c0a8e39e37a21fe8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 22:00:14 2008 +0100
pidl: Add CPAN metadata.
commit e44ee3e60ac4eb56cca02b58fdecb171269daca4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 21:37:46 2008 +0100
pidl: Add more parsing tests.
commit a13f51dae591684dbc9620f385d2fbccf31ec137
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 21:33:18 2008 +0100
pidl: Update documentation.
commit 254bf85c2eb69fc2ee22d3a92a6b027a25594250
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 21:21:14 2008 +0100
pidl: Remove declare tests, add more tests for typedef.
commit ce40890ef0166ad11dd835249f52e2ab5876efba
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 21:14:44 2008 +0100
pidl: Move tests for the CUtil module to a separate file.
commit 2fe013f715bdee6c01a833bc6c883e830bdc5dfd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 01:22:23 2008 +0100
pidl: Remove support for the declare keyword in other parts of the pidl code.
commit 3fd750bd54f150ff62fd8165406bd26d03d624cf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 01:18:53 2008 +0100
idl: Use typedef rather than declare.
commit ea3371389226a756ba641a7fc02cfbee78663411
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Jan 12 01:10:59 2008 +0100
pidl: Remove support for the "declare" keyword in the parser.
-----------------------------------------------------------------------
Summary of changes:
source/heimdal/lib/com_err/lex.c | 32 +-
source/librpc/idl/drsblobs.idl | 6 +-
source/librpc/idl/drsuapi.idl | 2 +-
source/librpc/idl/lsa.idl | 2 +-
source/librpc/idl/nbt.idl | 4 +-
source/librpc/idl/netlogon.idl | 6 +-
source/librpc/idl/samr.idl | 4 +-
source/librpc/idl/spoolss.idl | 2 +-
source/librpc/idl/srvsvc.idl | 4 +-
source/librpc/idl/winbind.idl | 4 +-
source/librpc/idl/winreg.idl | 2 +-
source/librpc/idl/wkssvc.idl | 2 +-
source/pidl/MANIFEST | 2 +-
source/pidl/META.yml | 18 +
source/pidl/README | 1 +
source/pidl/TODO | 1 -
source/pidl/idl.yp | 38 +-
source/pidl/lib/Parse/Pidl/Compat.pm | 7 -
source/pidl/lib/Parse/Pidl/IDL.pm | 2186 +++++++++++------------
source/pidl/lib/Parse/Pidl/NDR.pm | 18 +-
source/pidl/lib/Parse/Pidl/Samba4/EJS.pm | 12 +-
source/pidl/lib/Parse/Pidl/Samba4/Header.pm | 66 +-
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 7 +-
source/pidl/lib/Parse/Pidl/Typelist.pm | 33 +-
source/pidl/pidl | 15 +-
source/pidl/smb_interfaces.pm | 1272 -------------
source/pidl/smb_interfaces.yp | 233 ---
source/pidl/tests/cutil.pl | 21 +
source/pidl/tests/ndr.pl | 17 +-
source/pidl/tests/parse_idl.pl | 34 +-
source/pidl/tests/samba-ejs.pl | 13 +-
source/pidl/tests/typelist.pl | 8 +-
32 files changed, 1276 insertions(+), 2796 deletions(-)
create mode 100644 source/pidl/META.yml
delete mode 100644 source/pidl/smb_interfaces.pm
delete mode 100644 source/pidl/smb_interfaces.yp
create mode 100755 source/pidl/tests/cutil.pl
Changeset truncated at 500 lines:
diff --git a/source/heimdal/lib/com_err/lex.c b/source/heimdal/lib/com_err/lex.c
index 77e79d4..7a85b30 100644
--- a/source/heimdal/lib/com_err/lex.c
+++ b/source/heimdal/lib/com_err/lex.c
@@ -343,6 +343,9 @@ FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
typedef int yy_state_type;
extern int yylineno;
+
+int yylineno = 1;
+
extern char *yytext;
#define yytext_ptr yytext
@@ -530,7 +533,7 @@ static int getstring(void);
#undef ECHO
-#line 533 "heimdal/lib/com_err/lex.c"
+#line 536 "heimdal/lib/com_err/lex.c"
#define INITIAL 0
@@ -685,7 +688,7 @@ YY_DECL
#line 59 "lex.l"
-#line 688 "heimdal/lib/com_err/lex.c"
+#line 691 "heimdal/lib/com_err/lex.c"
if ( !(yy_init) )
{
@@ -849,7 +852,7 @@ YY_RULE_SETUP
#line 75 "lex.l"
ECHO;
YY_BREAK
-#line 852 "heimdal/lib/com_err/lex.c"
+#line 855 "heimdal/lib/com_err/lex.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1080,7 +1083,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), num_to_read );
+ (yy_n_chars), (size_t) num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1581,7 +1584,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
/** Setup the input buffer state to scan a string. The next call to yylex() will
* scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
*
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
@@ -1659,6 +1662,15 @@ static void yy_fatal_error (yyconst char* msg )
/* Accessor methods (get/set functions) to struct members. */
+/** Get the current line number.
+ *
+ */
+int yyget_lineno (void)
+{
+
+ return yylineno;
+}
+
/** Get the input stream.
*
*/
@@ -1692,6 +1704,16 @@ char *yyget_text (void)
return yytext;
}
+/** Set the current line number.
+ * @param line_number
+ *
+ */
+void yyset_lineno (int line_number )
+{
+
+ yylineno = line_number;
+}
+
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
diff --git a/source/librpc/idl/drsblobs.idl b/source/librpc/idl/drsblobs.idl
index f690e39..1e80597 100644
--- a/source/librpc/idl/drsblobs.idl
+++ b/source/librpc/idl/drsblobs.idl
@@ -9,9 +9,9 @@ import "drsuapi.idl";
helpstring("Active Directory Replication LDAP Blobs")
]
interface drsblobs {
- declare bitmap drsuapi_DsReplicaSyncOptions;
- declare bitmap drsuapi_DsReplicaNeighbourFlags;
- declare [v1_enum] enum drsuapi_DsAttributeId;
+ typedef bitmap drsuapi_DsReplicaSyncOptions drsuapi_DsReplicaSyncOptions;
+ typedef bitmap drsuapi_DsReplicaNeighbourFlags drsuapi_DsReplicaNeighbourFlags;
+ typedef [v1_enum] enum drsuapi_DsAttributeId drsuapi_DsAttributeId;
/*
* replPropertyMetaData
diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl
index e8fbc85..f298b7e 100644
--- a/source/librpc/idl/drsuapi.idl
+++ b/source/librpc/idl/drsuapi.idl
@@ -13,7 +13,7 @@ import "security.idl", "misc.idl", "samr.idl";
]
interface drsuapi
{
- declare bitmap samr_GroupAttrs;
+ typedef bitmap samr_GroupAttrs samr_GroupAttrs;
/*****************/
/* Function 0x00 */
diff --git a/source/librpc/idl/lsa.idl b/source/librpc/idl/lsa.idl
index b692139..ea94458 100644
--- a/source/librpc/idl/lsa.idl
+++ b/source/librpc/idl/lsa.idl
@@ -13,7 +13,7 @@ import "security.idl";
helpstring("Local Security Authority")
] interface lsarpc
{
- declare bitmap security_secinfo;
+ typedef bitmap security_secinfo security_secinfo;
typedef [public,noejs] struct {
[value(2*strlen_m(string))] uint16 length;
diff --git a/source/librpc/idl/nbt.idl b/source/librpc/idl/nbt.idl
index 609f84c..d4c2bf1 100644
--- a/source/librpc/idl/nbt.idl
+++ b/source/librpc/idl/nbt.idl
@@ -418,7 +418,7 @@ interface nbt
uint16 lm20_token;
} nbt_netlogon_response_from_pdc2;
- declare enum netr_SamDatabaseID;
+ typedef enum netr_SamDatabaseID netr_SamDatabaseID;
/* announce change to UAS or SAM */
typedef struct {
@@ -592,7 +592,7 @@ interface nbt
/* \MAILSLOT\BROWSE mailslot requests */
/* for details see http://ubiqx.org/cifs/Browsing.html */
/********************************************************/
- declare bitmap svcctl_ServerType;
+ typedef bitmap svcctl_ServerType svcctl_ServerType;
typedef [enum8bit] enum {
HostAnnouncement = 1,
diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 96aab3a..dcbb647 100644
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -18,7 +18,7 @@ import "lsa.idl", "samr.idl", "security.idl", "nbt.idl";
interface netlogon
{
- declare bitmap samr_AcctFlags;
+ typedef bitmap samr_AcctFlags samr_AcctFlags;
/*****************/
/* Function 0x00 */
@@ -278,7 +278,7 @@ interface netlogon
/*****************/
/* Function 0x05 */
- declare enum netr_SchannelType;
+ typedef enum netr_SchannelType netr_SchannelType;
NTSTATUS netr_ServerAuthenticate(
[in,string,charset(UTF16)] uint16 *server_name,
@@ -306,7 +306,7 @@ interface netlogon
/*****************/
/* Function 0x07 */
- declare enum netr_SamDatabaseID;
+ typedef enum netr_SamDatabaseID netr_SamDatabaseID;
typedef struct {
[string,charset(UTF16)] uint16 *account_name;
diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index f008637..b6d2b9f 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -16,7 +16,7 @@ import "misc.idl", "lsa.idl", "security.idl";
pointer_default_top(unique)
] interface samr
{
- declare bitmap security_secinfo;
+ typedef bitmap security_secinfo security_secinfo;
/* account control (acct_flags) bits */
typedef [public,bitmap32bit] bitmap {
@@ -1240,7 +1240,7 @@ import "misc.idl", "lsa.idl", "security.idl";
/************************/
/* Function 0x3f */
- declare enum samr_RejectReason;
+ typedef enum samr_RejectReason samr_RejectReason;
typedef struct {
samr_RejectReason reason;
diff --git a/source/librpc/idl/spoolss.idl b/source/librpc/idl/spoolss.idl
index 9c26b14..7d40861 100644
--- a/source/librpc/idl/spoolss.idl
+++ b/source/librpc/idl/spoolss.idl
@@ -14,7 +14,7 @@ import "security.idl", "winreg.idl";
helper("librpc/ndr/ndr_spoolss_buf.h")
] interface spoolss
{
- declare [v1_enum] enum winreg_Type;
+ typedef [v1_enum] enum winreg_Type winreg_Type;
typedef struct {
uint16 year;
uint16 month;
diff --git a/source/librpc/idl/srvsvc.idl b/source/librpc/idl/srvsvc.idl
index 8fb5390..c3f0bd5 100644
--- a/source/librpc/idl/srvsvc.idl
+++ b/source/librpc/idl/srvsvc.idl
@@ -13,8 +13,8 @@ import "security.idl", "svcctl.idl";
helpstring("Server Service")
] interface srvsvc
{
- declare bitmap svcctl_ServerType;
- declare bitmap security_secinfo;
+ typedef bitmap svcctl_ServerType svcctl_ServerType;
+ typedef bitmap security_secinfo security_secinfo;
/**************************/
/* srvsvc_NetCharDev */
diff --git a/source/librpc/idl/winbind.idl b/source/librpc/idl/winbind.idl
index 222ac0d..29649c0 100644
--- a/source/librpc/idl/winbind.idl
+++ b/source/librpc/idl/winbind.idl
@@ -13,8 +13,8 @@ import "netlogon.idl";
]
interface winbind
{
- declare [switch_type(uint16)] union netr_LogonLevel;
- declare [switch_type(uint16)] union netr_Validation;
+ typedef [switch_type(uint16)] union netr_LogonLevel netr_LogonLevel;
+ typedef [switch_type(uint16)] union netr_Validation netr_Validation;
/* a call to get runtime informations */
void winbind_information(/* TODO */);
diff --git a/source/librpc/idl/winreg.idl b/source/librpc/idl/winreg.idl
index 5d0085c..fc734b7 100644
--- a/source/librpc/idl/winreg.idl
+++ b/source/librpc/idl/winreg.idl
@@ -13,7 +13,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
helpstring("Remote Registry Service")
] interface winreg
{
- declare bitmap security_secinfo;
+ typedef bitmap security_secinfo security_secinfo;
typedef [bitmap32bit] bitmap {
KEY_QUERY_VALUE = 0x00001,
diff --git a/source/librpc/idl/wkssvc.idl b/source/librpc/idl/wkssvc.idl
index dfb18e7..9829379 100644
--- a/source/librpc/idl/wkssvc.idl
+++ b/source/librpc/idl/wkssvc.idl
@@ -14,7 +14,7 @@ import "srvsvc.idl", "lsa.idl";
endpoint("ncacn_np:[\\pipe\\wkssvc]","ncacn_ip_tcp:","ncalrpc:")
] interface wkssvc
{
- declare [v1_enum] enum srvsvc_PlatformId;
+ typedef [v1_enum] enum srvsvc_PlatformId srvsvc_PlatformId;
#define BOOL uint32
diff --git a/source/pidl/MANIFEST b/source/pidl/MANIFEST
index 7f30c3a..051c5d2 100644
--- a/source/pidl/MANIFEST
+++ b/source/pidl/MANIFEST
@@ -40,4 +40,4 @@ idl.yp
TODO
README
pidl
-META.yml Module meta-data (added by MakeMaker)
+META.yml
diff --git a/source/pidl/META.yml b/source/pidl/META.yml
new file mode 100644
index 0000000..4822b50
--- /dev/null
+++ b/source/pidl/META.yml
@@ -0,0 +1,18 @@
+name: Parse-Pidl
+abstract: Generate parsers / DCE/RPC-clients from IDL
+author:
+ - Andrew Tridgell <tridge at samba.org>
+ - Jelmer Vernooij <jelmer at samba.org>
+ - Stefan Metzmacher <metze at samba.org>
+ - Tim Potter <tpot at samba.org>
+license: gplv3
+installdirs: site
+homepage: http://www.samba.org/
+bugtracker: http://bugzilla.samba.org/
+requires:
+ Parse::Yapp: 0
+recommends:
+ Data::Dumper: 0
+meta-spec:
+ version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
diff --git a/source/pidl/README b/source/pidl/README
index 5bf7752..d678387 100644
--- a/source/pidl/README
+++ b/source/pidl/README
@@ -40,6 +40,7 @@ Parse::Pidl::Samba4::NDR::Server - Generates server side implementation in C
Parse::Pidl::Samba4::TDR - Parser generator for the "Trivial Data Representation"
Parse::Pidl::Samba4::Template - Generates stubs in C for server implementation
Parse::Pidl::Samba4::EJS - Generates bindings for Embedded JavaScript (EJS)
+Parse::Pidl::Samba4::Python - Generates bindings for Python
-- Samba COM / DCOM --
Parse::Pidl::Samba4::COM::Proxy - Generates proxy object for DCOM (client-side)
diff --git a/source/pidl/TODO b/source/pidl/TODO
index 487d51d..f1cca0a 100644
--- a/source/pidl/TODO
+++ b/source/pidl/TODO
@@ -6,7 +6,6 @@
- compatibility mode for generating MIDL-readable data:
- strip out pidl-specific properties
-- remove declare in favor of typedef
- make bitmap an optional attribute on enum
- support nested elements
- support typedefs properly (e.g. allow "typedef void **bla;")
diff --git a/source/pidl/idl.yp b/source/pidl/idl.yp
index c372569..d2543c5 100644
--- 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 ';'
@@ -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;
diff --git a/source/pidl/lib/Parse/Pidl/Compat.pm b/source/pidl/lib/Parse/Pidl/Compat.pm
index f1241ef..7939bb2 100644
--- a/source/pidl/lib/Parse/Pidl/Compat.pm
+++ b/source/pidl/lib/Parse/Pidl/Compat.pm
@@ -152,13 +152,6 @@ sub CheckInterface($)
$if->{PROPERTIES}->{pointer_default_top} ne "ref") {
warning($if, "pointer_default_top() is pidl-specific");
}
-
- foreach my $x (@{$if->{DATA}}) {
- if ($x->{TYPE} eq "DECLARE") {
- warning($if, "the declare keyword is pidl-specific");
- next;
- }
- }
}
sub Check($)
diff --git a/source/pidl/lib/Parse/Pidl/IDL.pm b/source/pidl/lib/Parse/Pidl/IDL.pm
index e9155e4..35e1d7b 100644
--- a/source/pidl/lib/Parse/Pidl/IDL.pm
+++ b/source/pidl/lib/Parse/Pidl/IDL.pm
@@ -38,7 +38,7 @@ sub new {
"import" => 7,
"include" => 13
},
- DEFAULT => -91,
+ DEFAULT => -83,
GOTOS => {
'cpp_quote' => 11,
'importlib' => 10,
@@ -124,7 +124,7 @@ sub new {
}
},
{#State 16
- DEFAULT => -124
+ DEFAULT => -116
},
{#State 17
DEFAULT => -11
@@ -184,7 +184,7 @@ sub new {
}
},
{#State 26
- DEFAULT => -120
+ DEFAULT => -112
},
{#State 27
ACTIONS => {
@@ -206,10 +206,10 @@ sub new {
ACTIONS => {
"(" => 40
},
- DEFAULT => -95
+ DEFAULT => -87
},
{#State 31
- DEFAULT => -93
+ DEFAULT => -85
},
{#State 32
DEFAULT => -8
@@ -231,10 +231,9 @@ sub new {
},
{#State 37
ACTIONS => {
- "declare" => 49,
- "const" => 53
+ "const" => 51
},
- DEFAULT => -91,
+ DEFAULT => -83,
GOTOS => {
'typedecl' => 42,
'function' => 43,
@@ -243,12 +242,11 @@ sub new {
'definition' => 48,
'property_list' => 47,
'usertype' => 46,
- 'const' => 52,
- 'declare' => 51,
- 'struct' => 50,
- 'typedef' => 55,
- 'enum' => 54,
- 'union' => 56
+ 'const' => 50,
+ 'struct' => 49,
+ 'typedef' => 53,
+ 'enum' => 52,
+ 'union' => 54
}
},
{#State 38
@@ -257,1539 +255,1482 @@ sub new {
},
GOTOS => {
'identifier' => 30,
- 'property' => 57
+ 'property' => 55
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list