use T[] style for array

node-casl2-comet2 · Apr 5, 2017 · a213002 · a213002
1 parent 508f91e
commit a213002
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/gr.ts b/src/gr.ts
@@ -56,7 +56,7 @@ export interface GRInfo {
 }
 
 function createDocumentation(type: GRType): string {
-    let s = "汎用レジスタ。"
+    let s = "汎用レジスタ。";
     if (type & GRType.UsedAsIndexRegister) {
         s += "指標レジスタとして使用できます。";
     } else {
@@ -78,7 +78,7 @@ function createGRInfo(gr: GR, type: GRType): GRInfo {
     };
 }
 
-export const grsInfo: Array<GRInfo> = [
+export const grsInfo: GRInfo[] = [
     createGRInfo(GR.GR0, GRType.None),
     createGRInfo(GR.GR1, GRType.UsedAsIndexRegister),
     createGRInfo(GR.GR2, GRType.UsedAsIndexRegister),

diff --git a/src/helpers/jisx0201.ts b/src/helpers/jisx0201.ts
@@ -11,7 +11,7 @@ export function convertToCharCode(ch: string): number {
     return code;
 }
 
-export function convertToCharCodes(s: string): Array<number> {
+export function convertToCharCodes(s: string): number[] {
     const r = [];
     for (const c of s) {
         r.push(convertToCharCode(c));
@@ -45,7 +45,7 @@ export function convertToChar(charCode: number): string {
  * 文字コード列から文字列に変換します
  * @param charCodes 文字コードの配列
  */
-export function convertToString(charCodes: Array<number>): string {
+export function convertToString(charCodes: number[]): string {
     return charCodes.map(charCode => convertToChar(charCode)).join("");
 }
 

diff --git a/src/instructions.ts b/src/instructions.ts
@@ -38,7 +38,7 @@ function createInstructionInfo(inst: string, type: ArgumentType, code: number) {
     return { instructionName: inst, argumentType: type, code: code };
 }
 
-export const instructionsInfo: Array<InstructionInfo> = [
+export const instructionsInfo: InstructionInfo[] = [
     // アセンブラ命令
     { instructionName: "START", argumentType: ArgumentType.label_START, code: -1, type: InstructionType.Assembler, documentation: "プログラムの先頭を定義 プログラムの実行開始番地を定義 他のプログラムで参照する入口名を定義" },
     { instructionName: "END", argumentType: ArgumentType.none, code: -1, type: InstructionType.Assembler, documentation: "プログラムの終わりを明示" },

diff --git a/tslint.json b/tslint.json
@@ -54,14 +54,20 @@
         ],
         "no-internal-module": true,
         "no-trailing-whitespace": true,
-        "no-inferrable-types": true,
+        "no-inferrable-types": [
+            true
+        ],
         "no-null-keyword": true,
         "boolean-trivia": true,
         "type-operator-spacing": true,
         "prefer-const": true,
         "no-increment-decrement": true,
         "object-literal-surrounding-space": true,
         "no-type-assertion-whitespace": true,
-        "no-in-operator": true
+        "no-in-operator": true,
+        "array-type": [
+            true,
+            "array"
+        ]
     }
 }