foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-11 00:21:05 -05:00
Code Issues Packages 1 Wiki Activity

refactor(std/wasi): prefer explicit encoder/decoder names (#8622)

Browse source 
This renames a couple of identifiers from the ambigious name "text" to
the more explicit textEncoder and textDecoder depending on what they are.
This commit is contained in:
Casper Beyer 2020-12-05 22:47:01 +08:00 committed by GitHub
parent 300b39b889
commit 4f0dc2c51d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
std/wasi/snapshot_preview1.ts
View file

@ -341,7 +341,7 @@ export default class Context {
argvBufferOffset: number, argvBufferOffset: number,
): number => { ): number => {
const args = this.args; const args = this.args;
const text = new TextEncoder(); const textEncoder = new TextEncoder();
const memoryData = new Uint8Array(this.memory.buffer); const memoryData = new Uint8Array(this.memory.buffer);
const memoryView = new DataView(this.memory.buffer); const memoryView = new DataView(this.memory.buffer);
@ -349,7 +349,7 @@ export default class Context {
memoryView.setUint32(argvOffset, argvBufferOffset, true); memoryView.setUint32(argvOffset, argvBufferOffset, true);
argvOffset += 4; argvOffset += 4;
const data = text.encode(`${arg}\0`); const data = textEncoder.encode(`${arg}\0`);
memoryData.set(data, argvBufferOffset); memoryData.set(data, argvBufferOffset);
argvBufferOffset += data.length; argvBufferOffset += data.length;
} }
@ -362,14 +362,14 @@ export default class Context {
argvBufferSizeOffset: number, argvBufferSizeOffset: number,
): number => { ): number => {
const args = this.args; const args = this.args;
const text = new TextEncoder(); const textEncoder = new TextEncoder();
const memoryView = new DataView(this.memory.buffer); const memoryView = new DataView(this.memory.buffer);
memoryView.setUint32(argcOffset, args.length, true); memoryView.setUint32(argcOffset, args.length, true);
memoryView.setUint32( memoryView.setUint32(
argvBufferSizeOffset, argvBufferSizeOffset,
args.reduce(function (acc, arg) { args.reduce(function (acc, arg) {
return acc + text.encode(`${arg}\0`).length; return acc + textEncoder.encode(`${arg}\0`).length;
}, 0), }, 0),
true, true,
); );
@ -382,7 +382,7 @@ export default class Context {
environBufferOffset: number, environBufferOffset: number,
): number => { ): number => {
const entries = Object.entries(this.env); const entries = Object.entries(this.env);
const text = new TextEncoder(); const textEncoder = new TextEncoder();
const memoryData = new Uint8Array(this.memory.buffer); const memoryData = new Uint8Array(this.memory.buffer);
const memoryView = new DataView(this.memory.buffer); const memoryView = new DataView(this.memory.buffer);
@ -390,7 +390,7 @@ export default class Context {
memoryView.setUint32(environOffset, environBufferOffset, true); memoryView.setUint32(environOffset, environBufferOffset, true);
environOffset += 4; environOffset += 4;
const data = text.encode(`${key}=${value}\0`); const data = textEncoder.encode(`${key}=${value}\0`);
memoryData.set(data, environBufferOffset); memoryData.set(data, environBufferOffset);
environBufferOffset += data.length; environBufferOffset += data.length;
} }
@ -403,14 +403,14 @@ export default class Context {
environBufferSizeOffset: number, environBufferSizeOffset: number,
): number => { ): number => {
const entries = Object.entries(this.env); const entries = Object.entries(this.env);
const text = new TextEncoder(); const textEncoder = new TextEncoder();
const memoryView = new DataView(this.memory.buffer); const memoryView = new DataView(this.memory.buffer);
memoryView.setUint32(environcOffset, entries.length, true); memoryView.setUint32(environcOffset, entries.length, true);
memoryView.setUint32( memoryView.setUint32(
environBufferSizeOffset, environBufferSizeOffset,
entries.reduce(function (acc, [key, value]) { entries.reduce(function (acc, [key, value]) {
return acc + text.encode(`${key}=${value}\0`).length; return acc + textEncoder.encode(`${key}=${value}\0`).length;
}, 0), }, 0),
true, true,
); );
@ -1021,9 +1021,9 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength); const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength);
const path = resolve(entry.path!, text.decode(data)); const path = resolve(entry.path!, textDecoder.decode(data));
Deno.mkdirSync(path); Deno.mkdirSync(path);
@ -1046,9 +1046,9 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength); const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength);
const path = resolve(entry.path!, text.decode(data)); const path = resolve(entry.path!, textDecoder.decode(data));
const memoryView = new DataView(this.memory.buffer); const memoryView = new DataView(this.memory.buffer);
@ -1140,9 +1140,9 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength); const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength);
const path = resolve(entry.path!, text.decode(data)); const path = resolve(entry.path!, textDecoder.decode(data));
if ((fstflags & FSTFLAGS_ATIM_NOW) == FSTFLAGS_ATIM_NOW) { if ((fstflags & FSTFLAGS_ATIM_NOW) == FSTFLAGS_ATIM_NOW) {
atim = BigInt(Date.now()) * BigInt(1e6); atim = BigInt(Date.now()) * BigInt(1e6);
@ -1176,19 +1176,19 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const oldData = new Uint8Array( const oldData = new Uint8Array(
this.memory.buffer, this.memory.buffer,
oldPathOffset, oldPathOffset,
oldPathLength, oldPathLength,
); );
const oldPath = resolve(oldEntry.path!, text.decode(oldData)); const oldPath = resolve(oldEntry.path!, textDecoder.decode(oldData));
const newData = new Uint8Array( const newData = new Uint8Array(
this.memory.buffer, this.memory.buffer,
newPathOffset, newPathOffset,
newPathLength, newPathLength,
); );
const newPath = resolve(newEntry.path!, text.decode(newData)); const newPath = resolve(newEntry.path!, textDecoder.decode(newData));
Deno.linkSync(oldPath, newPath); Deno.linkSync(oldPath, newPath);
@ -1392,9 +1392,9 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength); const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength);
const path = resolve(entry.path!, text.decode(data)); const path = resolve(entry.path!, textDecoder.decode(data));
if (!Deno.statSync(path).isDirectory) { if (!Deno.statSync(path).isDirectory) {
return ERRNO_NOTDIR; return ERRNO_NOTDIR;
@ -1423,19 +1423,19 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const oldData = new Uint8Array( const oldData = new Uint8Array(
this.memory.buffer, this.memory.buffer,
oldPathOffset, oldPathOffset,
oldPathLength, oldPathLength,
); );
const oldPath = resolve(oldEntry.path!, text.decode(oldData)); const oldPath = resolve(oldEntry.path!, textDecoder.decode(oldData));
const newData = new Uint8Array( const newData = new Uint8Array(
this.memory.buffer, this.memory.buffer,
newPathOffset, newPathOffset,
newPathLength, newPathLength,
); );
const newPath = resolve(newEntry.path!, text.decode(newData)); const newPath = resolve(newEntry.path!, textDecoder.decode(newData));
Deno.renameSync(oldPath, newPath); Deno.renameSync(oldPath, newPath);
@ -1458,19 +1458,19 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const oldData = new Uint8Array( const oldData = new Uint8Array(
this.memory.buffer, this.memory.buffer,
oldPathOffset, oldPathOffset,
oldPathLength, oldPathLength,
); );
const oldPath = text.decode(oldData); const oldPath = textDecoder.decode(oldData);
const newData = new Uint8Array( const newData = new Uint8Array(
this.memory.buffer, this.memory.buffer,
newPathOffset, newPathOffset,
newPathLength, newPathLength,
); );
const newPath = resolve(entry.path!, text.decode(newData)); const newPath = resolve(entry.path!, textDecoder.decode(newData));
Deno.symlinkSync(oldPath, newPath); Deno.symlinkSync(oldPath, newPath);
@ -1491,9 +1491,9 @@ export default class Context {
return ERRNO_INVAL; return ERRNO_INVAL;
} }
const text = new TextDecoder(); const textDecoder = new TextDecoder();
const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength); const data = new Uint8Array(this.memory.buffer, pathOffset, pathLength);
const path = resolve(entry.path!, text.decode(data)); const path = resolve(entry.path!, textDecoder.decode(data));
Deno.removeSync(path); Deno.removeSync(path);