bind: update testdata to reflect changes from cl/17866
Change-Id: Icdc68c536b8bc9c5e3874731e33b5f90e123a052
Reviewed-on: https://go-review.googlesource.com/18618
Reviewed-by: David Crawshaw <crawshaw@golang.org>
diff --git a/bind/testdata/basictypes.java.golden b/bind/testdata/basictypes.java.golden
index d0ad787..054735f 100644
--- a/bind/testdata/basictypes.java.golden
+++ b/bind/testdata/basictypes.java.golden
@@ -16,9 +16,11 @@
public static final long AnInt = 7L;
public static final long AnInt2 = 9223372036854775807L;
public static boolean Bool(boolean p0) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
boolean _result;
+ _in = new go.Seq();
_in.writeBool(p0);
Seq.send(DESCRIPTOR, CALL_Bool, _in, _out);
_result = _out.readBool();
@@ -26,9 +28,11 @@
}
public static byte[] ByteArrays(byte[] x) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
byte[] _result;
+ _in = new go.Seq();
_in.writeByteArray(x);
Seq.send(DESCRIPTOR, CALL_ByteArrays, _in, _out);
_result = _out.readByteArray();
@@ -36,8 +40,9 @@
}
public static void Error() throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
Seq.send(DESCRIPTOR, CALL_Error, _in, _out);
String _err = _out.readString();
if (_err != null && !_err.isEmpty()) {
@@ -46,8 +51,9 @@
}
public static long ErrorPair() throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
long _result;
Seq.send(DESCRIPTOR, CALL_ErrorPair, _in, _out);
_result = _out.readInt();
@@ -59,8 +65,9 @@
}
public static void Ints(byte x, short y, int z, long t, long u) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _in = new go.Seq();
_in.writeInt8(x);
_in.writeInt16(y);
_in.writeInt32(z);
diff --git a/bind/testdata/customprefix.java.golden b/bind/testdata/customprefix.java.golden
index d68b8d5..0c3e033 100644
--- a/bind/testdata/customprefix.java.golden
+++ b/bind/testdata/customprefix.java.golden
@@ -10,8 +10,8 @@
private Customprefix() {} // uninstantiable
public static void F() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
Seq.send(DESCRIPTOR, CALL_F, _in, _out);
}
diff --git a/bind/testdata/interfaces.java.golden b/bind/testdata/interfaces.java.golden
index 25b0a36..da2e9a2 100644
--- a/bind/testdata/interfaces.java.golden
+++ b/bind/testdata/interfaces.java.golden
@@ -10,9 +10,11 @@
private Interfaces() {} // uninstantiable
public static int Add3(I r) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
int _result;
+ _in = new go.Seq();
_in.writeRef(r.ref());
Seq.send(DESCRIPTOR, CALL_Add3, _in, _out);
_result = _out.readInt32();
@@ -20,8 +22,10 @@
}
public static void CallErr(Error e) throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
+ _in = new go.Seq();
_in.writeRef(e.ref());
Seq.send(DESCRIPTOR, CALL_CallErr, _in, _out);
String _err = _out.readString();
@@ -74,8 +78,10 @@
}
public void Err() throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_Err, _in, _out);
String _err = _out.readString();
@@ -128,9 +134,11 @@
}
public int Rand() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
int _result;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_Rand, _in, _out);
_result = _out.readInt32();
@@ -158,8 +166,9 @@
}
public void J() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_J, _in, _out);
}
@@ -185,8 +194,9 @@
}
public void G() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_G, _in, _out);
}
@@ -235,9 +245,11 @@
}
public I1 F() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
I1 _result;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_F, _in, _out);
_result = new I1.Proxy(_out.readRef());
@@ -249,8 +261,9 @@
}
public static I Seven() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
I _result;
Seq.send(DESCRIPTOR, CALL_Seven, _in, _out);
_result = new I.Proxy(_out.readRef());
@@ -298,8 +311,9 @@
}
public void HasParam(boolean p0) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _in = new go.Seq();
_in.writeRef(ref);
_in.writeBool(p0);
Seq.send(DESCRIPTOR, CALL_HasParam, _in, _out);
diff --git a/bind/testdata/issue10788.java.golden b/bind/testdata/issue10788.java.golden
index f448002..2cf30b0 100644
--- a/bind/testdata/issue10788.java.golden
+++ b/bind/testdata/issue10788.java.golden
@@ -62,16 +62,18 @@
}
public void DoSomeWork(TestStruct s) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _in = new go.Seq();
_in.writeRef(ref);
_in.writeRef(s.ref());
Seq.send(DESCRIPTOR, CALL_DoSomeWork, _in, _out);
}
public void MultipleUnnamedParams(long p0, String p1, long p2) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _in = new go.Seq();
_in.writeRef(ref);
_in.writeInt(p0);
_in.writeString(p1);
@@ -109,10 +111,9 @@
public void setValue(String v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeRef(ref);
in.writeString(v);
- Seq.send(DESCRIPTOR, FIELD_Value_SET, in, out);
+ Seq.send(DESCRIPTOR, FIELD_Value_SET, in, null);
}
@Override public boolean equals(Object o) {
diff --git a/bind/testdata/issue12328.java.golden b/bind/testdata/issue12328.java.golden
index 6b31c74..f27bf71 100644
--- a/bind/testdata/issue12328.java.golden
+++ b/bind/testdata/issue12328.java.golden
@@ -34,10 +34,9 @@
public void setErr(String v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeRef(ref);
in.writeString(v);
- Seq.send(DESCRIPTOR, FIELD_Err_SET, in, out);
+ Seq.send(DESCRIPTOR, FIELD_Err_SET, in, null);
}
@Override public boolean equals(Object o) {
diff --git a/bind/testdata/issue12403.java.golden b/bind/testdata/issue12403.java.golden
index a925bac..a6df7ef 100644
--- a/bind/testdata/issue12403.java.golden
+++ b/bind/testdata/issue12403.java.golden
@@ -65,9 +65,11 @@
}
public String FromJSON(String jstr) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
String _result;
+ _in = new go.Seq();
_in.writeRef(ref);
_in.writeString(jstr);
Seq.send(DESCRIPTOR, CALL_FromJSON, _in, _out);
@@ -76,9 +78,11 @@
}
public String ToJSON() throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
String _result;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_ToJSON, _in, _out);
_result = _out.readString();
diff --git a/bind/testdata/structs.java.golden b/bind/testdata/structs.java.golden
index 332c03e..a7af1e2 100644
--- a/bind/testdata/structs.java.golden
+++ b/bind/testdata/structs.java.golden
@@ -10,9 +10,11 @@
private Structs() {} // uninstantiable
public static S Identity(S s) {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
S _result;
+ _in = new go.Seq();
_in.writeRef(s.ref());
Seq.send(DESCRIPTOR, CALL_Identity, _in, _out);
_result = new S(_out.readRef());
@@ -20,9 +22,11 @@
}
public static S IdentityWithError(S s) throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
S _result;
+ _in = new go.Seq();
_in.writeRef(s.ref());
Seq.send(DESCRIPTOR, CALL_IdentityWithError, _in, _out);
_result = new S(_out.readRef());
@@ -62,10 +66,9 @@
public void setX(double v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeRef(ref);
in.writeFloat64(v);
- Seq.send(DESCRIPTOR, FIELD_X_SET, in, out);
+ Seq.send(DESCRIPTOR, FIELD_X_SET, in, null);
}
public double getY() {
@@ -78,16 +81,17 @@
public void setY(double v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeRef(ref);
in.writeFloat64(v);
- Seq.send(DESCRIPTOR, FIELD_Y_SET, in, out);
+ Seq.send(DESCRIPTOR, FIELD_Y_SET, in, null);
}
public S Identity() throws Exception {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
S _result;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_Identity, _in, _out);
_result = new S(_out.readRef());
@@ -99,9 +103,11 @@
}
public double Sum() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
double _result;
+ _in = new go.Seq();
_in.writeRef(ref);
Seq.send(DESCRIPTOR, CALL_Sum, _in, _out);
_result = _out.readFloat64();
diff --git a/bind/testdata/try.java.golden b/bind/testdata/try.java.golden
index 830d0c9..4f9c31d 100644
--- a/bind/testdata/try.java.golden
+++ b/bind/testdata/try.java.golden
@@ -10,8 +10,9 @@
private Try() {} // uninstantiable
public static String This() {
- go.Seq _in = new go.Seq();
- go.Seq _out = new go.Seq();
+ go.Seq _in = null;
+ go.Seq _out = null;
+ _out = new go.Seq();
String _result;
Seq.send(DESCRIPTOR, CALL_This, _in, _out);
_result = _out.readString();
diff --git a/bind/testdata/vars.java.golden b/bind/testdata/vars.java.golden
index bbd2c0b..cdc0ca4 100644
--- a/bind/testdata/vars.java.golden
+++ b/bind/testdata/vars.java.golden
@@ -11,180 +11,156 @@
public static void setABool(boolean v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeBool(v);
- Seq.send("vars.ABool", 1, in, out);
+ Seq.send("vars.ABool", 1, in, null);
}
public static boolean getABool() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.ABool", 2, in, out);
+ Seq.send("vars.ABool", 2, null, out);
boolean v = out.readBool();
return v;
}
public static void setAFloat(double v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeFloat64(v);
- Seq.send("vars.AFloat", 1, in, out);
+ Seq.send("vars.AFloat", 1, in, null);
}
public static double getAFloat() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AFloat", 2, in, out);
+ Seq.send("vars.AFloat", 2, null, out);
double v = out.readFloat64();
return v;
}
public static void setAFloat32(float v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeFloat32(v);
- Seq.send("vars.AFloat32", 1, in, out);
+ Seq.send("vars.AFloat32", 1, in, null);
}
public static float getAFloat32() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AFloat32", 2, in, out);
+ Seq.send("vars.AFloat32", 2, null, out);
float v = out.readFloat32();
return v;
}
public static void setAFloat64(double v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeFloat64(v);
- Seq.send("vars.AFloat64", 1, in, out);
+ Seq.send("vars.AFloat64", 1, in, null);
}
public static double getAFloat64() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AFloat64", 2, in, out);
+ Seq.send("vars.AFloat64", 2, null, out);
double v = out.readFloat64();
return v;
}
public static void setAString(String v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeString(v);
- Seq.send("vars.AString", 1, in, out);
+ Seq.send("vars.AString", 1, in, null);
}
public static String getAString() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AString", 2, in, out);
+ Seq.send("vars.AString", 2, null, out);
String v = out.readString();
return v;
}
public static void setAStructPtr(S v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeRef(v.ref());
- Seq.send("vars.AStructPtr", 1, in, out);
+ Seq.send("vars.AStructPtr", 1, in, null);
}
public static S getAStructPtr() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AStructPtr", 2, in, out);
+ Seq.send("vars.AStructPtr", 2, null, out);
S v = new S(out.readRef());
return v;
}
public static void setAnInt(long v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeInt(v);
- Seq.send("vars.AnInt", 1, in, out);
+ Seq.send("vars.AnInt", 1, in, null);
}
public static long getAnInt() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AnInt", 2, in, out);
+ Seq.send("vars.AnInt", 2, null, out);
long v = out.readInt();
return v;
}
public static void setAnInt16(short v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeInt16(v);
- Seq.send("vars.AnInt16", 1, in, out);
+ Seq.send("vars.AnInt16", 1, in, null);
}
public static short getAnInt16() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AnInt16", 2, in, out);
+ Seq.send("vars.AnInt16", 2, null, out);
short v = out.readInt16();
return v;
}
public static void setAnInt32(int v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeInt32(v);
- Seq.send("vars.AnInt32", 1, in, out);
+ Seq.send("vars.AnInt32", 1, in, null);
}
public static int getAnInt32() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AnInt32", 2, in, out);
+ Seq.send("vars.AnInt32", 2, null, out);
int v = out.readInt32();
return v;
}
public static void setAnInt64(long v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeInt64(v);
- Seq.send("vars.AnInt64", 1, in, out);
+ Seq.send("vars.AnInt64", 1, in, null);
}
public static long getAnInt64() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AnInt64", 2, in, out);
+ Seq.send("vars.AnInt64", 2, null, out);
long v = out.readInt64();
return v;
}
public static void setAnInt8(byte v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeInt8(v);
- Seq.send("vars.AnInt8", 1, in, out);
+ Seq.send("vars.AnInt8", 1, in, null);
}
public static byte getAnInt8() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AnInt8", 2, in, out);
+ Seq.send("vars.AnInt8", 2, null, out);
byte v = out.readInt8();
return v;
}
public static void setAnInterface(I v) {
Seq in = new Seq();
- Seq out = new Seq();
in.writeRef(v.ref());
- Seq.send("vars.AnInterface", 1, in, out);
+ Seq.send("vars.AnInterface", 1, in, null);
}
public static I getAnInterface() {
- Seq in = new Seq();
Seq out = new Seq();
- Seq.send("vars.AnInterface", 2, in, out);
+ Seq.send("vars.AnInterface", 2, null, out);
I v = new I.Proxy(out.readRef());
return v;
}
