alt_printf 0.1.3 → 0.1.4

data/ext/alt_printf/parsef.h

@@ -0,0 +1,10 @@
+#ifndef PARSEF_H_
+#define PARSEF_H_
+#include "fmte.h"
+#include "syntax.h"
+#include "log.h"
+
+void get_longarg(wchar_t **, wchar_t **, wchar_t, size_t *);
+struct fmte *parsef(wchar_t **);
+
+#endif

data/ext/alt_printf/strbuf.c

@@ -1,11 +1,4 @@
-#define _XOPEN_SOURCE
-#include <locale.h>
-#include <limits.h>
 #include "strbuf.h"
-#include "log.h"
-
-#define STRBUF_INI_SIZE 5
-#define STRBUF_GROW_STEP 100
 
 extern struct lconv *locale_info;
 
@@ -13,14 +6,14 @@ struct strbuf *strbuf_new() {
 	struct strbuf *sb = malloc(sizeof(struct strbuf));
 
 	if (NULL == sb) {
-		LOG("can't alloc memory for new strbuf", NULL);
+		LOG("can't alloc memory for new strbuf\n");
 		exit(1);
 	}
 
 	sb->start = sb->end = calloc(STRBUF_INI_SIZE, sizeof(wchar_t));
 
 	if (NULL == sb->start) {
-		LOG("can't alloc memory for new strbuf string", NULL);
+		LOG("can't alloc memory for new strbuf string\n");
 		exit(1);
 	}
 
@@ -74,14 +67,13 @@ void strbuf_append_strbuf(struct strbuf *sb, void *sbuf)
 	}
 }
 
-void strbuf_appendw_strbuf(struct strbuf *sb, void *sbuf, long w)
-{
+void strbuf_appendw_strbuf(struct strbuf *sb, void *sbuf, long w) {
 	wchar_t *pos;
 	long ws = 0;
 	struct strbuf *frm = sbuf;
 	LOG("frm->start: %p | frm->end: %p\n", frm->start, frm->end);
 
-	for (pos = frm->start;pos<=frm->end;pos++) {
+	for (pos = frm->start; pos<=frm->end; pos++) {
 		ws += wcwidth(*pos);
 		LOG("new width would be: %ld, requested width: %ld\n", ws, w);
 		if (ws > w) break;
@@ -89,21 +81,30 @@ void strbuf_appendw_strbuf(struct strbuf *sb, void *sbuf, long w)
 	}
 }
 
-void strbuf_append_char(struct strbuf *sb, void *chr)
-{
+void strbuf_append_char(struct strbuf *sb, void *chr) {
 	wint_t *c = chr;
 	strbuf_append(sb, *c);
 }
 
-void strbuf_append_str(struct strbuf *sb, void *str, int maxwidth)
-{
+void strbuf_append_str(struct strbuf *sb, void *str, int maxwidth) {
 	wchar_t *s = str;
 	wchar_t *end = &s[wcslen(s)];
 	int width = 0;
+	int maxlen = -1;
+
+	if (maxwidth < 0) {
+		maxlen = maxwidth * -1;
+	}
 
 	for (;s<end;s++) {
-		width += wcwidth(*s);
-		if (width > maxwidth) return;
+		if (maxlen >= 0) {
+			width++;
+			if (width > maxlen) return;
+		} else {
+			width += wcwidth(*s);
+			if (width > maxwidth) return;
+		}
+
 		strbuf_append(sb, *s);
 	}
 }
@@ -111,20 +112,37 @@ void strbuf_append_str(struct strbuf *sb, void *str, int maxwidth)
 void strbuf_append_int(struct strbuf *sb, void *in)
 {
 	long int *i = in;
-	wchar_t wcs[50];
-	swprintf(wcs, 50, L"%ld", *i);
-	strbuf_append_str(sb, wcs, 50);
+	wchar_t wcs[TMPLEN];
+	long len = swprintf(wcs, TMPLEN - 1, L"%ld", *i);
+	if (len < 0) {
+		strbuf_append_str(sb, L"error adding int", 16);
+	} else {
+		strbuf_append_str(sb, wcs, -1 * len);
+	}
 }
 
 void strbuf_append_double(struct strbuf *sb, void *dub, int prec)
 {
 	double *d = dub;
-	wchar_t wcs[50];
-	wchar_t format[30];
-	swprintf(format, 30, L"%%.%ldf", prec);
+	wchar_t wcs[TMPLEN];
+	wchar_t format[TMPLEN];
+	int rprec = prec;
+
+	if (rprec > MAXPREC) rprec = MAXPREC;
+
+	swprintf(format, TMPLEN - 1, L"%%.%ldf", rprec);
+
 	LOG("format: %ls\n", format);
-	swprintf(wcs, 50, format, *d);
-	strbuf_append_str(sb, wcs, 50);
+
+	long len = swprintf(wcs, TMPLEN - 1, format, *d);
+	if (len < 0) {
+		strbuf_append_str(sb, L"error adding float", 18);
+	} else {
+		LOG("inserting double: len: %ld\n", len);
+		strbuf_append_str(sb, wcs, len);
+
+		if (rprec < prec) strbuf_pad(sb, L'0', rprec - prec);
+	}
 }
 
 void strbuf_pad(struct strbuf *sb, wchar_t pc, int amnt)

data/ext/alt_printf/strbuf.h

@@ -1,10 +1,19 @@
 #ifndef STRBUF_H
 #define STRBUF_H
+
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
+
 #include <wchar.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include <stdio.h>
+#include "log.h"
+
+#define STRBUF_INI_SIZE 5
+#define STRBUF_GROW_STEP 100
+#define TMPLEN 50
+#define MAXPREC 25
 
 struct strbuf *strbuf_new();
 void strbuf_destroy(struct strbuf *sb);

data/ext/alt_printf/syntax.h

@@ -16,14 +16,17 @@
 #define FS_T_TERN   '?'
 #define FS_T_ALIGN  '='
 
-#define FS_A_STRINGSTART '('
-#define FS_A_STRINGEND   ')'
+#define FS_A_PARENARG_S '('
+#define FS_A_PARENARG_E ')'
+#define FS_A_ANGLEARG_S '<'
+#define FS_A_ANGLEARG_E '>'
+
 #define FS_A_CHARARG     '~'
 #define FS_A_LALIGN      '-'
+#define FS_A_CALIGN      '^'
 #define FS_A_SPAD        ' '
-
-#define FS_A_RBHASHSTART '<'
-#define FS_A_RBHASHEND   '>'
+#define FS_A_ZPAD        '0'
+#define FS_A_PREC        '.'
 
 #define FS_D_PREC   100
 

data/lib/alt_printf/version.rb

@@ -1,3 +1,3 @@
 module AltPrintf
-  VERSION = [0, 1, 3]
+  VERSION = [0, 1, 4]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alt_printf
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Stone Tickle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -50,14 +50,20 @@ files:
 - Rakefile
 - alt_printf.gemspec
 - ext/alt_printf/alt_printf.c
-- ext/alt_printf/altprintf.c
 - ext/alt_printf/altprintf.h
+- ext/alt_printf/enums.h
 - ext/alt_printf/extconf.h
 - ext/alt_printf/extconf.rb
+- ext/alt_printf/extconf_debug.rb
 - ext/alt_printf/extconf_dev.rb
-- ext/alt_printf/list.c
-- ext/alt_printf/list.h
+- ext/alt_printf/extconf_helper.rb
+- ext/alt_printf/fmt.c
+- ext/alt_printf/fmt.h
+- ext/alt_printf/fmte.c
+- ext/alt_printf/fmte.h
 - ext/alt_printf/log.h
+- ext/alt_printf/parsef.c
+- ext/alt_printf/parsef.h
 - ext/alt_printf/strbuf.c
 - ext/alt_printf/strbuf.h
 - ext/alt_printf/syntax.h
@@ -76,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.3
+      version: 2.5.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ext/alt_printf/altprintf.c

@@ -1,250 +0,0 @@
-#include "syntax.h"
-#include "altprintf.h"
-#include "log.h"
-
-void default_format(struct format *f) {
-	struct width width = {.prec = -1, .pad = 0};
-	f->stringarg_start = NULL;
-	f->stringarg_end = NULL;
-	f->chararg = L':';
-	f->padchar = L' ';
-	f->align = Right;
-	f->width = width;
-	f->le = NULL;
-}
-
-void format_mul(struct strbuf *sb, struct format *f)
-{
-	long int *i = f->le->data;
-	strbuf_pad(sb, f->chararg, *i);
-}
-void format_tern(struct strbuf *sb, struct format *f)
-{
-	long int *b = f->le->data;
-	int first_half = 1;
-	wchar_t sep = f->chararg;
-	wchar_t *p = f->stringarg_start;
-	for (;p<=f->stringarg_end;p++) {
-		LOG("*p: %lc, first half? %d, bool: %ld, sep: %lc\n", (wint_t)*p, first_half, *b, (wint_t)sep);
-		if (*p == sep) first_half = 0;
-		else if (*b && first_half) strbuf_append_char(sb, p);
-		else if (!*b && !first_half) strbuf_append_char(sb, p);
-	}
-}
-
-void format_string(struct strbuf *sb, struct format *f)
-{
-	int prec = f->width.prec == -1 ? 100000000 : f->width.prec;
-	strbuf_append_str(sb, f->le->data, prec);
-}
-void format_char(struct strbuf *sb, struct format *f)
-{
-	strbuf_append_char(sb, f->le->data);
-}
-void format_int(struct strbuf *sb, struct format *f)
-{
-	strbuf_append_int(sb, f->le->data);
-}
-void format_double(struct strbuf *sb, struct format *f)
-{
-	int prec = f->width.prec == -1 ? 3 : f->width.prec;
-	strbuf_append_double(sb, f->le->data, prec);
-}
-
-void format(struct strbuf *sb, struct format *f, void (*to_s)(struct strbuf *, struct format *))
-{
-	struct strbuf *tmp = strbuf_new();
-	to_s(tmp, f);
-
-	if (tmp->len == 0) return;
-
-	int pad = f->width.pad - tmp->width;
-
-	if (pad > 0) {
-		LOG("padding: %d\n", pad);
-		switch(f->align) {
-		case Right:
-			strbuf_append_strbuf(sb, tmp);
-			strbuf_pad(sb, f->padchar, pad);
-			break;
-		case Left:
-			strbuf_pad(sb, f->padchar, pad);
-			strbuf_append_strbuf(sb, tmp);
-			break;
-		case Center:
-			strbuf_pad(sb, f->padchar, pad/2);
-			strbuf_append_strbuf(sb, tmp);
-			strbuf_pad(sb, f->padchar, pad/2 + pad%2);
-			break;
-		}
-	} else {
-		strbuf_append_strbuf(sb, tmp);
-	}
-
-	strbuf_destroy(tmp);
-}
-
-wchar_t *altsprintf(wchar_t *fmt, struct list_elem *le) {
-	int lvl = 0;
-	int split = 0;
-	struct strbuf *sbs[] = {strbuf_new(), strbuf_new()};
-	struct strbuf *sb = sbs[0];
-	wchar_t *end = &fmt[wcslen(fmt)];
-	wchar_t *jump;
-
-	void (*append_func)(struct strbuf *, struct format *);
-	struct format f;
-	long int *number_p = NULL;
-	long int *width;
-	wint_t split_pad = L' ';
-
-	for (;fmt<end;fmt++) {
-		LOG("checking char '%lc', lvl: '%d'\n", (wint_t)(*fmt), lvl);
-		switch (lvl) {
-		case 0:
-			switch(*fmt) {
-			case FS_START:
-				default_format(&f);
-				lvl = 1;
-				break;
-			case FS_ESC:
-				lvl = 3;
-				break;
-			default:
-				strbuf_append(sb, *fmt);
-				break;
-			}; break;
-		case 1:
-			switch(*fmt) {
-			/* special arguments */
-			case FS_A_RBHASHSTART:
-				while (fmt < end && *fmt != FS_A_RBHASHEND) fmt++;
-				break;
-			case FS_A_STRINGSTART:
-				f.stringarg_start = fmt + 1;
-				lvl = 2;
-				break;
-			case FS_A_CHARARG:
-				f.chararg = *(fmt+1);
-				fmt += 1;
-				break;
-
-			/* standard arguments */
-			case FS_A_LALIGN:
-				f.align = Left;
-				break;
-			case FS_A_SPAD:
-				f.padchar = FS_A_SPAD;
-				break;
-			case 0:
-				f.padchar = '0';
-				break;
-			case '.':
-				number_p = &f.width.prec;
-				fmt++;
-			case '1': case '2': case '3': case '4': case '5':
-			case '6': case '7': case '8': case '9':
-				if (number_p == NULL) number_p = &f.width.pad;
-				*number_p = wcstol(fmt, &jump, 10);
-				fmt = (jump-1);
-				break;
-
-			/* align operator */
-			case FS_T_ALIGN:
-				if (le != NULL && le->type != Null) {
-					width = le->data;
-					le = le->next;
-				} else {
-					goto no_more_args;
-				}
-
-				split = 1;
-				split_pad = f.chararg;
-				sb = sbs[1];
-				lvl = 0;
-				break;
-
-			/* types */
-			case FS_T_STRING:
-				append_func = format_string;
-				goto match;
-			case FS_T_TERN:
-				append_func = format_tern;
-				goto match;
-			case FS_T_INT:
-				append_func = format_int;
-				goto match;
-			case FS_T_MUL:
-				append_func = format_mul;
-				goto match;
-			case FS_T_CHAR:
-				append_func = format_char;
-				goto match;
-			case FS_T_DOUBLE:
-				append_func = format_double;
-			match:
-				if (le != NULL && le->type != Null) {
-					f.le = le;
-					format(sb, &f, append_func);
-					le = le->next;
-				}
-				lvl = 0;
-				break;
-			case FS_START:
-				strbuf_append(sb, FS_START);
-				lvl = 0;
-				break;
-			default:
-				lvl = 0;
-				break;
-			}; break;
-		case 2:
-			if (*fmt == FS_A_STRINGEND) {
-				f.stringarg_end = fmt - 1;
-				lvl = 1;
-			}; break;
-		case 3:
-			switch(*fmt) {
-			case FS_ESC_NL:
-				strbuf_append(sb, '\n');
-				break;
-			case FS_ESC_ESC:
-				strbuf_append(sb, '\e');
-				break;
-			default:
-				strbuf_append(sb, *fmt);
-				break;
-			};
-			lvl = 0;
-			break;
-		}
-	}
-
-	wchar_t *str;
-no_more_args:
-	if (split) {
-		LOG("splitting string\n");
-		lvl = *width - (sbs[0]->width + sbs[1]->width);
-		if (lvl >= 0) {
-			LOG("padding center\n");
-			strbuf_pad(sbs[0], split_pad, lvl);
-			strbuf_append_strbuf(sbs[0], sbs[1]);
-		} else if (sbs[0]->width > *width) {
-			LOG("the first half is longer than the requested with\n");
-			strbuf_destroy(sbs[1]);
-			sbs[1] = sbs[0];
-			sbs[0] = strbuf_new();
-			strbuf_appendw_strbuf(sbs[0], sbs[1], *width);
-		} else {
-			LOG("just shave some off the last half\n");
-			strbuf_appendw_strbuf(sbs[0], sbs[1], *width - sbs[0]->width);
-		}
-	}
-
-	str = strbuf_cstr(sbs[0]);
-
-	strbuf_destroy(sbs[0]);
-	strbuf_destroy(sbs[1]);
-
-	return str;
-}