altprintf 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134617d2a0afa2d1fcbcc02b7e83421b625ed740e80a02869d73fd9c32f9bff9
-  data.tar.gz: 2ff6cc05cd95897746fbdbad9a8d1c7c98ec9ad3430ce6dfcb58de5eea4508ce
+  metadata.gz: 1cc830a121e86420a00495ecaf185f65d7e85b78893b178d65878f2568fbf8f1
+  data.tar.gz: ec7fbc35f30756832d9b71e8e5a37bf34cc900b725b002497a6eb9cf943a2ee8
 SHA512:
-  metadata.gz: 1c6fbb933675cdf58684849b252a61da79241bb86c9da851bc01f9abfeac3e7fa1cfc0211753fd6d0701c68085091c739853a1972d7f3f527ea4a6e89293df3c
-  data.tar.gz: 2542ed5e8d4417a9858c11b9fab94e61c2582827ee0976c261bc87e3ea8450a4eae9d3fa1e45d2ec955de0067717e88e9739d4e2fe5f8d09e857c4d2005d941e
+  metadata.gz: 513567e60633170846a1d51e094ec7e81f1217336de27aa47b2e9e937a59efe1bd5a059695fa86f54e93a0d2f61d7864cf138282db853bee28cac8430fb909fd
+  data.tar.gz: 990a2a342a6218e3fea7b2bd8643239cfeaf5d1695c7495ffb80ec7d6ae3003f8e61f515d8e564abf236248096ed84d36f238049c2f1a1ec36e458d1e036b1ba

data/ext/altprintf/altprintf.h

@@ -0,0 +1,57 @@
+#ifndef ALTPRINTF_H_
+#define ALTPRINTF_H_
+#define ALTPRINTF_VERSION "0.4.0"
+#include <stdlib.h>
+
+enum apf_argt {
+	apf_argt_mul,
+	apf_argt_tern,
+	apf_argt_align,
+	apf_argt_int,
+	apf_argt_char,
+	apf_argt_double,
+	apf_argt_string,
+	apf_argt_raw,
+	apf_argt_none,
+	apf_argt_end
+};
+
+enum apf_align { apf_algn_left, apf_algn_right, apf_algn_center };
+
+enum apf_err {
+	apf_err_none,
+	apf_err_invalid_token,
+	apf_err_missing_argument
+};
+
+extern enum apf_err apf_errno;
+
+struct apf_fmte {
+	const char *parenarg_start;
+	const char *parenarg_end;
+	size_t parenarg_len;
+
+	const char *anglearg_start;
+	const char *anglearg_end;
+	size_t anglearg_len;
+
+	char chararg;
+
+	char padchar;
+
+	enum apf_argt type;
+	enum apf_align align;
+
+	long prec;
+	long pad;
+
+	void *value;
+
+	struct apf_fmte *next;
+};
+
+void apf_fmte_push(struct apf_fmte *, struct apf_fmte *);
+void apf_fmte_destroy(struct apf_fmte *);
+struct apf_fmte *apf_parse(const char **);
+char *apf_assemble(struct apf_fmte *);
+#endif

data/ext/altprintf/{fmt.c → assemble.c}

@@ -1,21 +1,20 @@
-#include <altprintf/syntax.h>
-#include <altprintf/strbuf.h>
-#include <altprintf/fmte.h>
-#include <altprintf/log.h>
-#include <altprintf/fmt.h>
+#include "altprintf.h"
+#include "syntax.h"
+#include "strbuf.h"
+#include "log.h"
 
 #define BUFNUM 25
 
 #define CHECKNULL(p) do {                                \
 		if (p == NULL) {                         \
-			apf_err = apfe_missing_argument; \
+			apf_errno = apf_err_missing_argument; \
 			return;                          \
 		}                                        \
 } while (0)
 
-enum altprintf_err apf_err;
+enum apf_err apf_errno;
 
-void fmt_mul(struct strbuf *sb, struct fmte *f)
+static void fmt_mul(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->value);
 
@@ -29,7 +28,7 @@ void fmt_mul(struct strbuf *sb, struct fmte *f)
 			strbuf_append_str(sb, f->parenarg_start, -f->parenarg_len);
 }
 
-void fmt_tern(struct strbuf *sb, struct fmte *f)
+static void fmt_tern(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->parenarg_start);
 	CHECKNULL(f->value);
@@ -50,7 +49,7 @@ void fmt_tern(struct strbuf *sb, struct fmte *f)
 	}
 }
 
-char process_escape_seq(char seq)
+static char process_escape_seq(char seq)
 {
 	switch (seq) {
 	case FS_ESC_NL:
@@ -74,7 +73,7 @@ char process_escape_seq(char seq)
 	}
 }
 
-void fmt_raw(struct strbuf *sb, struct fmte *f)
+static void fmt_raw(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->parenarg_start);
 
@@ -96,7 +95,7 @@ void fmt_raw(struct strbuf *sb, struct fmte *f)
 	}
 }
 
-void fmt_string(struct strbuf *sb, struct fmte *f)
+static void fmt_string(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->value);
 
@@ -104,26 +103,27 @@ void fmt_string(struct strbuf *sb, struct fmte *f)
 	strbuf_append_str(sb, f->value, prec);
 }
 
-void fmt_char(struct strbuf *sb, struct fmte *f)
+static void fmt_char(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->value);
 	strbuf_append_char(sb, f->value);
 }
 
-void fmt_int(struct strbuf *sb, struct fmte *f)
+static void fmt_int(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->value);
 	strbuf_append_int(sb, f->value);
 }
 
-void fmt_double(struct strbuf *sb, struct fmte *f)
+static void fmt_double(struct strbuf *sb, struct apf_fmte *f)
 {
 	CHECKNULL(f->value);
 	int prec = f->prec == -1 ? 3 : f->prec;
 	strbuf_append_double(sb, f->value, prec);
 }
 
-void fmt(struct strbuf *sb, struct fmte *f, void (*fmtr)(struct strbuf *, struct fmte *))
+static void
+fmt(struct strbuf *sb, struct apf_fmte *f, void (*fmtr)(struct strbuf *, struct apf_fmte *))
 {
 	struct strbuf *tmp = strbuf_new();
 
@@ -139,15 +139,15 @@ void fmt(struct strbuf *sb, struct fmte *f, void (*fmtr)(struct strbuf *, struct
 	if (pad > 0) {
 		LOG("padding: %d\n", pad);
 		switch (f->align) {
-		case Right:
+		case apf_algn_right:
 			strbuf_append_strbuf(sb, tmp);
 			strbuf_pad(sb, f->padchar, pad);
 			break;
-		case Left:
+		case apf_algn_left:
 			strbuf_pad(sb, f->padchar, pad);
 			strbuf_append_strbuf(sb, tmp);
 			break;
-		case Center:
+		case apf_algn_center:
 			strbuf_pad(sb, f->padchar, pad / 2);
 			strbuf_append_strbuf(sb, tmp);
 			strbuf_pad(sb, f->padchar, pad / 2 + pad % 2);
@@ -160,16 +160,16 @@ void fmt(struct strbuf *sb, struct fmte *f, void (*fmtr)(struct strbuf *, struct
 	strbuf_destroy(tmp);
 }
 
-char *assemble_fmt(struct fmte *head)
+char *apf_assemble(struct apf_fmte *head)
 {
-	struct fmte *f = head;
+	struct apf_fmte *f = head;
 	struct strbuf *bufs[BUFNUM];
-	struct fmte *splits[BUFNUM];
+	struct apf_fmte *splits[BUFNUM];
 	size_t buf = 0, i;
 	size_t w, tw, rw;
 	char *final;
 
-	void (*fmtr)(struct strbuf *, struct fmte *) = NULL;
+	void (*fmtr)(struct strbuf *, struct apf_fmte *) = NULL;
 	int loop = 1;
 
 	bufs[buf] = strbuf_new();
@@ -177,39 +177,39 @@ char *assemble_fmt(struct fmte *head)
 	LOG("assembling elements\n");
 	while (loop) {
 		switch (f->type) {
-		case FMul:
+		case apf_argt_mul:
 			fmtr = fmt_mul;
 			break;
-		case FTern:
+		case apf_argt_tern:
 			fmtr = fmt_tern;
 			break;
-		case FInt:
+		case apf_argt_int:
 			fmtr = fmt_int;
 			break;
-		case FChar:
+		case apf_argt_char:
 			fmtr = fmt_char;
 			break;
-		case FDouble:
+		case apf_argt_double:
 			fmtr = fmt_double;
 			break;
-		case FString:
+		case apf_argt_string:
 			fmtr = fmt_string;
 			break;
-		case FRaw:
+		case apf_argt_raw:
 			fmtr = fmt_raw;
 			break;
 
-		case FAlign:
+		case apf_argt_align:
 			buf++;
 			splits[buf] = f;
 			bufs[buf] = strbuf_new();
 			fmtr = NULL;
 			break;
-		case FEnd:
+		case apf_argt_end:
 			loop = 0;
 			fmtr = NULL;
 			break;
-		case FNone:
+		case apf_argt_none:
 			fmtr = NULL;
 			break;
 		}

data/ext/altprintf/ext.c

@@ -6,13 +6,18 @@
 #undef RUBY_EXTCONF_H
 #endif
 
+#ifdef DEBUG
+#define LOG(...) printf("%s:%d [\e[35m%s\e[0m] ", __FILE__, __LINE__, __func__); printf(__VA_ARGS__);
+#else
+#define LOG(msg, ...)
+#endif
+
 #include "extconf.h"
 #include <stdio.h>
 #include <locale.h>
 #include <ruby.h>
 #include <ruby/encoding.h>
-#include <altprintf/altprintf.h>
-#include <altprintf/log.h>
+#include <altprintf.h>
 
 rb_encoding *enc;
 
@@ -45,7 +50,7 @@ VALUE cstorbs(const char *cstr)
 	return str;
 }
 
-VALUE get_entry(struct fmte *f, size_t argc, size_t *argi, VALUE *argv, VALUE *hash)
+VALUE get_entry(struct apf_fmte *f, size_t argc, size_t *argi, VALUE *argv, VALUE *hash)
 {
 	VALUE sym, entry;
 
@@ -70,7 +75,7 @@ VALUE get_entry(struct fmte *f, size_t argc, size_t *argi, VALUE *argv, VALUE *h
 
 char *rb_apformat(const char *fmt, size_t argc, size_t *argi, VALUE *argv, VALUE *hash)
 {
-	struct fmte *f, *head;
+	struct apf_fmte *f, *head;
 	char *final;
 	int loop = 1;
 	long *tmpi;
@@ -80,42 +85,42 @@ char *rb_apformat(const char *fmt, size_t argc, size_t *argi, VALUE *argv, VALUE
 	void *tmp;
 	VALUE entry;
 
-	head = f = parsef(&fmt);
+	head = f = apf_parse(&fmt);
 
 	while (loop) {
-		if (apf_err != apfe_none)
+		if (apf_errno != apf_err_none)
 			rb_raise(rb_eArgError, "malformed format string");
 
 		LOG("scanned type: %d\n", f->type);
 
-		if (f->type != FEnd && f->type != FRaw)
+		if (f->type != apf_argt_end && f->type != apf_argt_raw)
 			entry = get_entry(f, argc, argi, argv, hash);
 		else
 			entry = Qnil;
 
 		switch (f->type) {
-		case FString:
+		case apf_argt_string:
 			Check_Type(entry, T_STRING);
 
 			tmp = rbstocs(&entry);
 			goto match;
-		case FTern:
+		case apf_argt_tern:
 			tmpi = malloc(sizeof(long));
 
 			*tmpi = (entry == Qfalse || entry == Qnil) ? 0 : 1;
 
 			tmp = tmpi;
 			goto match;
-		case FMul:
-		case FAlign:
-		case FInt:
+		case apf_argt_mul:
+		case apf_argt_align:
+		case apf_argt_int:
 			Check_Type(entry, T_FIXNUM);
 
 			tmpi = malloc(sizeof(long));
 			*tmpi = FIX2LONG(entry);
 			tmp = tmpi;
 			goto match;
-		case FChar:
+		case apf_argt_char:
 			Check_Type(entry, T_STRING);
 
 			tmpc = malloc(sizeof(char));
@@ -123,7 +128,7 @@ char *rb_apformat(const char *fmt, size_t argc, size_t *argi, VALUE *argv, VALUE
 			*tmpc = tmps[0];
 			tmp = tmpc;
 			goto match;
-		case FDouble:
+		case apf_argt_double:
 			Check_Type(entry, T_FLOAT);
 
 			tmpd = malloc(sizeof(double));
@@ -132,13 +137,13 @@ char *rb_apformat(const char *fmt, size_t argc, size_t *argi, VALUE *argv, VALUE
 match:
 			f->value = tmp;
 			break;
-		case FRaw:
+		case apf_argt_raw:
 			break;
-		case FEnd:
+		case apf_argt_end:
 			LOG("EOS (end of string)\n");
 			loop = 0;
 			break;
-		case FNone:
+		case apf_argt_none:
 			LOG("error! shouldn' t be none\n");
 			break;
 		}
@@ -147,15 +152,15 @@ match:
 #ifdef DEBUG
 		fmte_inspect(f);
 #endif
-		fmte_push(head, f);
+		apf_fmte_push(head, f);
 		if (loop)
-			f = parsef(&fmt);
+			f = apf_parse(&fmt);
 	}
 
 	LOG("got all fmt elements\n");
-	final = assemble_fmt(head);
+	final = apf_assemble(head);
 	LOG("assembled fmt: %s", final);
-	fmte_destroy(head);
+	apf_fmte_destroy(head);
 	return final;
 }
 
@@ -167,7 +172,7 @@ VALUE rb_altprintf(long passes, size_t argc, VALUE *argv, VALUE self)
 	size_t argi;
 	int free_wfmt;
 
-	apf_err = apfe_none;
+	apf_errno = apf_err_none;
 	rb_scan_args(argc, argv, "1*:", &fmt, &args, &hash);
 	argc--;
 

data/ext/altprintf/extconf_helper.rb

@@ -10,12 +10,12 @@ module ExtconfHelper
   module_function
 
   def dev_setup
-    unless find_header('altprintf/altprintf.h', INC_DIR)
+    unless find_header('altprintf.h', INC_DIR)
       $stderr.puts("couldn't find header 'altprintf.h'")
       exit(1)
     end
 
-    unless find_library('altprintf', 'parsef', LIB_DIR)
+    unless find_library('altprintf', 'apf_parse', LIB_DIR)
       $stderr.puts("you haven't built libaltprintf yet")
       exit(1)
     end

data/ext/altprintf/fmte.c

@@ -1,12 +1,12 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <altprintf/enums.h>
-#include <altprintf/log.h>
-#include <altprintf/fmte.h>
+#include "altprintf.h"
+#include "fmte.h"
+#include "log.h"
 
-struct fmte *fmte_ini(void)
+struct apf_fmte *apf_fmte_ini(void)
 {
-	struct fmte *f = malloc(sizeof(struct fmte));
+	struct apf_fmte *f = malloc(sizeof(struct apf_fmte));
 
 	f->parenarg_start = NULL;
 	f->parenarg_end = NULL;
@@ -18,8 +18,8 @@ struct fmte *fmte_ini(void)
 
 	f->chararg = ' ';
 	f->padchar = ' ';
-	f->type = FNone;
-	f->align = Left;
+	f->type = apf_argt_none;
+	f->align = apf_algn_left;
 	f->prec = -1;
 	f->pad = 0;
 	f->value = NULL;
@@ -29,7 +29,7 @@ struct fmte *fmte_ini(void)
 	return f;
 }
 
-void fmte_push(struct fmte *a, struct fmte *b)
+void apf_fmte_push(struct apf_fmte *a, struct apf_fmte *b)
 {
 	if (a == b)
 		return;     // refuse to create an infinite loop
@@ -39,9 +39,9 @@ void fmte_push(struct fmte *a, struct fmte *b)
 	a->next = b;
 }
 
-void fmte_destroy(struct fmte *f)
+void apf_fmte_destroy(struct apf_fmte *f)
 {
-	struct fmte *j;
+	struct apf_fmte *j;
 
 	while (f != NULL) {
 		j = f->next;
@@ -51,7 +51,7 @@ void fmte_destroy(struct fmte *f)
 	}
 }
 
-void fmte_inspect(struct fmte *f)
+void apf_fmte_inspect(struct apf_fmte *f)
 {
 	char *parenarg = calloc(f->parenarg_len + 1, sizeof(char));
 	char *anglearg = calloc(f->anglearg_len + 1, sizeof(char));

data/ext/altprintf/fmte.h

@@ -0,0 +1,5 @@
+#ifndef FMTE_H_
+#define FMTE_H_
+struct apf_fmte *apf_fmte_ini(void);
+void apf_fmte_inspect(struct apf_fmte *);
+#endif

data/ext/altprintf/{altprintf/log.h → log.h}

@@ -3,10 +3,8 @@
 
 #ifdef DEBUG
 #define LOG(...) printf("%s:%d [\e[35m%s\e[0m] ", __FILE__, __LINE__, __func__); printf(__VA_ARGS__);
-#define FLOG(msg, ...) fprintf(stderr, "%s[%d] - "msg, __FILE__, __LINE__ __VA_OPT__(, ) __VA_ARGS__)
 #else
 #define LOG(msg, ...)
-#define FLOG(msg, ...)
 #endif
 
 #endif

data/ext/altprintf/{parsef.c → parse.c}

@@ -1,11 +1,11 @@
-#include <altprintf/fmte.h>
-#include <altprintf/syntax.h>
-#include <altprintf/log.h>
-#include <altprintf/parsef.h>
+#include "altprintf.h"
+#include "fmte.h"
+#include "syntax.h"
+#include "log.h"
 
 char *altprintf_pct = "%";
 
-void get_longarg(const char **s, const char **e, char stop, size_t *size)
+static void get_longarg(const char **s, const char **e, char stop, size_t *size)
 {
 	*size = 0;
 
@@ -20,23 +20,23 @@ void get_longarg(const char **s, const char **e, char stop, size_t *size)
 		*e = *s - 1;
 }
 
-struct fmte *parsef(const char **fmt)
+struct apf_fmte *apf_parse(const char **fmt)
 {
 	char *w_c;
 	char **w_a = &w_c;
-	struct fmte *f = fmte_ini();
+	struct apf_fmte *f = apf_fmte_ini();
 	long *l_a = &f->pad;
 
 	LOG("processing %d (%c)\n", **fmt, **fmt);
 
 	if (**fmt != FS_START) {
 		if (**fmt == EOS) {
-			f->type = FEnd;
+			f->type = apf_argt_end;
 			goto return_format;
 		}
 
 		LOG("building raw format\n");
-		f->type = FRaw;
+		f->type = apf_argt_raw;
 
 		f->parenarg_start = *fmt;
 		LOG("scanning long arg\n");
@@ -68,10 +68,10 @@ struct fmte *parsef(const char **fmt)
 			get_longarg(fmt, &f->parenarg_end, FS_A_PARENARG_E, &f->parenarg_len);
 			break;
 		case FS_A_LALIGN:
-			f->align = Left;
+			f->align = apf_algn_left;
 			break;
 		case FS_A_CALIGN:
-			f->align = Center;
+			f->align = apf_algn_center;
 			break;
 		case FS_A_PAD:
 			(*fmt)++;
@@ -89,40 +89,40 @@ struct fmte *parsef(const char **fmt)
 			break;
 		// Psuedo-type
 		case FS_START:
-			f->type = FRaw;
+			f->type = apf_argt_raw;
 			f->parenarg_start = &altprintf_pct[0];
 			f->parenarg_end = &altprintf_pct[1];
 			f->parenarg_len = 1;
 			goto return_format;
 		// Types
 		case FS_T_STRING:
-			f->type = FString;
+			f->type = apf_argt_string;
 			goto return_format;
 		case FS_T_MUL:
-			f->type = FMul;
+			f->type = apf_argt_mul;
 			goto return_format;
 		case FS_T_TERN:
-			f->type = FTern;
+			f->type = apf_argt_tern;
 			goto return_format;
 		case FS_T_ALIGN:
-			f->type = FAlign;
+			f->type = apf_argt_align;
 			goto return_format;
 		case FS_T_INT:
-			f->type = FInt;
+			f->type = apf_argt_int;
 			goto return_format;
 		case FS_T_CHAR:
-			f->type = FChar;
+			f->type = apf_argt_char;
 			goto return_format;
 		case FS_T_DOUBLE:
-			f->type = FDouble;
+			f->type = apf_argt_double;
 			goto return_format;
 		default:
-			apf_err = apfe_invalid_token;
-			f->type = FRaw;
+			apf_errno = apf_err_invalid_token;
+			f->type = apf_argt_raw;
 		}
 	}
 
-	f->type = FEnd;
+	f->type = apf_argt_end;
 return_format:
 	(*fmt)++;
 	return f;

data/ext/altprintf/strbuf.c

@@ -6,11 +6,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <altprintf/log.h>
-#include <altprintf/strbuf.h>
-#include <altprintf/cwidth.h>
-
-extern struct lconv *locale_info;
+#include "log.h"
+#include "strbuf.h"
+#include "cwidth.h"
 
 struct strbuf *strbuf_new(void)
 {

data/lib/altprintf/version.rb

@@ -1,3 +1,3 @@
 module Altprintf
-  VERSION ||= "0.3.3"
+  VERSION ||= "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: altprintf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Stone Tickle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -74,24 +74,21 @@ extensions:
 extra_rdoc_files: []
 files:
 - altprintf.gemspec
-- ext/altprintf/altprintf/altprintf.h
-- ext/altprintf/altprintf/cwidth.h
-- ext/altprintf/altprintf/enums.h
-- ext/altprintf/altprintf/fmt.h
-- ext/altprintf/altprintf/fmte.h
-- ext/altprintf/altprintf/log.h
-- ext/altprintf/altprintf/parsef.h
-- ext/altprintf/altprintf/strbuf.h
-- ext/altprintf/altprintf/syntax.h
+- ext/altprintf/altprintf.h
+- ext/altprintf/assemble.c
 - ext/altprintf/cwidth.c
+- ext/altprintf/cwidth.h
 - ext/altprintf/ext.c
 - ext/altprintf/extconf.h
 - ext/altprintf/extconf.rb
 - ext/altprintf/extconf_helper.rb
-- ext/altprintf/fmt.c
 - ext/altprintf/fmte.c
-- ext/altprintf/parsef.c
+- ext/altprintf/fmte.h
+- ext/altprintf/log.h
+- ext/altprintf/parse.c
 - ext/altprintf/strbuf.c
+- ext/altprintf/strbuf.h
+- ext/altprintf/syntax.h
 - lib/altprintf.rb
 - lib/altprintf/version.rb
 - readme.md
@@ -114,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A powerful printf-like template language

data/ext/altprintf/altprintf/altprintf.h

@@ -1,8 +0,0 @@
-#ifndef ALTPRINTF_H_
-#define ALTPRINTF_H_
-#define ALTPRINTF_VERSION "0.3.3"
-
-#include <altprintf/fmt.h>
-#include <altprintf/fmte.h>
-#include <altprintf/parsef.h>
-#endif

data/ext/altprintf/altprintf/enums.h

@@ -1,14 +0,0 @@
-#ifndef _ALTPRINTF_ENUM_H
-#define _ALTPRINTF_ENUM_H
-enum arg_type { FMul, FTern, FAlign, FInt, FChar, FDouble, FString, FRaw, FNone,
-		FEnd };
-enum align { Left, Right, Center };
-
-enum altprintf_err {
-	apfe_none,
-	apfe_invalid_token,
-	apfe_missing_argument
-};
-
-extern enum altprintf_err apf_err;
-#endif

data/ext/altprintf/altprintf/fmt.h

@@ -1,5 +0,0 @@
-#ifndef FMT_H_
-#define FMT_H_
-#include <altprintf/fmte.h>
-char *assemble_fmt(struct fmte *);
-#endif

data/ext/altprintf/altprintf/fmte.h

@@ -1,34 +0,0 @@
-#ifndef FMTE_H_
-#define FMTE_H_
-#include <stdlib.h>
-#include <altprintf/enums.h>
-
-struct fmte {
-	const char *parenarg_start;
-	const char *parenarg_end;
-	size_t parenarg_len;
-
-	const char *anglearg_start;
-	const char *anglearg_end;
-	size_t anglearg_len;
-
-	char chararg;
-
-	char padchar;
-
-	enum arg_type type;
-	enum align align;
-
-	long prec;
-	long pad;
-
-	void *value;
-
-	struct fmte *next;
-};
-
-struct fmte *fmte_ini(void);
-void fmte_inspect(struct fmte *);
-void fmte_push(struct fmte *, struct fmte *);
-void fmte_destroy(struct fmte *);
-#endif

data/ext/altprintf/altprintf/parsef.h

@@ -1,6 +0,0 @@
-#ifndef PARSEF_H_
-#define PARSEF_H_
-#include <stdlib.h>
-
-struct fmte *parsef(const char **);
-#endif