protobuf-generate 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5d33ecf2d7d77a5e6683308ae910c137103c6e2
-  data.tar.gz: 3b9bcae4f9cb5a4b0f8a6345a41d005fa281ca80
+  metadata.gz: 4dfc74f7688e44e7b50a3ce841ac809205633097
+  data.tar.gz: 9ba9103b05c1a65409d0b9503838f575158be164
 SHA512:
-  metadata.gz: 7f8f7ed76f4b78ccb68c64aaeb8d4f7866d90b6741cecc06856a83bfdfea1fab9a52a88f2f1eeb1e2fddeec7bf81a47a0ecf23039cb4170c3f4636c21c288fdc
-  data.tar.gz: 46bd074d37993af2b63f7ba3deb5bf4105a167f736e8b1af6d5d5cb172f0e819c8594fbf84ad8a0f9b08e707d5b69043a479c27436a3c25c7ecdf948acd57778
+  metadata.gz: 505001be4621794ff21a622971c6c6a1de00c094cffed065572fc34c3c55f62e8c88c9f8cf8370abe79a10c27363ee4398e44be9ad35c7ced92cf216eb737575
+  data.tar.gz: 0fe4e63e11eca9882642e30ca3a401fcd5b772b7e3d20b11b7b8f5c109ba3d9a2e95cbd512b8b16cdeddcd93e77d7135c64771a947749cbdacd264e1d0f6c5c8

data/lib/protobuf/generate/language/c/c.erb

@@ -176,63 +176,70 @@ static int read_raw_double(double *value, const uint8_t *buffer, int offset) {
 <% end %>
 
 static int read_raw_varint32(uint32_t *tag, const uint8_t *buffer, int offset) {
-  uint8_t result;
+  *tag = 0;
 
-  offset = read_raw_byte(&result, buffer, offset);
-  if (result >= 0) {
-    *tag = result;
-    return offset;
-  }
-  *tag = result & 0x7f;
-  offset = read_raw_byte(&result, buffer, offset);
-  if (result >= 0) {
-    *tag |= result << 7;
-  } else {
-    *tag |= (result & 0x7f) << 7;
-    offset = read_raw_byte(&result, buffer, offset);
-    if (result >= 0) {
-      *tag |= result << 14;
-    } else {
-      *tag |= (result & 0x7f) << 14;
-      offset = read_raw_byte(&result, buffer, offset);
-      if (result >= 0) {
-        *tag |= ((uint32_t)result) << 21;
-      } else {
-        *tag |= (((uint32_t)result) & 0x7f) << 21;
-        offset = read_raw_byte(&result, buffer, offset);
-        *tag |= ((uint32_t)result) << 28;
-        if (result < 0) {
-          /* Discard upper 32 bits. */
-          int i;
-          for (i = 0; i < 5; ++ i) {
-            offset = read_raw_byte(&result, buffer, offset);
-            if (result >= 0) {
-              return offset;
-            }
-          }
-          /* Invalid state. */
-        }
-      }
-    }
-  }
+  uint8_t b;
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint32_t)(b & 0x7f) << 0;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint32_t)(b & 0x7f) << 7;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint32_t)(b & 0x7f) << 14;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint32_t)(b & 0x7f) << 21;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint32_t)(b & 0x7f) << 28;
   return offset;
 }
 
 <% if type_count(:int64, :sint64, :uint64) > 0 %>
 static int read_raw_varint64(uint64_t *tag, const uint8_t *buffer, int offset) {
-  short shift = 0;
-  uint8_t b;
   *tag = 0;
-  while (shift < 64) {
-    offset = read_raw_byte(&b, buffer, offset);
-    *tag |= (uint64_t)(b & 0x7F) << shift;
-    if ((b & 0x80) == 0) {
-      return offset;
-    }
-    shift += 7;
-  }
-  /* return error code. */
-  return -1;
+
+  uint8_t b;
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 0;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 7;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 14;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 21;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 28;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 35;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 42;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 49;
+  if ((b & 0x80) == 0) return offset;
+
+  offset = read_raw_byte(&b, buffer, offset);
+  *tag |= (uint64_t)(b & 0x7f) << 56;
+  return offset;
 }
 <% end %>
 

data/protobuf-generate.gemspec

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 spec = Gem::Specification.new do |s|
   s.name        = 'protobuf-generate'
-  s.version     = '0.2.1'
+  s.version     = '0.2.2'
   s.summary     = 'A multi-language concrete protobuf code generator.'
   s.description = 'A simple PEG parser, AST and template based approach to code generation.'
   s.authors     = ['Shane Hanna']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-generate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Shane Hanna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet