alt_printf 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163e28af3e2feea3074475a4c2ca580c052b0cc4230aec9d9f0369d3f3104bc2
-  data.tar.gz: 3b03df1875de9f25671b3c03886ee47f71ee7b22871234295fbab88ce1304733
+  metadata.gz: 35403cb6b05ff5261a51180f48e16840860e28e8e49e6ce7f58fc5bd005a280e
+  data.tar.gz: fd7fe644f7d76dadc0780f98f6871fe6b08e31dad97ae5e3ef03877753c88bfd
 SHA512:
-  metadata.gz: 2e3f110f3be6ab310efbe8024711442b0d35be448ec569ce9ed2eaeee5af95b87ebe47728524174b3de3eb150cf248cf630633cec2d9f0ee7b484e196cef12de
-  data.tar.gz: afb0850d89c6b05a2404a1c40721ba7b81ba84782ac1ef68c4a29fb4f7ea3b00566a956632c579e6306e62682d80b40a6698eaaa2dc97a832fc24844d76a0baa
+  metadata.gz: b408f3e40e812c8d420bf03749a0fd07136a1a8849af5011a855464602163cf7e2bc3a824c0b7565e410c856b0078d8ee01ccee744f65ca8c68b7d425eaa3a83
+  data.tar.gz: ea0811bf28ad00219a1218a3c915248526f1b01707bda152a289ddd6c78aa368a06ae073bbeb90dd1dd31c4301cca1f27cb62eefb643e494d096ded65bb6a12c

data/Rakefile

@@ -10,6 +10,7 @@ Rake::ExtensionTask.new('alt_printf') do |ext|
   ext.config_script = 'extconf_dev.rb'
 end
 
+desc 'copy necessary C files from ../src and build the resulting gem'
 task :build_gem do
   tmp_dir = "/tmp/alt_printf_#{SecureRandom.hex(8)}"
   puts "cloning to #{tmp_dir}"
@@ -46,6 +47,7 @@ task :build_gem do
   FileUtils.rm_rf(tmp_dir)
 end
 
+desc 'uses build_gem and pushes the resulting gem'
 task publish: :build_gem do
   load File.join(__dir__, 'alt_printf.gemspec')
 

data/alt_printf.gemspec

@@ -8,7 +8,7 @@ AltPrintf::SPEC = Gem::Specification.new do |s|
   s.summary       = 'A powerful printf-like template language'
   s.authors       = ['Stone Tickle']
   s.email         = 'lattis@mochiro.moe'
-  s.homepage      = 'https://github.com/annacrombie/alt_printf/gem'
+  s.homepage      = 'https://github.com/annacrombie/altprintf/gem'
   s.license       = 'MIT'
 
   s.files         = Dir['{**/*}']

data/ext/alt_printf/alt_printf.c

@@ -96,14 +96,26 @@ struct list_elem *rb_altprintf_make_list(const wchar_t *fmt, VALUE *argv, long *
 					use_hash++;
 				}
 
-				len = wcsnrtombs(NULL, &fmt, use_hash, 0, NULL);
+				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("cstr: '%s'\n", cstr);
+
+				LOG("symbol | cstr: '%s', len %d\n", cstr, len);
 
 				symbol = rb_check_symbol_cstr(cstr, len, enc);
 				entry = rb_hash_lookup2(*hash, symbol, Qnil);
-				free(cstr);
+
+				if (entry == Qnil) {
+					rb_raise(
+						rb_eKeyError,
+						"no such key :%s",
+						cstr
+					);
+					free(cstr);
+				}
+
 				use_hash = 1;
 
 				break;
@@ -116,8 +128,19 @@ struct list_elem *rb_altprintf_make_list(const wchar_t *fmt, VALUE *argv, long *
 				tmp_str = rbstowcs(entry);
 				le_cur = list_elem_ini(tmp_str, String);
 				goto match;
-			case FS_T_MUL:
 			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;
@@ -173,6 +196,11 @@ VALUE rb_alt_printf(long passes, size_t argc, VALUE *argv, VALUE self) {
 
 	rb_scan_args(argc, argv, "1*:", &fmt, &args, &hash);
 
+	if (hash == Qnil && RB_TYPE_P(argv[argc - 1], T_HASH)) {
+		hash = argv[argc - 1];
+		argc--;
+	}
+
 	if (passes == 0) return fmt;
 
 	wfmt = rbstowcs(fmt);
@@ -181,6 +209,9 @@ VALUE rb_alt_printf(long passes, size_t argc, VALUE *argv, VALUE self) {
 	while (passes > 0) {
 		ap = rb_altprintf_make_list(wfmt, &args, &argi, &hash);
 
+		//list_elem_inspect_all(ap);
+		LOG("wfmt: %ls\n", wfmt);
+
 		formatted = altsprintf(wfmt, ap);
 		LOG("formatted result: '%ls'\n", formatted);
 
@@ -207,7 +238,13 @@ VALUE rb_alt_printf_single_pass(size_t argc, VALUE *argv, VALUE self) {
 VALUE rb_alt_printf_multi_pass(size_t argc, VALUE *argv, VALUE self) {
 	long passes;
 
-	passes = FIX2LONG(argv[0]);
+
+	if (RB_TYPE_P(argv[0], T_FIXNUM)) {
+		passes = FIX2LONG(argv[0]);
+	} else {
+		rb_raise(rb_eArgError, "integer expected");
+		return Qnil;
+	}
 
 	LOG("passes: %ld\n", passes);
 	return rb_alt_printf(passes, argc - 1, &argv[1], self);

data/ext/alt_printf/altprintf.c

@@ -117,6 +117,9 @@ wchar_t *altsprintf(wchar_t *fmt, struct list_elem *le) {
 		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;
@@ -191,6 +194,9 @@ wchar_t *altsprintf(wchar_t *fmt, struct list_elem *le) {
 				strbuf_append(sb, FS_START);
 				lvl = 0;
 				break;
+			default:
+				lvl = 0;
+				break;
 			}; break;
 		case 2:
 			if (*fmt == FS_A_STRINGEND) {

data/lib/alt_printf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alt_printf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Stone Tickle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -52,6 +52,7 @@ files:
 - ext/alt_printf/alt_printf.c
 - ext/alt_printf/altprintf.c
 - ext/alt_printf/altprintf.h
+- ext/alt_printf/extconf.h
 - ext/alt_printf/extconf.rb
 - ext/alt_printf/extconf_dev.rb
 - ext/alt_printf/list.c
@@ -63,7 +64,7 @@ files:
 - lib/alt_printf.rb
 - lib/alt_printf/alt_printf.so
 - lib/alt_printf/version.rb
-homepage: https://github.com/annacrombie/alt_printf/gem
+homepage: https://github.com/annacrombie/altprintf/gem
 licenses:
 - MIT
 metadata: {}