alt_printf 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35403cb6b05ff5261a51180f48e16840860e28e8e49e6ce7f58fc5bd005a280e
-  data.tar.gz: fd7fe644f7d76dadc0780f98f6871fe6b08e31dad97ae5e3ef03877753c88bfd
+  metadata.gz: 21ad918ab6294134e9518f00a5668eafc8589d2bd434cd151544407cf771ed1f
+  data.tar.gz: 50f52442cef28318a12c87a14c7d4d4ce1d61b086e898811ff038995f4202018
 SHA512:
-  metadata.gz: b408f3e40e812c8d420bf03749a0fd07136a1a8849af5011a855464602163cf7e2bc3a824c0b7565e410c856b0078d8ee01ccee744f65ca8c68b7d425eaa3a83
-  data.tar.gz: ea0811bf28ad00219a1218a3c915248526f1b01707bda152a289ddd6c78aa368a06ae073bbeb90dd1dd31c4301cca1f27cb62eefb643e494d096ded65bb6a12c
+  metadata.gz: b6a76f53245ab159d89fed59ef4c2026c813a0a3fbde2fdc6ee4508238f1ce7b634641a582fdba85f929f3d882914ebebc812cb33adfcdb767ba3aaaf22d8858
+  data.tar.gz: d049337a26d25eace4667bda2a040cad2066bd51d09a7e22aa3d36b8e39dbd1364e3b34940d0c731b206e7c379a2a58b3cb39476c7c22e31f6a2ddfffa4c7e8d

data/Rakefile

@@ -7,7 +7,13 @@ SRC_DIR = File.join(__dir__, '../src')
 
 Rake::ExtensionTask.new('alt_printf') do |ext|
   ext.lib_dir = 'lib/alt_printf'
-  ext.config_script = 'extconf_dev.rb'
+  ext.config_script =
+    case ENV['GEM_DEBUG']
+    when nil
+      'extconf_dev.rb'
+    else
+      'extconf_debug.rb'
+    end
 end
 
 desc 'copy necessary C files from ../src and build the resulting gem'
@@ -31,7 +37,7 @@ task :build_gem do
   end
 
   FileUtils.cp_r(
-    %w[altprintf list log strbuf syntax].map do |w|
+    %w[altprintf fmt fmte parsef strbuf enums log syntax].map do |w|
       %w[h c].map { |e| File.join(SRC_DIR, "#{w}.#{e}") }
         .select { |f| File.exist?(f) }
     end.flatten,

data/alt_printf.gemspec

@@ -17,7 +17,7 @@ AltPrintf::SPEC = Gem::Specification.new do |s|
   s.extensions = Dir["ext/**/extconf.rb"]
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.6.3'
+  s.required_ruby_version = '>= 2.5.5'
 
   s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rake', '~> 12.3'

data/ext/alt_printf/alt_printf.c

@@ -1,19 +1,16 @@
+#ifdef _FORTIFY_SOURCE
+#undef _FORTIFY_SOURCE
+#endif
+
+#include "extconf.h"
 #include <stdio.h>
 #include <locale.h>
 #include <wchar.h>
 #include <ruby.h>
 #include <ruby/encoding.h>
-#include "extconf.h"
-#include "list.h"
 #include "altprintf.h"
 #include "log.h"
 
-#define CHECKARG                              \
-if (!use_hash) {                              \
-	if (*argi >= argc) goto no_more_args; \
-	entry = rb_ary_entry(*argv, *argi);   \
-}
-
 #define MODNAME "AltPrintf"
 
 rb_encoding *enc;
@@ -40,11 +37,18 @@ VALUE wcstorbs(const wchar_t *wstr) {
 	char *cstr;
 	VALUE str;
 
+	LOG("converting wcs to rbs\n");
+	LOG("wcs: '%ls'\n\n", wstr);
+
 	len = wcsrtombs(NULL, &wstr, 0, NULL);
+	LOG("len: %d\n", len);
 	cstr = calloc(len, sizeof(wchar_t));
 	wcsrtombs(cstr, &wstr, len, NULL);
+	LOG("cstr: '%s'\n", cstr);
 
-	LOG("wcs to rbs, len: %d, cstr: '%s'\n", len, cstr);
+	LOG("wcs to rbs, len: %d, wcs: %ls, mbs: '%s'\n", len, wstr, cstr);
+
+	if (len == (size_t)-1) return Qnil;
 
 	str = rb_external_str_new_with_enc(cstr, len, enc);
 	free(cstr);
@@ -52,147 +56,134 @@ VALUE wcstorbs(const wchar_t *wstr) {
 	return str;
 }
 
-struct list_elem *rb_altprintf_make_list(const wchar_t *fmt, VALUE *argv, long *argi, VALUE *hash) {
-	struct list_elem *le_cur;
-	struct list_elem *le_start;
-	struct list_elem *le_prev;
-	/* create a dummy element as the head */
-	le_start = le_prev = list_elem_create();
+VALUE get_entry(struct fmte *f, VALUE *argv, long *argi, VALUE *hash) {
+	VALUE sym, entry;
+	size_t len;
+	const wchar_t *tmpw;
+	char *cstr;
+
+	LOG("getting entry\n");
 
-	VALUE entry, symbol;
+	if (f->anglearg_len == 0) {
+		LOG("getting from argv[%ld]\n", *argi);
+		entry = rb_ary_entry(*argv, *argi);
+		(*argi)++;
+		return entry;
+	}
 
-	long int *tmp_int;
-	wint_t *tmp_char;
-	double *tmp_double;
-	const wchar_t *tmp_str;
+	LOG("getting from hash\n");
 
-	char *cstr;
-	size_t len;
+	//fmte_inspect(f);
+
+	tmpw = f->anglearg_start;
+	len = wcsnrtombs(NULL, &tmpw, f->anglearg_len, 0, NULL);
+	LOG("allocating %d, maxlen %d\n", len, f->anglearg_len);
+
+	cstr = calloc(len + 1, sizeof(char));
+	wcsnrtombs(cstr, &tmpw, f->anglearg_len, len, NULL);
+	LOG("wrote cstr %s\n", cstr);
+
+	LOG("symbol | cstr: '%s', len %d\n", cstr, len);
 
-	int mode	= 0;
-	long argc = rb_array_len(*argv);
-	int use_hash = 0;
+	sym = rb_check_symbol_cstr(cstr, len, enc);
+	entry = rb_hash_lookup2(*hash, sym, Qnil);
+	if (entry == Qnil) rb_raise(rb_eKeyError, "missing key :%s", cstr);
+	free(cstr);
+
+	return entry;
+}
+
+wchar_t *rb_apformat(wchar_t *fmt, VALUE *argv, long *argi, VALUE *hash) {
+	struct fmte *f, *head;
+	wchar_t *final;
+	int loop = 1;
+	long *tmpi;
+	wint_t *tmpc;
+	wchar_t *tmps;
+	double *tmpd;
+	void *tmp;
+	VALUE entry;
 
-	const wchar_t *end = &fmt[wcslen(fmt)];
+	head = f = parsef(&fmt);
 
-	for (;fmt<end;fmt++) {
-		LOG("checking char '%lc', lvl: '%d'\n", (wint_t)(*fmt), mode);
-		if (mode == 0) {
-			switch(*fmt) {
-			case FS_START: mode = 1;
-				break;
-			}
+	while (loop) {
+		LOG("scanned type: %d\n", f->type);
+
+		if (f->type != FEnd && f->type != FRaw) {
+			entry = get_entry(f, argv, argi, hash);
 		} else {
-			switch (*fmt) {
-			case FS_A_CHARARG:
-				fmt++;
-				break;
-			case FS_A_RBHASHSTART:
-				tmp_str = fmt + 1;
-
-				use_hash = -1;
-				while (fmt < end && *fmt != FS_A_RBHASHEND) {
-					fmt++;
-					use_hash++;
-				}
-
-				LOG("use_hash: %d\n", use_hash);
-				len = wcsnrtombs(NULL, &tmp_str, use_hash, 0, NULL);
-
-				cstr = calloc(len + 1, sizeof(char));
-				wcsnrtombs(cstr, &tmp_str, use_hash, len, NULL);
-
-				LOG("symbol | cstr: '%s', len %d\n", cstr, len);
-
-				symbol = rb_check_symbol_cstr(cstr, len, enc);
-				entry = rb_hash_lookup2(*hash, symbol, Qnil);
-
-				if (entry == Qnil) {
-					rb_raise(
-						rb_eKeyError,
-						"no such key :%s",
-						cstr
-					);
-					free(cstr);
-				}
-
-				use_hash = 1;
-
-				break;
-			case FS_A_STRINGSTART:
-				while (fmt < end && *fmt != FS_A_STRINGEND) fmt++;
-				break;
-			case FS_T_STRING:
-				CHECKARG;
-
-				tmp_str = rbstowcs(entry);
-				le_cur = list_elem_ini(tmp_str, String);
-				goto match;
-			case FS_T_TERN:
-				CHECKARG;
-				tmp_int = malloc(sizeof(long int));
-				if (entry == Qfalse || entry == Qnil) {
-					*tmp_int = 0;
-				} else {
-					*tmp_int = 1;
-				}
-				LOG("got bool %ld\n", *tmp_int);
-				le_cur = list_elem_ini(tmp_int, Int);
-
-				goto match;
-			case FS_T_MUL:
-			case FS_T_ALIGN:
-			case FS_T_INT:
-				CHECKARG;
-
-				tmp_int = malloc(sizeof(long int));
-				*tmp_int = FIX2LONG(entry);
-				LOG("got int %ld\n", *tmp_int);
-				le_cur = list_elem_ini(tmp_int, Int);
-				goto match;
-			case FS_T_CHAR:
-				CHECKARG;
-
-				tmp_char = malloc(sizeof(wint_t));
-				tmp_str = rbstowcs(entry);
-				*tmp_char = btowc(tmp_str[0]);
-				le_cur = list_elem_ini(tmp_char, Char);
-				goto match;
-			case FS_T_DOUBLE:
-				CHECKARG;
-
-				tmp_double = malloc(sizeof(double));
-				*tmp_double = RFLOAT_VALUE(entry);
-				le_cur = list_elem_ini(tmp_double, Double);
-				goto match;
-			match: le_prev->next = le_cur;
-				le_prev = le_cur;
-				mode = 0;
-				(*argi)++;
-				break;
-			case FS_START:
-				mode = 0;
-				break;
-			}
+			entry = Qnil;
 		}
-	}
 
-no_more_args:
-	if (le_start->next == NULL) return le_start;
+		switch (f->type) {
+		case FString:
+			Check_Type(entry, T_STRING);
+
+			tmp = rbstowcs(entry);
+			goto match;
+		case FTern:
+			tmpi = malloc(sizeof(long));
+
+			*tmpi = (entry == Qfalse || entry == Qnil) ? 0 : 1;
+
+			tmp = tmpi;
+			goto match;
+		case FMul:
+		case FAlign:
+		case FInt:
+			Check_Type(entry, T_FIXNUM);
+
+			tmpi = malloc(sizeof(long int));
+			*tmpi = FIX2LONG(entry);
+			tmp = tmpi;
+			goto match;
+		case FChar:
+			Check_Type(entry, T_STRING);
+
+			tmpc = malloc(sizeof(wint_t));
+			tmps = rbstowcs(entry);
+			*tmpc = btowc(tmps[0]);
+			tmp = tmpc;
+			goto match;
+		case FDouble:
+			Check_Type(entry, T_FLOAT);
+
+			tmpd = malloc(sizeof(double));
+			*tmpd = RFLOAT_VALUE(entry);
+			tmp = tmpd;
+		match:
+			f->value = tmp;
+			break;
+		case FRaw:
+			break;
+		case FEnd:
+			LOG("EOS (end of string)\n");
+			loop = 0;
+			break;
+		case FNone:
+			LOG("error! shouldn' t be none\n");
+			break;
+		}
 
-	/* set cur to the 2nd element and destroy the first one */
-	le_cur = le_start->next;
-	le_start->next = NULL;
-	list_elem_destroy(le_start);
+		LOG("pushing fmt\n");
+#ifdef DEBUG
+		fmte_inspect(f);
+#endif
+		fmte_push(head, f);
+		if (loop) f = parsef(&fmt);
+	}
 
-	return le_cur;
+	LOG("got all fmt elements\n");
+	final = assemble_fmt(head);
+	fmte_destroy(head);
+	return final;
 }
 
 VALUE rb_alt_printf(long passes, size_t argc, VALUE *argv, VALUE self) {
 	VALUE fmt, args, hash, final;
 	wchar_t *wfmt;
 	wchar_t *formatted;
-	struct list_elem *ap;
+	long argi;
 
 	rb_scan_args(argc, argv, "1*:", &fmt, &args, &hash);
 
@@ -204,24 +195,22 @@ VALUE rb_alt_printf(long passes, size_t argc, VALUE *argv, VALUE self) {
 	if (passes == 0) return fmt;
 
 	wfmt = rbstowcs(fmt);
+	formatted = NULL;
 
-	long argi = 0;
-	while (passes > 0) {
-		ap = rb_altprintf_make_list(wfmt, &args, &argi, &hash);
-
-		//list_elem_inspect_all(ap);
+	argi = 0;
+	for (; passes > 0; passes--) {
 		LOG("wfmt: %ls\n", wfmt);
 
-		formatted = altsprintf(wfmt, ap);
+		formatted = rb_apformat(wfmt, &args, &argi, &hash);
+
 		LOG("formatted result: '%ls'\n", formatted);
 
 		free(wfmt);
-		list_elem_destroy(ap);
-
 		wfmt = formatted;
-		passes--;
 	}
 
+
+	LOG("final: '%ls'\n", formatted);
 	final = wcstorbs(formatted);
 
 	free(formatted);
@@ -230,8 +219,6 @@ VALUE rb_alt_printf(long passes, size_t argc, VALUE *argv, VALUE self) {
 }
 
 VALUE rb_alt_printf_single_pass(size_t argc, VALUE *argv, VALUE self) {
-	VALUE fmt, args, hash, final;
-
 	return rb_alt_printf(1, argc, argv, self);
 }
 
@@ -250,10 +237,11 @@ VALUE rb_alt_printf_multi_pass(size_t argc, VALUE *argv, VALUE self) {
 	return rb_alt_printf(passes, argc - 1, &argv[1], self);
 }
 
-void Init_alt_printf()
-{
+void Init_alt_printf() {
+	VALUE mod;
+
 	enc = rb_enc_find("UTF-8");
-	VALUE mod = rb_define_module(MODNAME);
+	mod = rb_define_module(MODNAME);
 	rb_define_module_function(mod, "fmt", rb_alt_printf_single_pass, -1);
 	rb_define_module_function(mod, "fmtm", rb_alt_printf_multi_pass, -1);
 }

data/ext/alt_printf/altprintf.h

@@ -1,42 +1,5 @@
-#ifndef ALTPRINTF_H
-#define ALTPRINTF_H
-
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <limits.h>
-#include <wchar.h>
-#include "strbuf.h"
-#include "list.h"
-#include "syntax.h"
-
-wchar_t *altsprintf(wchar_t *fmt, struct list_elem *le);
-
-enum align {
-  Left,
-  Right,
-  Center
-};
-
-struct width {
-  long int prec;
-  long int pad;
-};
-
-struct format {
-  wchar_t *stringarg_start;
-  wchar_t *stringarg_end;
-  wint_t chararg;
-  wint_t padchar;
-  enum align align;
-  struct width width;
-  struct list_elem *le;
-};
-
+#ifndef ALTPRINTF_H_
+#define ALTPRINTF_H_
+#include "parsef.h"
+#include "fmt.h"
 #endif