Changeset 862 for trunk/server/pidl

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• pidl/idl.yp (modified) (1 diff)
• pidl/lib/Parse/Pidl/IDL.pm (modified) (1 diff)
• pidl/lib/Parse/Pidl/NDR.pm (modified) (1 diff)
• pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm (modified) (2 diffs)

trunk/server/pidl/idl.yp

@@ -611 +611 @@
         for ($parser->YYData->{INPUT}) {
                 if (/^\#/) {
-                        if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
+                        # Linemarker format is described at
+                        # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+                        if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
                                 $parser->YYData->{LINE} = $1-1;
                                 $parser->YYData->{FILE} = $2;

trunk/server/pidl/lib/Parse/Pidl/IDL.pm

@@ -2577 +2577 @@
         for ($parser->YYData->{INPUT}) {
                 if (/^\#/) {
-                        if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
+                        # Linemarker format is described at
+                        # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+                        if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
                                 $parser->YYData->{LINE} = $1-1;
                                 $parser->YYData->{FILE} = $2;

trunk/server/pidl/lib/Parse/Pidl/NDR.pm

@@ -1071 +1071 @@
         "nopython"              => ["FUNCTION", "TYPEDEF", "STRUCT", "UNION", "ENUM", "BITMAP"],
         "todo"                  => ["FUNCTION"],
+        "skip"                  => ["ELEMENT"],
 
         # union

trunk/server/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm

@@ -925 +925 @@
                 $var_name = get_pointer_to($var_name);
 
-                $self->pidl("NDR_CHECK(".TypeFunctionName("ndr_pull", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
+                if (has_property($e, "skip")) {
+                        $self->pidl("/* [skip] '$var_name' */");
+                } else {
+                        $self->pidl("NDR_CHECK(".TypeFunctionName("ndr_pull", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
+                }
 
                 my $pl = GetPrevLevel($e, $l);
@@ -963 +967 @@
                 }
 
-                $self->pidl("NDR_CHECK(".TypeFunctionName("ndr_push", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
+                if (has_property($e, "skip")) {
+                        $self->pidl("/* [skip] '$var_name' */");
+                } else {
+                        $self->pidl("NDR_CHECK(".TypeFunctionName("ndr_push", $l->{DATA_TYPE})."($ndr, $ndr_flags, $var_name));");
+                }
         } else {
                 $self->ParseTypePush($l->{DATA_TYPE}, $ndr, $var_name, $primitives, $deferred);