make net.nim compile again (quick workaround for a regression)

This commit is contained in:
Araq 2015-01-13 13:55:56 +01:00
commit f7ef00aa3b

View file

@ -1036,7 +1036,7 @@ proc `$`*(address: TIpAddress): string =
else: # Print address else: # Print address
var printedLastGroup = false var printedLastGroup = false
for i in 0..7: for i in 0..7:
var word:uint16 = (cast[uint16](address.address_v6[i*2])) shl 8 var word:uint16 = (cast[uint16](address.address_v6[i*2])) shl 8u16
word = word or cast[uint16](address.address_v6[i*2+1]) word = word or cast[uint16](address.address_v6[i*2+1])
if biggestZeroCount != 0 and # Check if group is in skip group if biggestZeroCount != 0 and # Check if group is in skip group
@ -1058,7 +1058,7 @@ proc `$`*(address: TIpAddress): string =
else: # val >= 0xA else: # val >= 0xA
result.add(chr(uint16(ord('a'))+val-0xA)) result.add(chr(uint16(ord('a'))+val-0xA))
afterLeadingZeros = true afterLeadingZeros = true
mask = mask shr 4 mask = mask shr 4u16
printedLastGroup = true printedLastGroup = true
proc parseIPv4Address(address_str: string): TIpAddress = proc parseIPv4Address(address_str: string): TIpAddress =
@ -1073,7 +1073,7 @@ proc parseIPv4Address(address_str: string): TIpAddress =
for i in 0 .. high(address_str): for i in 0 .. high(address_str):
if address_str[i] in strutils.Digits: # Character is a number if address_str[i] in strutils.Digits: # Character is a number
currentByte = currentByte * 10 + currentByte = currentByte * 10u16 +
cast[uint16](ord(address_str[i]) - ord('0')) cast[uint16](ord(address_str[i]) - ord('0'))
if currentByte > 255'u16: if currentByte > 255'u16:
raise newException(ValueError, raise newException(ValueError,