The branch, v4-0-test has been updated
via fdf9bcb163516f7d96675ae0dce2917afb8f86d3 (commit)
from 74bf021aa7016ace02a0238e71573f18016e3722 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit fdf9bcb163516f7d96675ae0dce2917afb8f86d3
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Thu Jan 31 15:30:50 2008 +0100
pidl/IDL: don't strip ',' from the properties content
metze
-----------------------------------------------------------------------
Summary of changes:
source/pidl/idl.yp | 7 +-
source/pidl/lib/Parse/Pidl/IDL.pm | 845 +++++++++++------------
source/pidl/lib/Parse/Pidl/NDR.pm | 2 +-
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 12 +-
4 files changed, 399 insertions(+), 467 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pidl/idl.yp b/source/pidl/idl.yp
index d2543c5..028b628 100644
--- a/source/pidl/idl.yp
+++ b/source/pidl/idl.yp
@@ -293,12 +293,7 @@ properties: property { $_[1] }
;
property: identifier {{ "$_[1]" => "1" }}
- | identifier '(' listtext ')' {{ "$_[1]" => "$_[3]" }}
-;
-
-listtext:
- anytext
- | listtext ',' anytext { "$_[1] $_[3]" }
+ | identifier '(' commalisttext ')' {{ "$_[1]" => "$_[3]" }}
;
commalisttext:
diff --git a/source/pidl/lib/Parse/Pidl/IDL.pm
b/source/pidl/lib/Parse/Pidl/IDL.pm
index 35e1d7b..aeee69e 100644
--- a/source/pidl/lib/Parse/Pidl/IDL.pm
+++ b/source/pidl/lib/Parse/Pidl/IDL.pm
@@ -124,7 +124,7 @@ sub new {
}
},
{#State 16
- DEFAULT => -116
+ DEFAULT => -114
},
{#State 17
DEFAULT => -11
@@ -184,7 +184,7 @@ sub new {
}
},
{#State 26
- DEFAULT => -112
+ DEFAULT => -110
},
{#State 27
ACTIONS => {
@@ -263,17 +263,17 @@ sub new {
},
{#State 40
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'text' => 61,
- 'listtext' => 57,
'anytext' => 56,
- 'constant' => 58
+ 'constant' => 57,
+ 'commalisttext' => 59
}
},
{#State 41
@@ -392,28 +392,28 @@ sub new {
DEFAULT => -89
},
{#State 57
- ACTIONS => {
- "," => 97,
- ")" => 98
- }
+ DEFAULT => -93
},
{#State 58
- DEFAULT => -95
+ DEFAULT => -113
},
{#State 59
- DEFAULT => -115
+ ACTIONS => {
+ "," => 97,
+ ")" => 98
+ }
},
{#State 60
- DEFAULT => -94
+ DEFAULT => -92
},
{#State 61
- DEFAULT => -96
+ DEFAULT => -94
},
{#State 62
ACTIONS => {
";" => 99
},
- DEFAULT => -117,
+ DEFAULT => -115,
GOTOS => {
'optional_semicolon' => 100
}
@@ -430,7 +430,7 @@ sub new {
ACTIONS => {
";" => 99
},
- DEFAULT => -117,
+ DEFAULT => -115,
GOTOS => {
'optional_semicolon' => 102
}
@@ -466,7 +466,7 @@ sub new {
ACTIONS => {
'IDENTIFIER' => 104
},
- DEFAULT => -114,
+ DEFAULT => -112,
GOTOS => {
'optional_identifier' => 105
}
@@ -501,7 +501,7 @@ sub new {
ACTIONS => {
'IDENTIFIER' => 104
},
- DEFAULT => -114,
+ DEFAULT => -112,
GOTOS => {
'optional_identifier' => 107
}
@@ -516,7 +516,7 @@ sub new {
ACTIONS => {
'IDENTIFIER' => 104
},
- DEFAULT => -114,
+ DEFAULT => -112,
GOTOS => {
'optional_identifier' => 108
}
@@ -525,7 +525,7 @@ sub new {
ACTIONS => {
'IDENTIFIER' => 104
},
- DEFAULT => -114,
+ DEFAULT => -112,
GOTOS => {
'optional_identifier' => 109
}
@@ -549,242 +549,242 @@ sub new {
},
{#State 82
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 112,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 83
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 113,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 84
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 114,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 85
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 115,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 86
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 116,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 87
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 117,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 88
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
'anytext' => 118,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 89
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 119,
+ 'anytext' => 56,
'text' => 61,
- 'constant' => 58,
- 'commalisttext' => 120
+ 'constant' => 57,
+ 'commalisttext' => 119
}
},
{#State 90
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 121,
+ 'anytext' => 120,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 91
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 122,
+ 'anytext' => 121,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 92
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 123,
+ 'anytext' => 122,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 93
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 119,
+ 'anytext' => 56,
'text' => 61,
- 'constant' => 58,
- 'commalisttext' => 124
+ 'constant' => 57,
+ 'commalisttext' => 123
}
},
{#State 94
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 125,
+ 'anytext' => 124,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 95
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 126,
+ 'anytext' => 125,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 96
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 127,
+ 'anytext' => 126,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 97
ACTIONS => {
- 'CONSTANT' => 59,
+ 'CONSTANT' => 58,
'TEXT' => 16,
'IDENTIFIER' => 26
},
- DEFAULT => -93,
+ DEFAULT => -91,
GOTOS => {
'identifier' => 60,
- 'anytext' => 128,
+ 'anytext' => 127,
'text' => 61,
- 'constant' => 58
+ 'constant' => 57
}
},
{#State 98
DEFAULT => -88
},
{#State 99
- DEFAULT => -118
+ DEFAULT => -116
},
{#State 100
DEFAULT => -13
},
{#State 101
ACTIONS => {
- ";" => 129
+ ";" => 128
}
},
{#State 102
@@ -795,20 +795,20 @@ sub new {
'IDENTIFIER' => 26
},
GOTOS => {
- 'identifier' => 130
+ 'identifier' => 129
}
},
{#State 104
- DEFAULT => -113
+ DEFAULT => -111
},
{#State 105
ACTIONS => {
- "{" => 132
+ "{" => 131
},
DEFAULT => -68,
GOTOS => {
- 'union_body' => 133,
- 'opt_union_body' => 131
+ 'union_body' => 132,
+ 'opt_union_body' => 130
}
},
{#State 106
@@ -816,46 +816,46 @@ sub new {
},
{#State 107
ACTIONS => {
- "{" => 135
+ "{" => 134
},
DEFAULT => -58,
GOTOS => {
- 'struct_body' => 134,
- 'opt_struct_body' => 136
+ 'struct_body' => 133,
+ 'opt_struct_body' => 135
}
},
{#State 108
ACTIONS => {
- "{" => 137
+ "{" => 136
},
DEFAULT => -41,
GOTOS => {
- 'opt_enum_body' => 139,
- 'enum_body' => 138
+ 'opt_enum_body' => 138,
--
Samba Shared Repository
