From dcf1e6b9f398191b20a33ff6bdfe1ba4428f6b64 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 9 Feb 2014 10:58:47 -0800
Subject: [PATCH] ip-parser: adding ntoa and aton words.
---
extra/ip-parser/ip-parser-tests.factor | 3 +++
extra/ip-parser/ip-parser.factor | 29 ++++++++++++++++++--------
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/extra/ip-parser/ip-parser-tests.factor b/extra/ip-parser/ip-parser-tests.factor
index f2c12b132f..fa7e83414e 100644
--- a/extra/ip-parser/ip-parser-tests.factor
+++ b/extra/ip-parser/ip-parser-tests.factor
@@ -21,3 +21,6 @@ IN: ip-parser
"74.0175.0xe2.4"
} [ parse-ipv4 "74.125.226.4" = ] all?
] unit-test
+
+{ "174.36.207.186" } [ 2921648058 ipv4-ntoa ] unit-test
+{ 2921648058 } [ "174.36.207.186" ipv4-aton ] unit-test
diff --git a/extra/ip-parser/ip-parser.factor b/extra/ip-parser/ip-parser.factor
index 2a4d45d7a4..431288ca9a 100644
--- a/extra/ip-parser/ip-parser.factor
+++ b/extra/ip-parser/ip-parser.factor
@@ -1,11 +1,14 @@
! Copyright (C) 2012 John Benediktsson
! See http://factorcode.org/license.txt for BSD license
-USING: combinators combinators.short-circuit kernel locals math
-math.parser sequences splitting ;
+USING: combinators combinators.short-circuit formatting kernel
+literals locals math math.bitwise math.parser sequences
+splitting ;
IN: ip-parser
+ERROR: invalid-ipv4 str ;
+
<PRIVATE
: cleanup-octal ( str -- str )
@@ -19,17 +22,25 @@ IN: ip-parser
reverse 0 swap [ + 256 /mod ] map reverse nip ;
: join-components ( array -- str )
- bubble [ number>string ] map "." join ;
+ [ number>string ] map "." join ;
-PRIVATE>
-
-ERROR: invalid-ipv4 str ;
-
-: parse-ipv4 ( str -- ip )
+: (parse-ipv4) ( str -- array )
dup split-components dup length {
{ 1 [ { 0 0 0 } prepend ] }
{ 2 [ first2 [| A D | { A 0 0 D } ] call ] }
{ 3 [ first3 [| A B D | { A B 0 D } ] call ] }
{ 4 [ ] }
[ drop invalid-ipv4 ]
- } case join-components nip ;
+ } case bubble nip ;
+
+PRIVATE>
+
+: parse-ipv4 ( str -- ip )
+ (parse-ipv4) join-components ;
+
+: ipv4-ntoa ( integer -- ip )
+ $[ { -24 -16 -8 0 } [ [ shift 8 bits ] curry ] map ]
+ cleave "%s.%s.%s.%s" sprintf ;
+
+: ipv4-aton ( ip -- integer )
+ (parse-ipv4) { 24 16 8 0 } [ shift ] [ + ] 2map-reduce ;