hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed exception handling in Socket>>fromString:

Browse Source
This commit is contained in:
hyunghwan.chung 2017-12-31 16:59:48 +00:00
parent 27dbedbc50
commit a594dda529
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
moo/kernel/Socket.moo
View File

@ -25,7 +25,7 @@ class(#byte) IP4Address(IPAddress)
^self new fromString: str. ^self new fromString: str.
} }
method fromString: str method __fromString: str
{ {
| dots digits pos size c acc | | dots digits pos size c acc |
@ -40,10 +40,7 @@ class(#byte) IP4Address(IPAddress)
{ {
if (pos >= size) if (pos >= size)
{ {
if (dots < 3 or: [digits == 0]) if (dots < 3 or: [digits == 0]) { ^Error.Code.EINVAL }.
{
Exception signal: ('invalid IPv4 address A ' & str).
}.
self basicAt: dots put: acc. self basicAt: dots put: acc.
break. break.
}. }.
@ -59,7 +56,7 @@ class(#byte) IP4Address(IPAddress)
} }
elsif (c = $.) elsif (c = $.)
{ {
if (dots >= 3 or: [digits == 0]) { Exception signal: ('invalid IPv4 address C ' & str). }. if (dots >= 3 or: [digits == 0]) { ^Error.Code.EINVAL }.
self basicAt: dots put: acc. self basicAt: dots put: acc.
dots := dots + 1. dots := dots + 1.
acc := 0. acc := 0.
@ -67,12 +64,25 @@ class(#byte) IP4Address(IPAddress)
} }
else else
{ {
Exception signal: ('invalid IPv4 address ' & str). ^Error.Code.EINVAL
### goto @label@.
}. }.
} }
while (true). while (true).
^self.
(*
(@label@)
Exception signal: ('invalid IPv4 address ' & str).
*)
}
method fromString: str
{
if ((self __fromString: str) isError)
{
Exception signal: ('invalid IPv4 address ' & str).
}
} }
} }