berns 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f1a44554212d5fc783feab767f7926e7d55d0d12ad23ad876748a547a128c5
-  data.tar.gz: 93f10d934d9f140d1604dbebbdd380f34997f0531abb5c1f8fe41249a22152df
+  metadata.gz: bce7bd3384f01f587a75bd722cca156b4357e0953bd90a5a2c8f97a630deb8db
+  data.tar.gz: 2c830eb788274a6d96e3e0a7db0e75826dea451eabecb3444878901d6e1adb08
 SHA512:
-  metadata.gz: 459194492b7223b9e27a39f07009644f4b06a1b64cbcfdfc50b40b71ad51fbf2196f97bf1cb0f1212ded8a042b925b45dbfe2d98f61cc1fd0107ac0a432406c8
-  data.tar.gz: 28dd92ab04e1fa8af37b5b90cc071b1b7f1093b2275fe6e356fe48205d25ae2cbc2fd61e67555aabf60f275d6fdbd14614fc34cf5158aee73e1384c126cf1e45
+  metadata.gz: d20138c2bc54ab035eb9d79f1e0ae18065ba422157fa453258acd5d974f08062afee105b50d2d3564b3e4882b4331ec6f93e4da3a3091a1440ad8a74c10f1686
+  data.tar.gz: 598843f7a87302d0a59ba53d8e52caf0f864a2e146b473c2d95b50f1da5b11536603f4d9f51f990de385bbaa08fb6e273381672eb823ddda2b0bb614532aef33

data/ext/berns/berns.c

@@ -51,7 +51,7 @@ static const size_t sllen = 1;
     rb_check_arity(argc, 0, 1); \
     \
     char *tag = #element_name; \
-    char *string = void_element(tag, strlen(tag), &argv[0]); \
+    char *string = void_element(tag, strlen(tag), argv[0]); \
     VALUE rstring = rb_utf8_str_new_cstr(string); \
     free(string); \
     \
@@ -67,7 +67,7 @@ static const size_t sllen = 1;
     \
     CONTENT_FROM_BLOCK; \
     char *tag = #element_name; \
-    char *string = element(tag, strlen(tag), RSTRING_PTR(content), RSTRING_LEN(content), &argv[0]); \
+    char *string = element(tag, strlen(tag), RSTRING_PTR(content), RSTRING_LEN(content), argv[0]); \
     VALUE rstring = rb_utf8_str_new_cstr(string); \
     free(string); \
     \
@@ -168,21 +168,21 @@ static char * string_value_to_attribute(const char *attr, const size_t attrlen,
   }
 }
 
-static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE *value) {
-  if (TYPE(*value) == T_IMEMO) {
+static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE value) {
+  if (TYPE(value) == T_IMEMO) {
     return strdup("");
   }
 
-  Check_Type(*value, T_HASH);
+  Check_Type(value, T_HASH);
 
-  if (rb_hash_size(*value) == 1) {
+  if (rb_hash_size(value) == 1) {
     return strdup("");
   }
 
   VALUE subkey;
   VALUE subvalue;
 
-  const VALUE keys = rb_funcall(*value, rb_intern("keys"), 0);
+  const VALUE keys = rb_funcall(value, rb_intern("keys"), 0);
   const VALUE length = RARRAY_LEN(keys);
 
   size_t allocated = 256;
@@ -194,7 +194,7 @@ static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE *v
 
   for (unsigned int i = 0; i < length; i++) {
     subkey = rb_ary_entry(keys, i);
-    subvalue = rb_hash_aref(*value, subkey);
+    subvalue = rb_hash_aref(value, subkey);
 
     switch(TYPE(subkey)) {
       case T_STRING:
@@ -243,6 +243,8 @@ static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE *v
         combined = strdup("");
         break;
 
+      case T_NIL:
+        /* Fall through. */
       case T_TRUE:
         combined = string_value_to_attribute(subattr, subattr_len, "", 0);
         break;
@@ -256,13 +258,8 @@ static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE *v
         combined = string_value_to_attribute(subattr, subattr_len, RSTRING_PTR(subvalue), RSTRING_LEN(subvalue));
         break;
 
-      case T_NIL:
-        subvalue = rb_utf8_str_new_cstr("");
-        combined = string_value_to_attribute(subattr, subattr_len, RSTRING_PTR(subvalue), RSTRING_LEN(subvalue));
-        break;
-
       case T_HASH:
-        combined = hash_value_to_attribute(subattr, subattr_len, &subvalue);
+        combined = hash_value_to_attribute(subattr, subattr_len, subvalue);
         break;
 
       default:
@@ -313,7 +310,7 @@ static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE *v
 /*
  * Convert an attribute name and value into a string.
  */
-static char * to_attribute(VALUE attr, VALUE *value) {
+static char * to_attribute(VALUE attr, VALUE value) {
   switch(TYPE(attr)) {
     case T_SYMBOL:
       attr = rb_sym2str(attr);
@@ -327,7 +324,7 @@ static char * to_attribute(VALUE attr, VALUE *value) {
   char *val = NULL;
   VALUE str;
 
-  switch(TYPE(*value)) {
+  switch(TYPE(value)) {
     case T_NIL:
     case T_TRUE:
       val = empty_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr));
@@ -339,14 +336,14 @@ static char * to_attribute(VALUE attr, VALUE *value) {
       val = hash_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr), value);
       break;
     case T_STRING:
-      val = string_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr), RSTRING_PTR(*value), RSTRING_LEN(*value));
+      val = string_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr), RSTRING_PTR(value), RSTRING_LEN(value));
       break;
     case T_SYMBOL:
-      str = rb_sym2str(*value);
+      str = rb_sym2str(value);
       val = string_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr), RSTRING_PTR(str), RSTRING_LEN(str));
       break;
     default:
-      str = rb_funcall(*value, rb_intern("to_s"), 0);
+      str = rb_funcall(value, rb_intern("to_s"), 0);
       val = string_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr), RSTRING_PTR(str), RSTRING_LEN(str));
       break;
   }
@@ -372,7 +369,7 @@ static VALUE external_to_attribute(RB_UNUSED_VAR(VALUE self), VALUE attr, VALUE
 
   StringValue(attr);
 
-  char *val = to_attribute(attr, &value);
+  char *val = to_attribute(attr, value);
   VALUE rstring = rb_utf8_str_new_cstr(val);
   free(val);
 
@@ -393,7 +390,7 @@ static VALUE external_to_attributes(RB_UNUSED_VAR(VALUE self), VALUE attributes)
   }
 
   char *empty = "";
-  char *attrs = hash_value_to_attribute(empty, 0, &attributes);
+  char *attrs = hash_value_to_attribute(empty, 0, attributes);
 
   VALUE rstring = rb_utf8_str_new_cstr(attrs);
   free(attrs);
@@ -401,9 +398,9 @@ static VALUE external_to_attributes(RB_UNUSED_VAR(VALUE self), VALUE attributes)
   return rstring;
 }
 
-static char * void_element(char *tag, size_t tlen, VALUE *attributes) {
+static char * void_element(char *tag, size_t tlen, VALUE attributes) {
   /* T_IMEMO is what we get if an optional argument was not passed. */
-  if (TYPE(*attributes) == T_IMEMO) {
+  if (TYPE(attributes) == T_IMEMO) {
     size_t total = tag_olen + tlen + tag_clen + 1;
     char *string = malloc(total);
     char *ptr;
@@ -454,7 +451,7 @@ static VALUE external_void_element(int argc, VALUE *arguments, RB_UNUSED_VAR(VAL
 
   StringValue(tag);
 
-  char *string = void_element(RSTRING_PTR(tag), RSTRING_LEN(tag), &attributes);
+  char *string = void_element(RSTRING_PTR(tag), RSTRING_LEN(tag), attributes);
   VALUE rstring = rb_utf8_str_new_cstr(string);
 
   free(string);
@@ -462,7 +459,7 @@ static VALUE external_void_element(int argc, VALUE *arguments, RB_UNUSED_VAR(VAL
   return rstring;
 }
 
-static char * element(char *tag, size_t tlen, char *content, size_t conlen, VALUE *attributes) {
+static char * element(char *tag, size_t tlen, char *content, size_t conlen, VALUE attributes) {
   char *empty = "";
   char *attrs = hash_value_to_attribute(empty, 0, attributes);
   size_t alen = strlen(attrs);
@@ -529,7 +526,7 @@ static VALUE external_element(int argc, VALUE *arguments, RB_UNUSED_VAR(VALUE se
 
   CONTENT_FROM_BLOCK;
 
-  char *string = element(RSTRING_PTR(tag), RSTRING_LEN(tag), RSTRING_PTR(content), RSTRING_LEN(content), &attributes);
+  char *string = element(RSTRING_PTR(tag), RSTRING_LEN(tag), RSTRING_PTR(content), RSTRING_LEN(content), attributes);
   VALUE rstring = rb_utf8_str_new_cstr(string);
   free(string);
 

data/lib/berns/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Berns
-  VERSION = '3.1.3'
+  VERSION = '3.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berns
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips