1 files changed, 1 insertions, 117 deletions
diff --git a/decode.c b/decode.c
index de546ba..805ad3f 100644
--- a/decode.c
+++ b/decode.c
@@ -3,123 +3,7 @@
 
 #include "yuri.h"
 
-/*
- * for an explanation of this hell please refer to
- * RFC 3986 (Appendix A)
- */
-#define _is_alpha(c)\
-	((c == 'A') ||\
-	 (c == 'B') ||\
-	 (c == 'C') ||\
-	 (c == 'D') ||\
-	 (c == 'E') ||\
-	 (c == 'F') ||\
-	 (c == 'G') ||\
-	 (c == 'H') ||\
-	 (c == 'I') ||\
-	 (c == 'J') ||\
-	 (c == 'K') ||\
-	 (c == 'L') ||\
-	 (c == 'M') ||\
-	 (c == 'N') ||\
-	 (c == 'O') ||\
-	 (c == 'P') ||\
-	 (c == 'Q') ||\
-	 (c == 'R') ||\
-	 (c == 'S') ||\
-	 (c == 'T') ||\
-	 (c == 'U') ||\
-	 (c == 'V') ||\
-	 (c == 'W') ||\
-	 (c == 'X') ||\
-	 (c == 'Y') ||\
-	 (c == 'Z') ||\
-	 (c == 'a') ||\
-	 (c == 'b') ||\
-	 (c == 'c') ||\
-	 (c == 'd') ||\
-	 (c == 'e') ||\
-	 (c == 'f') ||\
-	 (c == 'g') ||\
-	 (c == 'h') ||\
-	 (c == 'i') ||\
-	 (c == 'j') ||\
-	 (c == 'k') ||\
-	 (c == 'l') ||\
-	 (c == 'm') ||\
-	 (c == 'n') ||\
-	 (c == 'o') ||\
-	 (c == 'p') ||\
-	 (c == 'q') ||\
-	 (c == 'r') ||\
-	 (c == 's') ||\
-	 (c == 't') ||\
-	 (c == 'u') ||\
-	 (c == 'v') ||\
-	 (c == 'w') ||\
-	 (c == 'x') ||\
-	 (c == 'y') ||\
-	 (c == 'z'))
-
-#define _is_digit(c)\
-	((c == '0') ||\
-	 (c == '1') ||\
-	 (c == '2') ||\
-	 (c == '3') ||\
-	 (c == '4') ||\
-	 (c == '5') ||\
-	 (c == '6') ||\
-	 (c == '7') ||\
-	 (c == '8') ||\
-	 (c == '9'))
-
-#define _is_gen_delim(c)\
-	((c == ':') ||\
-	 (c == '/') ||\
-	 (c == '?') ||\
-	 (c == '#') ||\
-	 (c == '[') ||\
-	 (c == ']') ||\
-	 (c == '@'))
-
-#define _is_sub_delim(c)\
-	((c == '!') ||\
-	 (c == '$') ||\
-	 (c == '&') ||\
-	 (c == '\'') ||\
-	 (c == '(') ||\
-	 (c == ')') ||\
-	 (c == '*') ||\
-	 (c == '+') ||\
-	 (c == ',') ||\
-	 (c == ';') ||\
-	 (c == '='))
-
-#define _is_unreserved(c)\
-	(_is_alpha(c) ||\
-	 _is_digit(c) ||\
-	 (c == '-')   ||\
-	 (c == '.')   ||\
-	 (c == '_')   ||\
-	 (c == '~'))
-
-#define _is_reserved(c)\
-	(_is_gen_delim(c) ||\
-	 _is_sub_delim(c))
-
-#define _is_pchar(c)\
-	(_is_unreserved(c) ||\
-	 _is_sub_delim(c)  ||\
-	 (c == ':')        ||\
-	 (c == '@'))
-
-#define _is_segment(c)\
-	_is_pchar(c)
-
-#define _is_segment_nc(c)\
-	(_is_unreserved(c) ||\
-	 _is_sub_delim(c)  ||\
-	 (c == '@'))
+#include "types.h"
 
 /*
  * TODO: I have written code for conversion to and