diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/pidl/idl.gram | 2 | ||||
| -rw-r--r-- | source4/build/pidl/parser.pm | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/build/pidl/idl.gram b/source4/build/pidl/idl.gram index 1e19ae6cf1..b79c771f98 100644 --- a/source4/build/pidl/idl.gram +++ b/source4/build/pidl/idl.gram @@ -166,7 +166,7 @@ type : text: /[\w\s\..?-]*/ -text2: /[\|\w\s\*\>\/\..?-]*/ +text2: /[\|\w\s,\*\>\/\..?-]*/ anytext: text2 '(' <commit> anytext ')' anytext {{ "$item[1]($item[4])$item[6]" }} diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm index df05d7fdba..41976cfdc9 100644 --- a/source4/build/pidl/parser.pm +++ b/source4/build/pidl/parser.pm @@ -74,7 +74,7 @@ sub find_size_var($$) return $size; } - if ($size =~ /ndr->/) { + if ($size =~ /ndr->|\(/) { return $size; } @@ -371,6 +371,10 @@ sub ParseElementPrintScalar($$) my($var_prefix) = shift; my $cprefix = util::c_push_prefix($e); + if (util::has_property($e, "noprint")) { + return; + } + if (defined $e->{VALUE}) { pidl "\tndr_print_$e->{TYPE}(ndr, \"$e->{NAME}\", $e->{VALUE});\n"; } elsif (util::has_direct_buffers($e)) { |