* reduced the number of grammer conflicts a lot using (arbitrary)

   precedence rules

 * build a standalone parser. When we come to distributing Samba4 we
   can just include idl.pm and other developers won't need Parse::Yapp
   installed

 * avoid the recursive make in most cases in build_idl.sh
(This used to be commit be2c2be459d1bed41c113590e70711cb89ad12b9)

2 files changed, 10 insertions, 7 deletions

diff --git a/source4/build/pidl/Makefile b/source4/build/pidl/Makefile
index 76229ac925..e2cc7be3eb 100644
--- a/source4/build/pidl/Makefile
+++ b/source4/build/pidl/Makefile
@@ -1,5 +1,5 @@
 idl.pm: idl.yp
-	yapp idl.yp
+	yapp -s idl.yp
 
 clean:
 	rm -f idl.pm
diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp
index 13f9b05df4..b38104fa02 100644
--- a/source4/build/pidl/idl.yp
+++ b/source4/build/pidl/idl.yp
@@ -5,6 +5,12 @@
 
 
 
+# the precedence actually doesn't matter at all for this grammer, but
+# by providing a precedence we reduce the number of conflicts
+# enormously
+%left   '-' '+' '&' '|' '*' '>' '.' '/' '(' ')' '[' ',' ';'
+
+
 ################
 # grammer
 %%
@@ -166,28 +172,25 @@ pointers:
 
 element_list1: 
     #empty
-    | base_element ';'               { [ $_[1] ] }
     | element_list1 base_element ';' { push(@{$_[1]}, $_[2]); $_[1] }
 ;
 
 element_list2: 
     #empty
-    | 'void'
-    | base_element                   { [ $_[1] ] }
+    | 'void' 
+    | base_element { [ $_[1] ] }
     | element_list2 ',' base_element { push(@{$_[1]}, $_[3]); $_[1] }
 ;
 
 array_len: 
     #empty 
     | '[' ']'            { "*" }
-    | '[' '*' ']'        { "*" }
     | '[' anytext ']'    { "$_[2]" }
 ;
 
 
 property_list: 
-    #empty 
-    | '[' properties ']' { $_[2] }
+    #empty
     | property_list '[' properties ']' { util::FlattenArray([$_[1],$_[3]]); }
 ;