Add Erlang/OTP 23 support for NEW_PID_EXT, NEW_PORT_EXT, NEWER_REFERENCE_EXT (erlang/otp@3c17104)

Author: okeuday

erlang.py

@@ -79,6 +79,9 @@ def b_ord(character):
 _TAG_NEW_FLOAT_EXT = 70
 _TAG_BIT_BINARY_EXT = 77
 _TAG_ATOM_CACHE_REF = 78
+_TAG_NEW_PID_EXT = 88
+_TAG_NEW_PORT_EXT = 89
+_TAG_NEWER_REFERENCE_EXT = 90
 _TAG_SMALL_INTEGER_EXT = 97
 _TAG_INTEGER_EXT = 98
 _TAG_FLOAT_EXT = 99
@@ -274,10 +277,19 @@ def binary(self):
         """
         return encoded representation
         """
-        return (
-            b_chr(_TAG_PID_EXT) +
-            self.node.binary() + self.id + self.serial + self.creation
-        )
+        creation_size = len(self.creation)
+        if creation_size == 1:
+            return (
+                b_chr(_TAG_PID_EXT) +
+                self.node.binary() + self.id + self.serial + self.creation
+            )
+        elif creation_size == 4:
+            return (
+                b_chr(_TAG_NEW_PID_EXT) +
+                self.node.binary() + self.id + self.serial + self.creation
+            )
+        else:
+            raise OutputException('unknown pid type')
     def __repr__(self):
         return '%s(%s,%s,%s,%s)' % (
             self.__class__.__name__,
@@ -303,10 +315,19 @@ def binary(self):
         """
         return encoded representation
         """
-        return (
-            b_chr(_TAG_PORT_EXT) +
-            self.node.binary() + self.id + self.creation
-        )
+        creation_size = len(self.creation)
+        if creation_size == 1:
+            return (
+                b_chr(_TAG_PORT_EXT) +
+                self.node.binary() + self.id + self.creation
+            )
+        elif creation_size == 4:
+            return (
+                b_chr(_TAG_NEW_PORT_EXT) +
+                self.node.binary() + self.id + self.creation
+            )
+        else:
+            raise OutputException('unknown port type')
     def __repr__(self):
         return '%s(%s,%s,%s)' % (
             self.__class__.__name__,
@@ -338,11 +359,21 @@ def binary(self):
                 self.node.binary() + self.id + self.creation
             )
         elif length <= 65535:
-            return (
-                b_chr(_TAG_NEW_REFERENCE_EXT) +
-                struct.pack(b'>H', length) +
-                self.node.binary() + self.creation + self.id
-            )
+            creation_size = len(self.creation)
+            if creation_size == 1:
+                return (
+                    b_chr(_TAG_NEW_REFERENCE_EXT) +
+                    struct.pack(b'>H', length) +
+                    self.node.binary() + self.creation + self.id
+                )
+            elif creation_size == 4:
+                return (
+                    b_chr(_TAG_NEWER_REFERENCE_EXT) +
+                    struct.pack(b'>H', length) +
+                    self.node.binary() + self.creation + self.id
+                )
+            else:
+                raise OutputException('unknown reference type')
         else:
             raise OutputException('uint16 overflow')
     def __repr__(self):
@@ -478,24 +509,33 @@ def _binary_to_term(i, data):
         j = struct.unpack(b'>H', data[i:i + 2])[0]
         i += 2
         return (i + j, OtpErlangAtom(data[i:i + j]))
-    elif tag == _TAG_REFERENCE_EXT or tag == _TAG_PORT_EXT:
+    elif (tag == _TAG_NEW_PORT_EXT or
+          tag == _TAG_REFERENCE_EXT or tag == _TAG_PORT_EXT):
         i, node = _binary_to_atom(i, data)
         id_value = data[i:i + 4]
         i += 4
-        creation = data[i:i + 1]
-        i += 1
-        if tag == _TAG_REFERENCE_EXT:
-            return (i, OtpErlangReference(node, id_value, creation))
-        # tag == _TAG_PORT_EXT
+        if tag == _TAG_NEW_PORT_EXT:
+            creation = data[i:i + 4]
+            i += 4
+        else:
+            creation = data[i:i + 1]
+            i += 1
+            if tag == _TAG_REFERENCE_EXT:
+                return (i, OtpErlangReference(node, id_value, creation))
+        # tag == _TAG_NEW_PORT_EXT or tag == _TAG_PORT_EXT
         return (i, OtpErlangPort(node, id_value, creation))
-    elif tag == _TAG_PID_EXT:
+    elif tag == _TAG_NEW_PID_EXT or tag == _TAG_PID_EXT:
         i, node = _binary_to_atom(i, data)
         id_value = data[i:i + 4]
         i += 4
         serial = data[i:i + 4]
         i += 4
-        creation = data[i:i + 1]
-        i += 1
+        if tag == _TAG_NEW_PID_EXT:
+            creation = data[i:i + 4]
+            i += 4
+        elif tag == _TAG_PID_EXT:
+            creation = data[i:i + 1]
+            i += 1
         return (i, OtpErlangPid(node, id_value, serial, creation))
     elif tag == _TAG_SMALL_TUPLE_EXT or tag == _TAG_LARGE_TUPLE_EXT:
         if tag == _TAG_SMALL_TUPLE_EXT:
@@ -554,12 +594,16 @@ def _binary_to_term(i, data):
         _ = b_ord(data[i])
         i += 1
         return (i, OtpErlangFunction(tag, data[old_i:i]))
-    elif tag == _TAG_NEW_REFERENCE_EXT:
+    elif tag == _TAG_NEWER_REFERENCE_EXT or tag == _TAG_NEW_REFERENCE_EXT:
         j = struct.unpack(b'>H', data[i:i + 2])[0] * 4
         i += 2
         i, node = _binary_to_atom(i, data)
-        creation = data[i:i + 1]
-        i += 1
+        if tag == _TAG_NEWER_REFERENCE_EXT:
+            creation = data[i:i + 4]
+            i += 4
+        elif tag == _TAG_NEW_REFERENCE_EXT:
+            creation = data[i:i + 1]
+            i += 1
         return (i + j, OtpErlangReference(node, data[i: i + j], creation))
     elif tag == _TAG_SMALL_ATOM_EXT:
         j = b_ord(data[i])
@@ -648,7 +692,16 @@ def _binary_to_integer(i, data):
 def _binary_to_pid(i, data):
     tag = b_ord(data[i])
     i += 1
-    if tag == _TAG_PID_EXT:
+    if tag == _TAG_NEW_PID_EXT:
+        i, node = _binary_to_atom(i, data)
+        id_value = data[i:i + 4]
+        i += 4
+        serial = data[i:i + 4]
+        i += 4
+        creation = data[i:i + 4]
+        i += 4
+        return (i, OtpErlangPid(node, id_value, serial, creation))
+    elif tag == _TAG_PID_EXT:
         i, node = _binary_to_atom(i, data)
         id_value = data[i:i + 4]
         i += 4

tests/erlang_tests.py

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2014-2018 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2014-2019 Michael Truog <mjtruog at protonmail dot com>
 # Copyright (c) 2009-2013 Dmitry Vasiliev <dima@hlabs.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -270,6 +270,64 @@ def test_binary_to_term_big_integer(self):
                          erlang.binary_to_term(b'\x83o\0\0\0\6\0\1\2\3\4\5\6'))
         self.assertEqual(-6618611909121,
                          erlang.binary_to_term(b'\x83o\0\0\0\6\1\1\2\3\4\5\6'))
+    def test_binary_to_term_pid(self):
+        pid_old_binary = (
+            b'\x83\x67\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F'
+            b'\x68\x6F\x73\x74\x00\x00\x00\x4E\x00\x00\x00\x00\x00'
+        )
+        pid_old = erlang.binary_to_term(pid_old_binary)
+        self.assertTrue(isinstance(pid_old, erlang.OtpErlangPid))
+        self.assertEqual(erlang.term_to_binary(pid_old),
+                         b'\x83gs\rnonode@nohost\x00\x00\x00N'
+                         b'\x00\x00\x00\x00\x00')
+        pid_new_binary = (
+            b'\x83\x58\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68'
+            b'\x6F\x73\x74\x00\x00\x00\x4E\x00\x00\x00\x00\x00\x00\x00\x00'
+        )
+        pid_new = erlang.binary_to_term(pid_new_binary)
+        self.assertTrue(isinstance(pid_new, erlang.OtpErlangPid))
+        self.assertEqual(erlang.term_to_binary(pid_new),
+                         b'\x83Xs\rnonode@nohost\x00\x00\x00N'
+                         b'\x00\x00\x00\x00\x00\x00\x00\x00')
+    def test_binary_to_term_port(self):
+        port_old_binary = (
+            b'\x83\x66\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68'
+            b'\x6F\x73\x74\x00\x00\x00\x06\x00'
+        )
+        port_old = erlang.binary_to_term(port_old_binary)
+        self.assertTrue(isinstance(port_old, erlang.OtpErlangPort))
+        self.assertEqual(erlang.term_to_binary(port_old),
+                         b'\x83fs\rnonode@nohost\x00\x00\x00\x06\x00')
+        port_new_binary = (
+            b'\x83\x59\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E\x6F\x68'
+            b'\x6F\x73\x74\x00\x00\x00\x06\x00\x00\x00\x00'
+        )
+        port_new = erlang.binary_to_term(port_new_binary)
+        self.assertTrue(isinstance(port_new, erlang.OtpErlangPort))
+        self.assertEqual(erlang.term_to_binary(port_new),
+                         b'\x83Ys\rnonode@nohost\x00\x00\x00\x06'
+                         b'\x00\x00\x00\x00')
+    def test_binary_to_term_ref(self):
+        ref_new_binary = (
+            b'\x83\x72\x00\x03\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E'
+            b'\x6F\x68\x6F\x73\x74\x00\x00\x03\xE8\x4E\xE7\x68\x00\x02\xA4'
+            b'\xC8\x53\x40'
+        )
+        ref_new = erlang.binary_to_term(ref_new_binary)
+        self.assertTrue(isinstance(ref_new, erlang.OtpErlangReference))
+        self.assertEqual(erlang.term_to_binary(ref_new),
+                         b'\x83r\x00\x03s\rnonode@nohost\x00\x00\x03\xe8'
+                         b'N\xe7h\x00\x02\xa4\xc8S@')
+        ref_newer_binary = (
+            b'\x83\x5A\x00\x03\x64\x00\x0D\x6E\x6F\x6E\x6F\x64\x65\x40\x6E'
+            b'\x6F\x68\x6F\x73\x74\x00\x00\x00\x00\x00\x01\xAC\x03\xC7\x00'
+            b'\x00\x04\xBB\xB2\xCA\xEE'
+        )
+        ref_newer = erlang.binary_to_term(ref_newer_binary)
+        self.assertTrue(isinstance(ref_newer, erlang.OtpErlangReference))
+        self.assertEqual(erlang.term_to_binary(ref_newer),
+                         b'\x83Z\x00\x03s\rnonode@nohost\x00\x00\x00\x00\x00'
+                         b'\x01\xac\x03\xc7\x00\x00\x04\xbb\xb2\xca\xee')
     def test_binary_to_term_compressed_term(self):
         self.assertRaises(erlang.ParseException,
                           erlang.binary_to_term, b'\x83P')