From e856423ee1c3c6ff5eeadd498b8eb1671b2c6ffe Mon Sep 17 00:00:00 2001 From: Arnavion Date: Sat, 1 Aug 2015 15:30:10 -0700 Subject: [PATCH] More let -> const --- build/doc.ts | 30 +++++++++++------------ build/typescript/compiler.ts | 14 +++++------ build/typescript/walker.ts | 26 ++++++++++---------- src/parser/parse.ts | 4 +-- src/parts/index.ts | 4 +-- src/renderers/clocks/base.ts | 2 +- src/renderers/null.ts | 2 +- src/renderers/settings.ts | 2 +- src/renderers/web/animation-collection.ts | 4 +-- src/renderers/web/drawing-styles.ts | 2 +- src/renderers/web/renderer.ts | 8 +++--- src/utility/map.ts | 4 +-- src/utility/mixin.ts | 4 +-- src/utility/promise.ts | 6 ++--- src/utility/set.ts | 4 +-- src/webworker/misc.ts | 2 +- 16 files changed, 59 insertions(+), 59 deletions(-) diff --git a/build/doc.ts b/build/doc.ts index 2be5606..2ab250e 100644 --- a/build/doc.ts +++ b/build/doc.ts @@ -31,7 +31,7 @@ import { walk } from "./typescript/walker"; function flatten(arr: T[][]): T[] { var result: T[] = []; - for (let a of arr) { + for (const a of arr) { result = result.concat(a); } @@ -593,7 +593,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s var namespace = namespaces[namespaceName]; var namespaceMembers: AST.NamespaceMember[] = []; - for (let memberName of Object.keys(namespace.members)) { + for (const memberName of Object.keys(namespace.members)) { namespaceMembers.push(namespace.members[memberName]); } @@ -617,7 +617,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s var module = modules[moduleName]; var moduleMembers: AST.ModuleMemberWithoutReference[] = []; - for (let memberName of Object.keys(module.members)) { + for (const memberName of Object.keys(module.members)) { var member = module.members[memberName]; if ((member).parent === module) { moduleMembers.push(member); @@ -653,7 +653,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s var namespace = namespaces[namespaceName]; var namespaceMembers: AST.NamespaceMember[] = []; - for (let memberName of Object.keys(namespace.members)) { + for (const memberName of Object.keys(namespace.members)) { namespaceMembers.push(namespace.members[memberName]); } @@ -678,7 +678,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let property of properties) { + for (const property of properties) { result.push(new Buffer(propertyToHtml(property).map(indenter(5)).join("\n"))); } @@ -695,7 +695,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let func of functions) { + for (const func of functions) { result.push(new Buffer(functionToHtml(func).map(indenter(5)).join("\n"))); } @@ -712,7 +712,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let interfase of interfaces) { + for (const interfase of interfaces) { result.push(new Buffer(interfaceToHtml(interfase).map(indenter(5)).join("\n"))); } @@ -729,7 +729,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let clazz of classes) { + for (const clazz of classes) { result.push(new Buffer(classToHtml(clazz).map(indenter(5)).join("\n"))); } @@ -746,7 +746,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let enumType of enums) { + for (const enumType of enums) { result.push(new Buffer(enumToHtml(enumType).map(indenter(5)).join("\n"))); } @@ -766,7 +766,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s var module = modules[moduleName]; var moduleMembers: AST.ModuleMember[] = []; - for (let memberName of Object.keys(module.members)) { + for (const memberName of Object.keys(module.members)) { var member = module.members[memberName]; if ((member).parent === module) { moduleMembers.push(member); @@ -798,7 +798,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let property of properties) { + for (const property of properties) { result.push(new Buffer(propertyToHtml(property).map(indenter(5)).join("\n"))); } @@ -815,7 +815,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let func of functions) { + for (const func of functions) { result.push(new Buffer(functionToHtml(func).map(indenter(5)).join("\n"))); } @@ -832,7 +832,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let interfase of interfaces) { + for (const interfase of interfaces) { result.push(new Buffer(interfaceToHtml(interfase).map(indenter(5)).join("\n"))); } @@ -849,7 +849,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let clazz of classes) { + for (const clazz of classes) { result.push(new Buffer(classToHtml(clazz).map(indenter(5)).join("\n"))); } @@ -866,7 +866,7 @@ export function build(outputFilePath: string, root: string, rootNamespaceName: s ` )); - for (let enumType of enums) { + for (const enumType of enums) { result.push(new Buffer(enumToHtml(enumType).map(indenter(5)).join("\n"))); } diff --git a/build/typescript/compiler.ts b/build/typescript/compiler.ts index 63d78a5..1bf0815 100644 --- a/build/typescript/compiler.ts +++ b/build/typescript/compiler.ts @@ -87,7 +87,7 @@ export class Compiler { } private _reportDiagnostics(diagnostics: ts.Diagnostic[]) { - for (let diagnostic of diagnostics) { + for (const diagnostic of diagnostics) { var message = ""; if (diagnostic.file) { @@ -184,7 +184,7 @@ class WatchCompilerHost extends CompilerHost { }; private _onFilesChanged(fileNames: string[]) { - for (let fileName of fileNames) { + for (const fileName of fileNames) { delete this._sourceFiles[fileName]; } @@ -250,7 +250,7 @@ export function watch(root: string, rootNamespaceName: string): FileTransform { function addJSDocComments(modules: { [name: string]: AST.Module }): void { function visitor(current: AST.Module | AST.ModuleMember | AST.InterfaceMember) { if (current instanceof AST.Module) { - for (let memberName of Object.keys(current.members)) { + for (const memberName of Object.keys(current.members)) { visitor(current.members[memberName]); } @@ -323,7 +323,7 @@ function addJSDocComments(modules: { [name: string]: AST.Module }): void { var nodes: ts.Node[] = []; if (current.getter !== null) { nodes.push(current.getter.astNode); } if (current.setter !== null && nodes[0] !== current.setter.astNode) { nodes.push(current.setter.astNode); } - for (let node of nodes) { + for (const node of nodes) { (node)["typescript-new-comment"] = newComments; } } @@ -333,7 +333,7 @@ function addJSDocComments(modules: { [name: string]: AST.Module }): void { } } - for (let moduleName of Object.keys(modules)) { + for (const moduleName of Object.keys(modules)) { visitor(modules[moduleName]); } } @@ -389,11 +389,11 @@ class FakeSourceFile { originalCommentLines.splice(originalCommentLines.length - 1, 0, " *"); } - for (let newComment of newComments) { + for (const newComment of newComments) { originalCommentLines.splice(originalCommentLines.length - 1, 0, " * " + newComment); } - for (let newCommentLine of originalCommentLines) { + for (const newCommentLine of originalCommentLines) { this.text += newCommentLine + "\n"; this.lineMap.push(this.text.length); } diff --git a/build/typescript/walker.ts b/build/typescript/walker.ts index 904cc0d..e757beb 100644 --- a/build/typescript/walker.ts +++ b/build/typescript/walker.ts @@ -77,7 +77,7 @@ class Walker { var module = this._scope.enter(this.modules[moduleName]); this._currentSourceFile = sourceFile; - for (let statement of sourceFile.statements) { + for (const statement of sourceFile.statements) { this._walk(statement, module); } @@ -362,13 +362,13 @@ class Walker { return; } - for (let declaration of symbol.declarations) { + for (const declaration of symbol.declarations) { this._walkClassMember(declaration, clazz); } }); ts.forEachValue(type.symbol.members, symbol => { - for (let declaration of symbol.declarations) { + for (const declaration of symbol.declarations) { this._walkClassMember(declaration, clazz); } }); @@ -399,7 +399,7 @@ class Walker { parent.members[interfase.name] = interfase; ts.forEachValue(type.symbol.members, symbol => { - for (let declaration of symbol.declarations) { + for (const declaration of symbol.declarations) { this._walkInterfaceMember(declaration, interfase); } }); @@ -459,7 +459,7 @@ class Walker { } else if ((node.importClause.namedBindings).elements !== undefined) { // import { foo, bar } from "baz"; - for (let element of (node.importClause.namedBindings).elements) { + for (const element of (node.importClause.namedBindings).elements) { var importedName = element.propertyName && element.propertyName.text || element.name.text; parent.members[element.name.text] = new AST.Reference(moduleName, importedName, true); } @@ -473,14 +473,14 @@ class Walker { if (node.moduleSpecifier !== undefined) { // export { foo } from "bar"; var moduleName = this._resolve((node.moduleSpecifier).text, parent); - for (let element of node.exportClause.elements) { + for (const element of node.exportClause.elements) { var importedName = element.propertyName && element.propertyName.text || element.name.text; parent.members[element.name.text] = new AST.Reference(moduleName, importedName, false); } } else { // export { foo }; - for (let element of node.exportClause.elements) { + for (const element of node.exportClause.elements) { (parent.members[element.name.text]).isPrivate = false; } } @@ -538,7 +538,7 @@ class Walker { var lastRead: { description: string } = null; - for (let line of lines) { + for (const line of lines) { var firstWordMatch = line.match(/^\s*(\S+)(\s*)/); var firstWord = (firstWordMatch !== null) ? firstWordMatch[1] : ""; var remainingLine = (firstWordMatch !== null) ? line.substring(firstWordMatch[0].length) : ""; @@ -694,10 +694,10 @@ class Walker { } link(rootNamespaceName: string): void { - for (let moduleName of Object.keys(this.modules)) { + for (const moduleName of Object.keys(this.modules)) { var module = this.modules[moduleName]; - for (let memberName of Object.keys(module.members)) { + for (const memberName of Object.keys(module.members)) { var member = module.members[memberName]; if (member instanceof AST.Class) { @@ -729,7 +729,7 @@ class Walker { else if (member instanceof AST.Enum) { var value = 0; - for (let enumMember of member.members) { + for (const enumMember of member.members) { if (enumMember.value === null) { enumMember.value = value; } @@ -749,7 +749,7 @@ class Walker { } private _moduleToNamespace(module: AST.Module): void { - for (let memberName of Object.keys(module.members)) { + for (const memberName of Object.keys(module.members)) { var member = module.members[memberName]; if (member instanceof AST.Reference) { @@ -844,7 +844,7 @@ export function walk(compiler: Compiler, root: string, rootNamespaceName: string var walker = new Walker(compiler); // Walk - for (let sourceFile of sourceFiles) { + for (const sourceFile of sourceFiles) { if ( path.basename(sourceFile.fileName) === "lib.core.d.ts" || path.basename(sourceFile.fileName) === "lib.dom.d.ts" || diff --git a/src/parser/parse.ts b/src/parser/parse.ts index 82a9870..ccb8d2a 100644 --- a/src/parser/parse.ts +++ b/src/parser/parse.ts @@ -1502,7 +1502,7 @@ class ParserRun { break; } - let newType = (typePart.value).value; + const newType = (typePart.value).value; switch (newType) { case "m": case "l": @@ -1952,7 +1952,7 @@ makeTagParserFunction("3c", parts.OutlineColor, ParserRun.prototype.parse_color, makeTagParserFunction("4a", parts.ShadowAlpha, ParserRun.prototype.parse_alpha, false); makeTagParserFunction("4c", parts.ShadowColor, ParserRun.prototype.parse_color, false); -for (let key of Object.keys(ParserRun.prototype)) { +for (const key of Object.keys(ParserRun.prototype)) { if (key.indexOf("parse_") === 0 && typeof (ParserRun.prototype)[key] === "function") { rules.set(key.substr("parse_".length), (ParserRun.prototype)[key]); } diff --git a/src/parts/index.ts b/src/parts/index.ts index a7eed54..a178b3b 100644 --- a/src/parts/index.ts +++ b/src/parts/index.ts @@ -1314,7 +1314,7 @@ import { registerClassPrototype } from "../webworker/misc"; declare const exports: any; -for (let key of Object.keys(exports)) { +for (const key of Object.keys(exports)) { const value: any = exports[key]; if (value instanceof Function) { addToString(value, key); @@ -1322,7 +1322,7 @@ for (let key of Object.keys(exports)) { } } -for (let key of Object.keys(drawing)) { +for (const key of Object.keys(drawing)) { const value: any = (drawing)[key]; if (value instanceof Function) { addToString(value, `Drawing${ key }`); diff --git a/src/renderers/clocks/base.ts b/src/renderers/clocks/base.ts index 178dc9c..d208328 100644 --- a/src/renderers/clocks/base.ts +++ b/src/renderers/clocks/base.ts @@ -56,7 +56,7 @@ export class EventSource { _dispatchEvent(type: T, args: Object[]): void { const listeners = this._eventListeners.get(type); if (listeners !== undefined) { - for (let listener of listeners) { + for (const listener of listeners) { listener.apply(this, args); } } diff --git a/src/renderers/null.ts b/src/renderers/null.ts index 98b78e7..d1f439b 100644 --- a/src/renderers/null.ts +++ b/src/renderers/null.ts @@ -158,7 +158,7 @@ export class NullRenderer { console.log(`NullRenderer._onClockTick: currentTime = ${ currentTime }`); } - for (let dialogue of this._ass.dialogues) { + for (const dialogue of this._ass.dialogues) { if (dialogue.end > currentTime) { if (dialogue.start <= currentTime) { // This dialogue is visible right now. Draw it. diff --git a/src/renderers/settings.ts b/src/renderers/settings.ts index 7113f27..4e80e95 100644 --- a/src/renderers/settings.ts +++ b/src/renderers/settings.ts @@ -92,7 +92,7 @@ export class RendererSettings { const styleSheet = linkStyle.sheet; const rules: CSSFontFaceRule[] = Array.prototype.filter.call(styleSheet.cssRules, (rule: CSSRule) => rule.type === CSSRule.FONT_FACE_RULE); - for (let rule of rules) { + for (const rule of rules) { let src = rule.style.getPropertyValue("src"); if (!src) { src = rule.cssText.split("\n") diff --git a/src/renderers/web/animation-collection.ts b/src/renderers/web/animation-collection.ts index cba82e6..5d6ee9d 100644 --- a/src/renderers/web/animation-collection.ts +++ b/src/renderers/web/animation-collection.ts @@ -74,7 +74,7 @@ export class AnimationCollection { let start: number = null; let end: number = null; - for (let keyframe of keyframes) { + for (const keyframe of keyframes) { if (start === null) { start = keyframe.time; } @@ -84,7 +84,7 @@ export class AnimationCollection { let ruleCssText = ""; - for (let keyframe of keyframes) { + for (const keyframe of keyframes) { ruleCssText += ` ${ (100 * ((end - start === 0) ? 1 : ((keyframe.time - start) / (end - start)))).toFixed(3) }% { `; diff --git a/src/renderers/web/drawing-styles.ts b/src/renderers/web/drawing-styles.ts index 11400e1..af347e0 100644 --- a/src/renderers/web/drawing-styles.ts +++ b/src/renderers/web/drawing-styles.ts @@ -63,7 +63,7 @@ export class DrawingStyles { let bboxWidth = 0; let bboxHeight = 0; - for (let instruction of drawingInstructions.instructions) { + for (const instruction of drawingInstructions.instructions) { if (instruction instanceof parts.drawing.MoveInstruction) { path.pathSegList.appendItem(path.createSVGPathSegMovetoAbs(instruction.x, instruction.y + this._baselineOffset)); bboxWidth = Math.max(bboxWidth, instruction.x); diff --git a/src/renderers/web/renderer.ts b/src/renderers/web/renderer.ts index 6d85138..d790f44 100644 --- a/src/renderers/web/renderer.ts +++ b/src/renderers/web/renderer.ts @@ -93,7 +93,7 @@ export class WebRenderer extends NullRenderer implements EventSource { const urlsToPreload = new Set(); if (this.settings.fontMap !== null) { this.settings.fontMap.forEach(srcs => { - for (let src of srcs) { + for (const src of srcs) { urlsToPreload.add(src); } }); @@ -240,7 +240,7 @@ export class WebRenderer extends NullRenderer implements EventSource { let karaokeTimesAccumulator = 0; - for (let part of dialogue.parts) { + for (const part of dialogue.parts) { if (part instanceof parts.Italic) { currentSpanStyles.italic = part.value; } @@ -461,7 +461,7 @@ export class WebRenderer extends NullRenderer implements EventSource { (currentTimeRelativeToDialogueStart >= part.end) ? 1 : Math.pow((currentTimeRelativeToDialogueStart - part.start) / (part.end - part.start), part.accel); - for (let tag of part.tags) { + for (const tag of part.tags) { if (tag instanceof parts.Border) { currentSpanStyles.outlineWidth += progression * (tag.value - currentSpanStyles.outlineWidth); currentSpanStyles.outlineHeight += progression * (tag.value - currentSpanStyles.outlineHeight); @@ -611,7 +611,7 @@ export class WebRenderer extends NullRenderer implements EventSource { } } - for (let part of dialogue.parts) { + for (const part of dialogue.parts) { if (part instanceof parts.Position || part instanceof parts.Move) { const transformOrigin = WebRenderer._transformOrigins[dialogue.alignment]; diff --git a/src/utility/map.ts b/src/utility/map.ts index b234a46..c857212 100644 --- a/src/utility/map.ts +++ b/src/utility/map.ts @@ -41,7 +41,7 @@ class SimpleMap { throw new Error("Non-array iterables are not supported by the SimpleMap constructor."); } - for (let element of iterable) { + for (const element of iterable) { this.set(element[0], element[1]); } } @@ -131,7 +131,7 @@ class SimpleMap { * @param {*} thisArg */ forEach(callbackfn: (value: V, index: K, map: Map) => void, thisArg?: any): void { - for (let property of Object.keys(this._keys)) { + for (const property of Object.keys(this._keys)) { callbackfn.call(thisArg, this._values[property], this._keys[property], this); } } diff --git a/src/utility/mixin.ts b/src/utility/mixin.ts index 56ec382..371f6e8 100644 --- a/src/utility/mixin.ts +++ b/src/utility/mixin.ts @@ -25,8 +25,8 @@ * @param {!Array.<*>} mixins */ export function mixin(clazz: any, mixins: any[]): void { - for (let mixin of mixins) { - for (let name of Object.getOwnPropertyNames(mixin.prototype)) { + for (const mixin of mixins) { + for (const name of Object.getOwnPropertyNames(mixin.prototype)) { clazz.prototype[name] = mixin.prototype[name]; } } diff --git a/src/utility/promise.ts b/src/utility/promise.ts index 6f862f8..2c4fe0c 100644 --- a/src/utility/promise.ts +++ b/src/utility/promise.ts @@ -44,7 +44,7 @@ const enqueueJob: (callback: () => void) => void = (function () { const observer = new MutationObserver(() => { const processing = pending.splice(0, pending.length); - for (let callback of processing) { + for (const callback of processing) { callback(); } @@ -267,7 +267,7 @@ class SimplePromise { this._rejectReactions = undefined; this._state = SimplePromiseState.FULFILLED; - for (let reaction of reactions) { + for (const reaction of reactions) { this._enqueueReactionJob(reaction, value); } } @@ -283,7 +283,7 @@ class SimplePromise { this._rejectReactions = undefined; this._state = SimplePromiseState.REJECTED; - for (let reaction of reactions) { + for (const reaction of reactions) { this._enqueueReactionJob(reaction, reason); } } diff --git a/src/utility/set.ts b/src/utility/set.ts index 1b748a9..b7b0539 100644 --- a/src/utility/set.ts +++ b/src/utility/set.ts @@ -40,7 +40,7 @@ class SimpleSet { throw new Error("Non-array iterables are not supported by the SimpleSet constructor."); } - for (let value of iterable) { + for (const value of iterable) { this.add(value); } } @@ -91,7 +91,7 @@ class SimpleSet { * @param {*} thisArg */ forEach(callbackfn: (value: T, index: T, set: Set) => void, thisArg?: any): void { - for (let property of Object.keys(this._elements)) { + for (const property of Object.keys(this._elements)) { const element = this._elements[property]; callbackfn.call(thisArg, element, element, this); } diff --git a/src/webworker/misc.ts b/src/webworker/misc.ts index e528d9e..6f9fa56 100644 --- a/src/webworker/misc.ts +++ b/src/webworker/misc.ts @@ -79,7 +79,7 @@ export function deserialize(str: string): any { return JSON.parse(str, (/* ujs:unreferenced */ key: string, value: any) => { if (value && value._classTag !== undefined) { const hydratedValue = Object.create(classPrototypes.get(value._classTag)); - for (let key of Object.keys(value)) { + for (const key of Object.keys(value)) { if (key !== "_classTag") { hydratedValue[key] = value[key]; }