diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor index 49935e194a..0061f8c5cf 100644 --- a/basis/io/sockets/sockets.factor +++ b/basis/io/sockets/sockets.factor @@ -8,7 +8,7 @@ grouping init io.backend io.binary io.encodings.ascii io.encodings.binary io.pathnames io.ports io.streams.duplex kernel locals math math.parser memoize namespaces present sequences sequences.private splitting strings summary system -vocabs vocabs.parser ; +vocabs vocabs.parser ip-parser ; IN: io.sockets << { @@ -76,7 +76,7 @@ ERROR: malformed-ipv4 sequence ; ERROR: bad-ipv4-component string ; -: parse-ipv4 ( string -- seq ) +: ipv4>bytes ( string -- seq ) [ f ] [ "." split dup length 4 = [ malformed-ipv4 ] unless [ dup string>number [ ] [ bad-ipv4-component ] ?if ] B{ } map-as @@ -93,7 +93,7 @@ M: ipv4 inet-ntop ( data addrspec -- str ) drop 4 memory>byte-array [ number>string ] { } map-as "." join ; M: ipv4 inet-pton ( str addrspec -- data ) - drop [ parse-ipv4 ] [ invalid-ipv4 ] recover ; + drop [ parse-ipv4 ipv4>bytes ] [ invalid-ipv4 ] recover ; M: ipv4 address-size drop 4 ; @@ -154,7 +154,7 @@ ERROR: more-than-8-components ; [ f ] [ ":" split CHAR: . over last member? [ unclip-last - [ parse-ipv6-component ] [ parse-ipv4 ] bi* append + [ parse-ipv6-component ] [ ipv4>bytes ] bi* append ] [ parse-ipv6-component ] if diff --git a/extra/ip-parser/authors.txt b/basis/ip-parser/authors.txt similarity index 100% rename from extra/ip-parser/authors.txt rename to basis/ip-parser/authors.txt diff --git a/extra/ip-parser/ip-parser-docs.factor b/basis/ip-parser/ip-parser-docs.factor similarity index 100% rename from extra/ip-parser/ip-parser-docs.factor rename to basis/ip-parser/ip-parser-docs.factor diff --git a/extra/ip-parser/ip-parser-tests.factor b/basis/ip-parser/ip-parser-tests.factor similarity index 100% rename from extra/ip-parser/ip-parser-tests.factor rename to basis/ip-parser/ip-parser-tests.factor diff --git a/extra/ip-parser/ip-parser.factor b/basis/ip-parser/ip-parser.factor similarity index 100% rename from extra/ip-parser/ip-parser.factor rename to basis/ip-parser/ip-parser.factor