jinterface: Remove old encoding of pid,port,refs

This reverts revert-commit 440ef99ddcd3cddb5f8f7bd23ec282c8efe32bd3.

4 files changed, 13 insertions, 56 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
index 9cbd735751..3abdf9535f 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
@@ -27,7 +27,6 @@ public class OtpErlangPid extends OtpErlangObject implements Comparable<Object>
     // don't change this!
     private static final long serialVersionUID = 1664394142301803659L;
 
-    private final int tag;
     private final String node;
     private final int id;
     private final int serial;
@@ -45,7 +44,6 @@ public class OtpErlangPid extends OtpErlangObject implements Comparable<Object>
     public OtpErlangPid(final OtpLocalNode self) {
         final OtpErlangPid p = self.createPid();
 
-	tag = p.tag;
         id = p.id;
         serial = p.serial;
         creation = p.creation;
@@ -67,7 +65,6 @@ public class OtpErlangPid extends OtpErlangObject implements Comparable<Object>
             throws OtpErlangDecodeException {
         final OtpErlangPid p = buf.read_pid();
 
-	tag = p.tag;
         node = p.node();
         id = p.id();
         serial = p.serial();
@@ -118,7 +115,6 @@ public class OtpErlangPid extends OtpErlangObject implements Comparable<Object>
      */
     protected OtpErlangPid(final int tag, final String node, final int id,
 			   final int serial, final int creation) {
-	this.tag = tag;
 	this.node = node;
 	if (tag == OtpExternal.pidTag) {
 	    this.id = id & 0x7fff; // 15 bits
@@ -133,7 +129,7 @@ public class OtpErlangPid extends OtpErlangObject implements Comparable<Object>
     }
 
     protected int tag() {
-	return tag;
+	return OtpExternal.newPidTag;
     }
 
     /**
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPort.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPort.java
index 79b5d2736c..c8648d7aa3 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPort.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangPort.java
@@ -26,7 +26,6 @@ public class OtpErlangPort extends OtpErlangObject {
     // don't change this!
     private static final long serialVersionUID = 4037115468007644704L;
 
-    private final int tag;
     private final String node;
     private final int id;
     private final int creation;
@@ -43,7 +42,6 @@ public class OtpErlangPort extends OtpErlangObject {
     private OtpErlangPort(final OtpSelf self) {
         final OtpErlangPort p = self.createPort();
 
-	tag = p.tag;
         id = p.id;
         creation = p.creation;
         node = p.node;
@@ -64,7 +62,6 @@ public class OtpErlangPort extends OtpErlangObject {
             throws OtpErlangDecodeException {
         final OtpErlangPort p = buf.read_port();
 
-	tag = p.tag;
         node = p.node();
         id = p.id();
         creation = p.creation();
@@ -105,7 +102,6 @@ public class OtpErlangPort extends OtpErlangObject {
      */
     public OtpErlangPort(final int tag, final String node, final int id,
 			 final int creation) {
-	this.tag = tag;
 	this.node = node;
 	if (tag == OtpExternal.portTag) {
 	    this.id = id & 0xfffffff; // 28 bits
@@ -118,7 +114,7 @@ public class OtpErlangPort extends OtpErlangObject {
     }
 
     protected int tag() {
-        return tag;
+        return OtpExternal.newPortTag;
     }
 
     /**
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangRef.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangRef.java
index 2165397013..2bf8d9a56b 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangRef.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangRef.java
@@ -28,7 +28,6 @@ public class OtpErlangRef extends OtpErlangObject {
     // don't change this!
     private static final long serialVersionUID = -7022666480768586521L;
 
-    private final int tag;
     private final String node;
     private final int creation;
 
@@ -49,7 +48,6 @@ public class OtpErlangRef extends OtpErlangObject {
     public OtpErlangRef(final OtpLocalNode self) {
         final OtpErlangRef r = self.createRef();
 
-	tag = r.tag;
         ids = r.ids;
         creation = r.creation;
         node = r.node;
@@ -70,7 +68,6 @@ public class OtpErlangRef extends OtpErlangObject {
             throws OtpErlangDecodeException {
         final OtpErlangRef r = buf.read_ref();
 
-	tag = r.tag;
         node = r.node();
         creation = r.creation();
 
@@ -90,7 +87,6 @@ public class OtpErlangRef extends OtpErlangObject {
      *            another arbitrary number.
      */
     public OtpErlangRef(final String node, final int id, final int creation) {
-	this.tag = OtpExternal.newRefTag;
         this.node = node;
         ids = new int[1];
         ids[0] = id & 0x3ffff; // 18 bits
@@ -138,7 +134,6 @@ public class OtpErlangRef extends OtpErlangObject {
      */
     public OtpErlangRef(final int tag, final String node, final int[] ids,
 			final int creation) {
-	this.tag = tag;
         this.node = node;
 
         // use at most 3 words
@@ -162,7 +157,7 @@ public class OtpErlangRef extends OtpErlangObject {
     }
 
     protected int tag() {
-        return tag;
+        return OtpExternal.newerRefTag;
     }
 
     /**
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index 187705a0b5..a3b089c1da 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -713,7 +713,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      */
     public void write_pid(final String node, final int id, final int serial,
             final int creation) {
-	write1(OtpExternal.pidTag);
+	write1(OtpExternal.newPidTag);
 	write_atom(node);
 	write4BE(id & 0x7fff); // 15 bits
 	write4BE(serial & 0x1fff); // 13 bits
@@ -727,20 +727,11 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      *            the pid
      */
     public void write_pid(OtpErlangPid pid) {
-	write1(pid.tag());
+	write1(OtpExternal.newPidTag);
 	write_atom(pid.node());
 	write4BE(pid.id());
 	write4BE(pid.serial());
-	switch (pid.tag()) {
-	case OtpExternal.pidTag:
-	    write1(pid.creation());
-	    break;
-	case OtpExternal.newPidTag:
-	    write4BE(pid.creation());
-	    break;
-	default:
-	    throw new AssertionError("Invalid pid tag " + pid.tag());
-	}
+        write4BE(pid.creation());
     }
 
 
@@ -758,7 +749,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      *            be used.
      */
     public void write_port(final String node, final int id, final int creation) {
-	write1(OtpExternal.portTag);
+	write1(OtpExternal.newPortTag);
 	write_atom(node);
 	write4BE(id & 0xfffffff); // 28 bits
 	write1(creation & 0x3); // 2 bits
@@ -771,19 +762,10 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      *            the port.
      */
     public void write_port(OtpErlangPort port) {
-	write1(port.tag());
+	write1(OtpExternal.newPortTag);
 	write_atom(port.node());
 	write4BE(port.id());
-	switch (port.tag()) {
-	case OtpExternal.portTag:	    
-	    write1(port.creation());
-	    break;
-	case OtpExternal.newPortTag:
-	    write4BE(port.creation());
-	    break;
-	default:
-	    throw new AssertionError("Invalid port tag " + port.tag());
-	}
+        write4BE(port.creation());
     }
 
     /**
@@ -829,7 +811,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
             arity = 3; // max 3 words in ref
         }
 
-	write1(OtpExternal.newRefTag);
+	write1(OtpExternal.newerRefTag);
 
 	// how many id values
 	write2BE(arity);
@@ -857,24 +839,12 @@ public class OtpOutputStream extends ByteArrayOutputStream {
 	int[] ids = ref.ids();
         int arity = ids.length;
 
-	write1(ref.tag());
+	write1(OtpExternal.newerRefTag);
 	write2BE(arity);
 	write_atom(ref.node());
+        write4BE(ref.creation());
 
-	switch (ref.tag()) {
-	case OtpExternal.newRefTag:
-	    write1(ref.creation());
-	    write4BE(ids[0] & 0x3ffff); // first word gets truncated to 18 bits
-	    break;
-	case OtpExternal.newerRefTag:
-	    write4BE(ref.creation());
-	    write4BE(ids[0]); // full first word
-	    break;
-	default:
-	    throw new AssertionError("Invalid ref tag " + ref.tag());
-	}
-
-	for (int i = 1; i < arity; i++) {
+	for (int i = 0; i < arity; i++) {
 	    write4BE(ids[i]);
 	}
     }