The branch, master has been updated
via fcee50b pidl: add support for pointers in typedefs
via d4636c4 pidl:NDR/Parser: remove unused code for array element index
via 7fff22c pidl:NDR/Parser: simplify logic in ParseMemCtxPullFlags()
via 3fa29cd pidl:NDR/Client: make the generated code look a bit nicer
via bffa192 librpc/ndr: remove 'async' from ndr_interface_call
via 96666d4 pidl: remove unused async property handling
via a73a2ab pidl/Python: use has_property($d, "noopnum") helper function
via 65c5278 pidl:NDR/Client.pm: remove unreached code
via 121ad07 pidl/Python: remove todo handling from PythonFunction(),
it's done by the caller
via a0fa1dd pidl/Typelist: let typeIs() do TYPEDEF dereference in the
HASH case
from 4677438 s3-waf: add in a little hack to deal with the ECHO rpc
module for non-developer builds.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fcee50b9c9ca157c839df5761ca0a2f87fc1ac33
Author: Stefan Metzmacher <[email protected]>
Date: Wed Aug 5 13:43:49 2009 +0200
pidl: add support for pointers in typedefs
metze
commit d4636c47c70d4ef5441a33cc6ef5eb469cf11bff
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 10:34:30 2010 +0200
pidl:NDR/Parser: remove unused code for array element index
metze
commit 7fff22c29dfb4bd424c08da53c384dcc2c37fe22
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 03:48:09 2010 +0200
pidl:NDR/Parser: simplify logic in ParseMemCtxPullFlags()
metze
commit 3fa29cdd943f18871b16fc845028fc39a5a7ad0d
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 03:41:03 2010 +0200
pidl:NDR/Client: make the generated code look a bit nicer
metze
commit bffa192bfea6dccfe56a1b5692333fd8f39cfe7a
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 00:44:30 2010 +0200
librpc/ndr: remove 'async' from ndr_interface_call
metze
commit 96666d48a75573c47739e4d217b2aacea7841570
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 00:41:29 2010 +0200
pidl: remove unused async property handling
metze
commit a73a2abb3a2ec79016ddcf5f0994025dd705975d
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 03:10:10 2010 +0200
pidl/Python: use has_property($d, "noopnum") helper function
metze
commit 65c5278f4d8e07275db02f146afb847d91cd6596
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 03:05:41 2010 +0200
pidl:NDR/Client.pm: remove unreached code
metze
commit 121ad074f96c7cec79a15acb5587d3fd601f3e09
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 02:17:21 2010 +0200
pidl/Python: remove todo handling from PythonFunction(), it's done by the
caller
metze
commit a0fa1dd6fccf21e567abb46574ef4e85b886a8ab
Author: Stefan Metzmacher <[email protected]>
Date: Tue Sep 21 01:40:56 2010 +0200
pidl/Typelist: let typeIs() do TYPEDEF dereference in the HASH case
metze
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/libndr.h | 1 -
pidl/idl.yp | 7 +-
pidl/lib/Parse/Pidl/IDL.pm | 475 +++++++++++++++---------------
pidl/lib/Parse/Pidl/NDR.pm | 38 ++-
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 5 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 19 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm | 23 +-
pidl/lib/Parse/Pidl/Typelist.pm | 1 +
pidl/tests/parse_idl.pl | 4 +
9 files changed, 284 insertions(+), 289 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 5ad05be..bd39cf4 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -333,7 +333,6 @@ struct ndr_interface_call {
ndr_push_flags_fn_t ndr_push;
ndr_pull_flags_fn_t ndr_pull;
ndr_print_function_t ndr_print;
- bool async;
};
struct ndr_interface_string_array {
diff --git a/pidl/idl.yp b/pidl/idl.yp
index dc8e293..b3d5ed1 100644
--- a/pidl/idl.yp
+++ b/pidl/idl.yp
@@ -169,13 +169,14 @@ function:
;
typedef:
- property_list 'typedef' type identifier array_len ';'
+ property_list 'typedef' type pointers identifier array_len ';'
{{
"TYPE" => "TYPEDEF",
"PROPERTIES" => $_[1],
- "NAME" => $_[4],
+ "NAME" => $_[5],
"DATA" => $_[3],
- "ARRAY_LEN" => $_[5],
+ "POINTERS" => $_[4],
+ "ARRAY_LEN" => $_[6],
"FILE" => $_[0]->YYData->{FILE},
"LINE" => $_[0]->YYData->{LINE},
}}
diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index 1a3c59d..bc66020 100644
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -1065,11 +1065,9 @@ sub new {
DEFAULT => -16
},
{#State 125
- ACTIONS => {
- 'IDENTIFIER' => 26
- },
+ DEFAULT => -75,
GOTOS => {
- 'identifier' => 137
+ 'pointers' => 137
}
},
{#State 126
@@ -1165,11 +1163,11 @@ sub new {
},
{#State 137
ACTIONS => {
- "[" => 155
+ 'IDENTIFIER' => 26,
+ "*" => 152
},
- DEFAULT => -86,
GOTOS => {
- 'array_len' => 156
+ 'identifier' => 155
}
},
{#State 138
@@ -1178,7 +1176,7 @@ sub new {
{#State 139
DEFAULT => -68,
GOTOS => {
- 'union_elements' => 157
+ 'union_elements' => 156
}
},
{#State 140
@@ -1190,7 +1188,7 @@ sub new {
{#State 142
DEFAULT => -78,
GOTOS => {
- 'element_list1' => 158
+ 'element_list1' => 157
}
},
{#State 143
@@ -1201,9 +1199,9 @@ sub new {
'IDENTIFIER' => 26
},
GOTOS => {
- 'identifier' => 159,
- 'enum_element' => 160,
- 'enum_elements' => 161
+ 'identifier' => 158,
+ 'enum_element' => 159,
+ 'enum_elements' => 160
}
},
{#State 145
@@ -1221,10 +1219,10 @@ sub new {
},
DEFAULT => -57,
GOTOS => {
- 'identifier' => 164,
- 'bitmap_element' => 163,
- 'bitmap_elements' => 162,
- 'opt_bitmap_elements' => 165
+ 'identifier' => 163,
+ 'bitmap_element' => 162,
+ 'bitmap_elements' => 161,
+ 'opt_bitmap_elements' => 164
}
},
{#State 149
@@ -1233,19 +1231,19 @@ sub new {
{#State 150
ACTIONS => {
"," => -82,
- "void" => 169,
- "const" => 167,
+ "void" => 168,
+ "const" => 166,
")" => -82
},
DEFAULT => -80,
GOTOS => {
- 'optional_const' => 166,
- 'element_list2' => 168
+ 'optional_const' => 165,
+ 'element_list2' => 167
}
},
{#State 151
ACTIONS => {
- "[" => 155,
+ "[" => 169,
"=" => 171
},
GOTOS => {
@@ -1288,97 +1286,101 @@ sub new {
},
{#State 155
ACTIONS => {
- 'CONSTANT' => 48,
- 'TEXT' => 16,
- "]" => 172,
- 'IDENTIFIER' => 26
+ "[" => 169
},
- DEFAULT => -97,
+ DEFAULT => -86,
GOTOS => {
- 'identifier' => 50,
- 'anytext' => 173,
- 'text' => 51,
- 'constant' => 47
+ 'array_len' => 172
}
},
{#State 156
ACTIONS => {
- ";" => 174
- }
- },
- {#State 157
- ACTIONS => {
- "}" => 175
+ "}" => 173
},
DEFAULT => -89,
GOTOS => {
- 'optional_base_element' => 177,
- 'property_list' => 176
+ 'optional_base_element' => 175,
+ 'property_list' => 174
}
},
- {#State 158
+ {#State 157
ACTIONS => {
- "}" => 178
+ "}" => 176
},
DEFAULT => -89,
GOTOS => {
- 'base_element' => 179,
- 'property_list' => 180
+ 'base_element' => 177,
+ 'property_list' => 178
}
},
- {#State 159
+ {#State 158
ACTIONS => {
- "=" => 181
+ "=" => 179
},
DEFAULT => -49
},
- {#State 160
+ {#State 159
DEFAULT => -47
},
- {#State 161
+ {#State 160
ACTIONS => {
- "}" => 182,
- "," => 183
+ "}" => 180,
+ "," => 181
}
},
- {#State 162
+ {#State 161
ACTIONS => {
- "," => 184
+ "," => 182
},
DEFAULT => -58
},
- {#State 163
+ {#State 162
DEFAULT => -55
},
- {#State 164
+ {#State 163
ACTIONS => {
- "=" => 185
+ "=" => 183
}
},
- {#State 165
+ {#State 164
ACTIONS => {
- "}" => 186
+ "}" => 184
}
},
- {#State 166
+ {#State 165
DEFAULT => -89,
GOTOS => {
- 'base_element' => 187,
- 'property_list' => 180
+ 'base_element' => 185,
+ 'property_list' => 178
}
},
- {#State 167
+ {#State 166
DEFAULT => -81
},
- {#State 168
+ {#State 167
ACTIONS => {
- "," => 188,
- ")" => 189
+ "," => 186,
+ ")" => 187
}
},
- {#State 169
+ {#State 168
DEFAULT => -83
},
+ {#State 169
+ ACTIONS => {
+ 'CONSTANT' => 48,
+ 'TEXT' => 16,
+ "]" => 188,
+ 'IDENTIFIER' => 26
+ },
+ DEFAULT => -97,
+ GOTOS => {
+ 'identifier' => 50,
+ 'anytext' => 189,
+ 'text' => 51,
+ 'constant' => 47
+ }
+ },
{#State 170
ACTIONS => {
"=" => 190
@@ -1400,63 +1402,36 @@ sub new {
},
{#State 172
ACTIONS => {
- "[" => 155
- },
- DEFAULT => -86,
- GOTOS => {
- 'array_len' => 192
+ ";" => 192
}
},
{#State 173
- ACTIONS => {
- "-" => 69,
- ":" => 68,
- "?" => 70,
- "<" => 71,
- "+" => 73,
- "~" => 72,
- "&" => 75,
- "{" => 74,
- "/" => 76,
- "=" => 77,
- "|" => 79,
- "(" => 78,
- "*" => 80,
- "." => 81,
- "]" => 193,
- ">" => 82
- }
- },
- {#State 174
- DEFAULT => -29
- },
- {#State 175
DEFAULT => -70
},
- {#State 176
+ {#State 174
ACTIONS => {
"[" => 20
},
DEFAULT => -89,
GOTOS => {
- 'base_or_empty' => 194,
- 'base_element' => 195,
- 'empty_element' => 196,
- 'property_list' => 197
+ 'base_or_empty' => 193,
+ 'base_element' => 194,
+ 'empty_element' => 195,
+ 'property_list' => 196
}
},
- {#State 177
+ {#State 175
DEFAULT => -69
},
- {#State 178
+ {#State 176
DEFAULT => -60
},
- {#State 179
+ {#State 177
ACTIONS => {
- ";" => 198
+ ";" => 197
}
},
- {#State 180
+ {#State 178
ACTIONS => {
'IDENTIFIER' => 26,
"signed" => 100,
@@ -1474,12 +1449,12 @@ sub new {
'identifier' => 96,
'struct' => 62,
'enum' => 65,
- 'type' => 199,
+ 'type' => 198,
'union' => 67,
'sign' => 97
}
},
- {#State 181
+ {#State 179
ACTIONS => {
'CONSTANT' => 48,
'TEXT' => 16,
@@ -1488,33 +1463,33 @@ sub new {
DEFAULT => -97,
GOTOS => {
'identifier' => 50,
- 'anytext' => 200,
+ 'anytext' => 199,
'text' => 51,
'constant' => 47
}
},
- {#State 182
+ {#State 180
DEFAULT => -43
},
- {#State 183
+ {#State 181
ACTIONS => {
'IDENTIFIER' => 26
},
GOTOS => {
- 'identifier' => 159,
- 'enum_element' => 201
+ 'identifier' => 158,
+ 'enum_element' => 200
}
},
- {#State 184
+ {#State 182
ACTIONS => {
'IDENTIFIER' => 26
},
GOTOS => {
- 'identifier' => 164,
- 'bitmap_element' => 202
+ 'identifier' => 163,
+ 'bitmap_element' => 201
}
},
- {#State 185
+ {#State 183
ACTIONS => {
'CONSTANT' => 48,
'TEXT' => 16,
@@ -1523,29 +1498,58 @@ sub new {
DEFAULT => -97,
GOTOS => {
'identifier' => 50,
- 'anytext' => 203,
+ 'anytext' => 202,
'text' => 51,
'constant' => 47
}
},
- {#State 186
+ {#State 184
DEFAULT => -51
},
- {#State 187
+ {#State 185
DEFAULT => -84
},
- {#State 188
+ {#State 186
ACTIONS => {
- "const" => 167
+ "const" => 166
},
DEFAULT => -80,
GOTOS => {
- 'optional_const' => 204
+ 'optional_const' => 203
+ }
+ },
+ {#State 187
+ ACTIONS => {
+ ";" => 204
+ }
+ },
+ {#State 188
+ ACTIONS => {
+ "[" => 169
+ },
+ DEFAULT => -86,
+ GOTOS => {
+ 'array_len' => 205
}
},
{#State 189
ACTIONS => {
- ";" => 205
+ "-" => 69,
+ ":" => 68,
+ "?" => 70,
+ "<" => 71,
+ "+" => 73,
+ "~" => 72,
+ "&" => 75,
+ "{" => 74,
+ "/" => 76,
+ "=" => 77,
+ "|" => 79,
+ "(" => 78,
+ "*" => 80,
+ "." => 81,
+ "]" => 206,
+ ">" => 82
}
},
{#State 190
@@ -1557,7 +1561,7 @@ sub new {
DEFAULT => -97,
GOTOS => {
'identifier' => 50,
- 'anytext' => 206,
+ 'anytext' => 207,
'text' => 51,
'constant' => 47
}
@@ -1568,7 +1572,7 @@ sub new {
":" => 68,
"?" => 70,
"<" => 71,
- ";" => 207,
+ ";" => 208,
"+" => 73,
"~" => 72,
"&" => 75,
@@ -1583,29 +1587,20 @@ sub new {
--
Samba Shared Repository
