wip

Author: nbbeeken

lib/buffer.js

@@ -26,7 +26,6 @@ const {
   ArrayBufferIsView,
   ArrayIsArray,
   ArrayPrototypeForEach,
-  FunctionPrototypeCall,
   MathFloor,
   MathMin,
   MathTrunc,
@@ -74,6 +73,17 @@ const {
   kStringMaxLength,
   atob: _atob,
   btoa: _btoa,
+  asciiSlice,
+  base64Slice,
+  base64urlSlice,
+  latin1Slice,
+  hexSlice,
+  ucs2Slice,
+  utf8Slice,
+  base64Write,
+  base64urlWrite,
+  hexWrite,
+  ucs2Write,
 } = internalBinding('buffer');
 const {
   constants: {
@@ -130,29 +140,15 @@ const {
   markAsUntransferable,
   addBufferPrototypeMethods,
   createUnsafeBuffer,
+  asciiWrite,
+  latin1Write,
+  utf8Write,
 } = require('internal/buffer');
 
 FastBuffer.prototype.constructor = Buffer;
 Buffer.prototype = FastBuffer.prototype;
 addBufferPrototypeMethods(Buffer.prototype);
 
-const {
-  asciiWrite,
-  latin1Write,
-  utf8Write,
-  asciiSlice,
-  base64Slice,
-  base64urlSlice,
-  latin1Slice,
-  hexSlice,
-  ucs2Slice,
-  utf8Slice,
-  base64Write,
-  base64urlWrite,
-  hexWrite,
-  ucs2Write,
-} = Buffer.prototype;
-
 const constants = ObjectDefineProperties({}, {
   MAX_LENGTH: {
     __proto__: null,
@@ -651,44 +647,44 @@ const encodingOps = {
     encoding: 'utf8',
     encodingVal: encodingsMap.utf8,
     byteLength: byteLengthUtf8,
-    write: (buf, string, offset, len) => FunctionPrototypeCall(utf8Write, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(utf8Slice, buf, start, end),
+    write: utf8Write,
+    slice: utf8Slice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfString(buf, val, byteOffset, encodingsMap.utf8, dir),
   },
   ucs2: {
     encoding: 'ucs2',
     encodingVal: encodingsMap.utf16le,
     byteLength: (string) => string.length * 2,
-    write: (buf, string, offset, len) => FunctionPrototypeCall(ucs2Write, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(ucs2Slice, buf, start, end),
+    write: ucs2Write,
+    slice: ucs2Slice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfString(buf, val, byteOffset, encodingsMap.utf16le, dir),
   },
   utf16le: {
     encoding: 'utf16le',
     encodingVal: encodingsMap.utf16le,
     byteLength: (string) => string.length * 2,
-    write: (buf, string, offset, len) => FunctionPrototypeCall(ucs2Write, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(ucs2Slice, buf, start, end),
+    write: ucs2Write,
+    slice: ucs2Slice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfString(buf, val, byteOffset, encodingsMap.utf16le, dir),
   },
   latin1: {
     encoding: 'latin1',
     encodingVal: encodingsMap.latin1,
     byteLength: (string) => string.length,
-    write: (buf, string, offset, len) => FunctionPrototypeCall(latin1Write, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(latin1Slice, buf, start, end),
+    write: latin1Write,
+    slice: latin1Slice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfString(buf, val, byteOffset, encodingsMap.latin1, dir),
   },
   ascii: {
     encoding: 'ascii',
     encodingVal: encodingsMap.ascii,
     byteLength: (string) => string.length,
-    write: (buf, string, offset, len) => FunctionPrototypeCall(asciiWrite, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(asciiSlice, buf, start, end),
+    write: asciiWrite,
+    slice: asciiSlice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfBuffer(buf,
                     fromStringFast(val, encodingOps.ascii),
@@ -700,8 +696,8 @@ const encodingOps = {
     encoding: 'base64',
     encodingVal: encodingsMap.base64,
     byteLength: (string) => base64ByteLength(string, string.length),
-    write: (buf, string, offset, len) => FunctionPrototypeCall(base64Write, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(base64Slice, buf, start, end),
+    write: base64Write,
+    slice: base64Slice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfBuffer(buf,
                     fromStringFast(val, encodingOps.base64),
@@ -713,9 +709,8 @@ const encodingOps = {
     encoding: 'base64url',
     encodingVal: encodingsMap.base64url,
     byteLength: (string) => base64ByteLength(string, string.length),
-    write: (buf, string, offset, len) =>
-      FunctionPrototypeCall(base64urlWrite, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(base64urlSlice, buf, start, end),
+    write: base64urlWrite,
+    slice: base64urlSlice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfBuffer(buf,
                     fromStringFast(val, encodingOps.base64url),
@@ -727,8 +722,8 @@ const encodingOps = {
     encoding: 'hex',
     encodingVal: encodingsMap.hex,
     byteLength: (string) => string.length >>> 1,
-    write: (buf, string, offset, len) => FunctionPrototypeCall(hexWrite, buf, string, offset, len),
-    slice: (buf, start, end) => FunctionPrototypeCall(hexSlice, buf, start, end),
+    write: hexWrite,
+    slice: hexSlice,
     indexOf: (buf, val, byteOffset, dir) =>
       indexOfBuffer(buf,
                     fromStringFast(val, encodingOps.hex),
@@ -853,7 +848,7 @@ Buffer.prototype.copy =
 // to their upper/lower bounds if the value passed is out of range.
 Buffer.prototype.toString = function toString(encoding, start, end) {
   if (arguments.length === 0) {
-    return FunctionPrototypeCall(utf8Slice, this, 0, this.length);
+    return utf8Slice(this, 0, this.length);
   }
 
   const len = this.length;
@@ -874,7 +869,7 @@ Buffer.prototype.toString = function toString(encoding, start, end) {
     return '';
 
   if (encoding === undefined)
-    return FunctionPrototypeCall(utf8Slice, this, start, end);
+    return utf8Slice(this, start, end);
 
   const ops = getEncodingOps(encoding);
   if (ops === undefined)
@@ -905,7 +900,7 @@ Buffer.prototype[customInspectSymbol] = function inspect(recurseTimes, ctx) {
   const actualMax = MathMin(max, this.length);
   const remaining = this.length - max;
   let str = StringPrototypeTrim(RegExpPrototypeSymbolReplace(
-    /(.{2})/g, FunctionPrototypeCall(hexSlice, this, 0, actualMax), '$1 '));
+    /(.{2})/g, hexSlice(this, 0, actualMax), '$1 '));
   if (remaining > 0)
     str += ` ... ${remaining} more byte${remaining > 1 ? 's' : ''}`;
   // Inspect special properties as well, if possible.
@@ -1129,7 +1124,7 @@ function _fill(buf, value, offset, end, encoding) {
 Buffer.prototype.write = function write(string, offset, length, encoding) {
   // Buffer#write(string);
   if (offset === undefined) {
-    return FunctionPrototypeCall(utf8Write, this, string, 0, this.length);
+    return utf8Write(this, string, 0, this.length);
   }
   // Buffer#write(string, encoding)
   if (length === undefined && typeof offset === 'string') {
@@ -1156,9 +1151,9 @@ Buffer.prototype.write = function write(string, offset, length, encoding) {
   }
 
   if (!encoding || encoding === 'utf8')
-    return FunctionPrototypeCall(utf8Write, this, string, offset, length);
+    return utf8Write(this, string, offset, length);
   if (encoding === 'ascii')
-    return FunctionPrototypeCall(asciiWrite, this, string, offset, length);
+    return asciiWrite(this, string, offset, length);
 
   const ops = getEncodingOps(encoding);
   if (ops === undefined)