decode merged

Author: themasch

lib/decode.js

@@ -57,7 +57,7 @@ decode.dictionary = function() {
   var dict = {}
 
   while( decode.data[decode.position] !== 0x65 ) {
-    dict[ decode.next() ] = decode.next()
+    dict[ decode.bytes() ] = decode.next()
   }
 
   decode.position++
@@ -85,7 +85,7 @@ decode.list = function() {
 decode.integer = function() {
 
   var end    = decode.find( 0x65 )
-  var number = decode.data.slice( decode.position+1, end )
+  var number = +decode.data.toString('ascii', decode.position+1, end )
 
   decode.position += end + 1 - decode.position
 
@@ -96,15 +96,14 @@ decode.integer = function() {
 decode.bytes = function() {
 
   var sep    = decode.find( 0x3A )
-  var length = +decode.data.slice( decode.position, sep ).toString()
-  var sepl   = ++sep + length
-  var bytes  = decode.data.slice( sep, sepl )
+  var length = +decode.data.toString('ascii', decode.position, sep )
+  var end    = ++sep + length
 
-  decode.position += sepl - decode.position
+  decode.position += end - decode.position
 
   return decode.encoding
-    ? bytes.toString( decode.encoding )
-    : bytes
+            ? decode.data.toString(decode.encoding, sep, end )
+            : decode.data.slice( sep, end )
 
 }