jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

raise exceptions through newException

Browse source
This commit is contained in:
Matthias Einwag 2014-03-09 11:47:22 +01:00
commit 7b055388b7
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/pure/net.nim
View file

@ -139,7 +139,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 + cast[uint16](ord(address_str[i]) - ord('0')) currentByte = currentByte * 10 + cast[uint16](ord(address_str[i]) - ord('0'))
if currentByte > 255'u16: raise new EInvalidValue if currentByte > 255'u16: raise newException(EInvalidValue, "Invalid IP Address")
seperatorValid = true seperatorValid = true
elif address_str[i] == '.': # IPv4 address separator elif address_str[i] == '.': # IPv4 address separator
if not seperatorValid or byteCount >= 3: if not seperatorValid or byteCount >= 3:
@ -149,7 +149,7 @@ proc parseIPv4Address(address_str: string): TIpAddress =
byteCount.inc byteCount.inc
seperatorValid = false seperatorValid = false
else: else:
raise new EInvalidValue # Invalid character raise newException(EInvalidValue, "Invalid IP Address") # Invalid character
if byteCount != 3 or not seperatorValid: if byteCount != 3 or not seperatorValid:
raise new EInvalidValue raise new EInvalidValue
@ -159,7 +159,7 @@ proc parseIPv6Address(address_str: string): TIpAddress =
## Parses IPv6 adresses ## Parses IPv6 adresses
## Raises EInvalidValue on errors ## Raises EInvalidValue on errors
result.family = IpAddressFamily.IPv6 result.family = IpAddressFamily.IPv6
if address_str.len < 2: raise new EInvalidValue if address_str.len < 2: raise newException(EInvalidValue, "Invalid IP Address")
var var
groupCount = 0 groupCount = 0
@ -173,26 +173,26 @@ proc parseIPv6Address(address_str: string): TIpAddress =
for i,c in address_str: for i,c in address_str:
if c == ':': if c == ':':
if not seperatorValid: raise new EInvalidValue if not seperatorValid: raise newException(EInvalidValue, "Invalid IP Address")
if lastWasColon: if lastWasColon:
if dualColonGroup != -1: raise new EInvalidValue if dualColonGroup != -1: raise newException(EInvalidValue, "Invalid IP Address")
dualColonGroup = groupCount dualColonGroup = groupCount
seperatorValid = false seperatorValid = false
elif i != 0 and i != high(address_str): elif i != 0 and i != high(address_str):
if groupCount >= 8: raise new EInvalidValue if groupCount >= 8: raise newException(EInvalidValue, "Invalid IP Address")
result.address_v6[groupCount*2] = cast[uint8](currentShort shr 8) result.address_v6[groupCount*2] = cast[uint8](currentShort shr 8)
result.address_v6[groupCount*2+1] = cast[uint8](currentShort and 0xFF) result.address_v6[groupCount*2+1] = cast[uint8](currentShort and 0xFF)
currentShort = 0 currentShort = 0
groupCount.inc() groupCount.inc()
if dualColonGroup != -1: seperatorValid = false if dualColonGroup != -1: seperatorValid = false
elif i == 0: # only valid if address starts with :: elif i == 0: # only valid if address starts with ::
if address_str[1] != ':': raise new EInvalidValue if address_str[1] != ':': raise newException(EInvalidValue, "Invalid IP Address")
else: # i == high(address_str) - only valid if address ends with :: else: # i == high(address_str) - only valid if address ends with ::
if address_str[high(address_str)-1] != ':': raise new EInvalidValue if address_str[high(address_str)-1] != ':': raise newException(EInvalidValue, "Invalid IP Address")
lastWasColon = true lastWasColon = true
currentGroupStart = i + 1 currentGroupStart = i + 1
elif c == '.': # Switch to parse IPv4 mode elif c == '.': # Switch to parse IPv4 mode
if i < 3 or not seperatorValid or groupCount >= 7: raise new EInvalidValue if i < 3 or not seperatorValid or groupCount >= 7: raise newException(EInvalidValue, "Invalid IP Address")
v4StartPos = currentGroupStart v4StartPos = currentGroupStart
currentShort = 0 currentShort = 0
seperatorValid = false seperatorValid = false
@ -204,16 +204,16 @@ proc parseIPv6Address(address_str: string): TIpAddress =
currentShort = (currentShort shl 4) + cast[uint32](ord(c) - ord('a')) + 10 currentShort = (currentShort shl 4) + cast[uint32](ord(c) - ord('a')) + 10
else: # Upper case hex else: # Upper case hex
currentShort = (currentShort shl 4) + cast[uint32](ord(c) - ord('A')) + 10 currentShort = (currentShort shl 4) + cast[uint32](ord(c) - ord('A')) + 10
if currentShort > 65535'u32: raise new EInvalidValue if currentShort > 65535'u32: raise newException(EInvalidValue, "Invalid IP Address")
lastWasColon = false lastWasColon = false
seperatorValid = true seperatorValid = true
else: else:
raise new EInvalidValue raise newException(EInvalidValue, "Invalid IP Address")
if v4StartPos == -1: # Don't parse v4. Copy the remaining v6 stuff if v4StartPos == -1: # Don't parse v4. Copy the remaining v6 stuff
if seperatorValid: # Copy remaining data if seperatorValid: # Copy remaining data
if groupCount >= 8: raise new EInvalidValue if groupCount >= 8: raise newException(EInvalidValue, "Invalid IP Address")
result.address_v6[groupCount*2] = cast[uint8](currentShort shr 8) result.address_v6[groupCount*2] = cast[uint8](currentShort shr 8)
result.address_v6[groupCount*2+1] = cast[uint8](currentShort and 0xFF) result.address_v6[groupCount*2+1] = cast[uint8](currentShort and 0xFF)
groupCount.inc() groupCount.inc()
@ -221,7 +221,7 @@ proc parseIPv6Address(address_str: string): TIpAddress =
for i,c in address_str[v4StartPos..high(address_str)]: for i,c in address_str[v4StartPos..high(address_str)]:
if c in strutils.Digits: # Character is a number if c in strutils.Digits: # Character is a number
currentShort = currentShort * 10 + cast[uint32](ord(c) - ord('0')) currentShort = currentShort * 10 + cast[uint32](ord(c) - ord('0'))
if currentShort > 255'u32: raise new EInvalidValue if currentShort > 255'u32: raise newException(EInvalidValue, "Invalid IP Address")
seperatorValid = true seperatorValid = true
elif c == '.': # IPv4 address separator elif c == '.': # IPv4 address separator
if not seperatorValid or byteCount >= 3: if not seperatorValid or byteCount >= 3:
@ -231,7 +231,7 @@ proc parseIPv6Address(address_str: string): TIpAddress =
byteCount.inc() byteCount.inc()
seperatorValid = false seperatorValid = false
else: # Invalid character else: # Invalid character
raise new EInvalidValue raise newException(EInvalidValue, "Invalid IP Address")
if byteCount != 3 or not seperatorValid: if byteCount != 3 or not seperatorValid:
raise new EInvalidValue raise new EInvalidValue
@ -240,23 +240,23 @@ proc parseIPv6Address(address_str: string): TIpAddress =
# Shift and fill zeros in case of :: # Shift and fill zeros in case of ::
if groupCount > 8: if groupCount > 8:
raise new EInvalidValue raise newException(EInvalidValue, "Invalid IP Address")
elif groupCount < 8: # must fill elif groupCount < 8: # must fill
if dualColonGroup == -1: raise new EInvalidValue if dualColonGroup == -1: raise newException(EInvalidValue, "Invalid IP Address")
var toFill = 8 - groupCount # The number of groups to fill var toFill = 8 - groupCount # The number of groups to fill
var toShift = groupCount - dualColonGroup # Nr of known groups after :: var toShift = groupCount - dualColonGroup # Nr of known groups after ::
for i in 0..2*toShift-1: # shift for i in 0..2*toShift-1: # shift
result.address_v6[15-i] = result.address_v6[groupCount*2-i-1] result.address_v6[15-i] = result.address_v6[groupCount*2-i-1]
for i in 0..2*toFill-1: # fill with 0s for i in 0..2*toFill-1: # fill with 0s
result.address_v6[dualColonGroup*2+i] = 0 result.address_v6[dualColonGroup*2+i] = 0
elif dualColonGroup != -1: raise new EInvalidValue elif dualColonGroup != -1: raise newException(EInvalidValue, "Invalid IP Address")
proc parseIpAddress*(address_str: string): TIpAddress = proc parseIpAddress*(address_str: string): TIpAddress =
## Parses an IP address ## Parses an IP address
## Raises EInvalidValue on error ## Raises EInvalidValue on error
if address_str == nil: if address_str == nil:
raise new EInvalidValue raise newException(EInvalidValue, "IP Address string is nil")
if address_str.contains(':'): if address_str.contains(':'):
return parseIPv6Address(address_str) return parseIPv6Address(address_str)
else: else: