azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protobuf: fixed proto tests in translator (updated to new versions of proto-messages)

Browse Source
This commit is contained in:
dsavvinov
2016-08-18 18:50:47 +03:00
parent acfbb8b40d
commit 502384f382
2 changed files with 136 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/test/kotlin/tests/kotlin/proto_repeated_varint.kt
+106 -35
View File
@@ -712,15 +712,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = IntArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = IntArray(1) var tmp = 0
tmp[0] = input.readInt32NoTag() tmp = input.readInt32NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getInt32SizeNoTag(tmp[0]) readSize += WireFormat.getInt32SizeNoTag(tmp)
}
} while (false)
var newArray = IntArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readInt32NoTag()
i += 1
} }
int = newArray int = newArray
} while (false) } while (false)
@@ -731,15 +741,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = LongArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = LongArray(1) var tmp = 0L
tmp[0] = input.readInt64NoTag() tmp = input.readInt64NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getInt64SizeNoTag(tmp[0]) readSize += WireFormat.getInt64SizeNoTag(tmp)
}
} while (false)
var newArray = LongArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readInt64NoTag()
i += 1
} }
long = newArray long = newArray
} while (false) } while (false)
@@ -750,15 +770,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = IntArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = IntArray(1) var tmp = 0
tmp[0] = input.readSInt32NoTag() tmp = input.readSInt32NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getSInt32SizeNoTag(tmp[0]) readSize += WireFormat.getSInt32SizeNoTag(tmp)
}
} while (false)
var newArray = IntArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readSInt32NoTag()
i += 1
} }
sint = newArray sint = newArray
} while (false) } while (false)
@@ -769,15 +799,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = LongArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = LongArray(1) var tmp = 0L
tmp[0] = input.readSInt64NoTag() tmp = input.readSInt64NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getSInt64SizeNoTag(tmp[0]) readSize += WireFormat.getSInt64SizeNoTag(tmp)
}
} while (false)
var newArray = LongArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readSInt64NoTag()
i += 1
} }
slong = newArray slong = newArray
} while (false) } while (false)
@@ -788,15 +828,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = BooleanArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = BooleanArray(1) var tmp = false
tmp[0] = input.readBoolNoTag() tmp = input.readBoolNoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getBoolSizeNoTag(tmp[0]) readSize += WireFormat.getBoolSizeNoTag(tmp)
}
} while (false)
var newArray = BooleanArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readBoolNoTag()
i += 1
} }
bl = newArray bl = newArray
} while (false) } while (false)
@@ -807,15 +857,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = IntArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = IntArray(1) var tmp = 0
tmp[0] = input.readUInt32NoTag() tmp = input.readUInt32NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getUInt32SizeNoTag(tmp[0]) readSize += WireFormat.getUInt32SizeNoTag(tmp)
}
} while (false)
var newArray = IntArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readUInt32NoTag()
i += 1
} }
uint = newArray uint = newArray
} while (false) } while (false)
@@ -826,15 +886,25 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = LongArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = LongArray(1) var tmp = 0L
tmp[0] = input.readUInt64NoTag() tmp = input.readUInt64NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getUInt64SizeNoTag(tmp[0]) readSize += WireFormat.getUInt64SizeNoTag(tmp)
}
} while (false)
var newArray = LongArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readUInt64NoTag()
i += 1
} }
ulong = newArray ulong = newArray
} while (false) } while (false)
@@ -1052,6 +1122,7 @@ class MessageRepeatedVarints private constructor (var int: IntArray, var long: L
} }
} }
} }
fun compareIntArrays(lhs: IntArray, rhs: IntArray): Boolean { fun compareIntArrays(lhs: IntArray, rhs: IntArray): Boolean {
translator/src/test/kotlin/tests/kotlin/proto_repeated_zigzag.kt
+30 -10
View File
@@ -247,15 +247,25 @@ class MessageRepeatedZigZag private constructor (var int: IntArray, var long: Lo
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = IntArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = IntArray(1) var tmp = 0
tmp[0] = input.readSInt32NoTag() tmp = input.readSInt32NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getSInt32SizeNoTag(tmp[0]) readSize += WireFormat.getSInt32SizeNoTag(tmp)
}
} while (false)
var newArray = IntArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readSInt32NoTag()
i += 1
} }
int = newArray int = newArray
} while (false) } while (false)
@@ -266,15 +276,25 @@ class MessageRepeatedZigZag private constructor (var int: IntArray, var long: Lo
return false return false
} }
val expectedByteSize = input.readInt32NoTag() val expectedByteSize = input.readInt32NoTag()
var newArray = LongArray(0)
var readSize = 0 var readSize = 0
var arraySize = 0
input.mark()
do { do {
var i = 0 var i = 0
while(readSize < expectedByteSize) { while(readSize < expectedByteSize) {
var tmp = LongArray(1) var tmp = 0L
tmp[0] = input.readSInt64NoTag() tmp = input.readSInt64NoTag()
newArray = newArray.plus(tmp) arraySize += 1
readSize += WireFormat.getSInt64SizeNoTag(tmp[0]) readSize += WireFormat.getSInt64SizeNoTag(tmp)
}
} while (false)
var newArray = LongArray(arraySize)
input.reset()
do {
var i = 0
while(i < arraySize) {
newArray[i] = input.readSInt64NoTag()
i += 1
} }
long = newArray long = newArray
} while (false) } while (false)