nadesiko3 3.7.13 → 3.7.14

package/core/src/nako_errors.mts

@@ -11,7 +11,7 @@ export class NakoError extends Error {
   public line: number | undefined
   public positionJa: string
 
-  constructor (tag: string, msg: string, file: string | undefined = undefined, line: number | undefined = undefined) {
+  constructor(tag: string, msg: string, file: string | undefined = undefined, line: number | undefined = undefined) {
     // エラー位置を分かりやすく日本語に変換
     const positionJa = `${file || ''}${line === undefined ? '' : `(${line + 1}行目): `}`
     // #1223 エラーメッセージに「main__関数名」と表示されるので、main__は省略して表示
@@ -33,7 +33,7 @@ export class NakoIndentError extends NakoError {
    * @param {number} line
    * @param {string} file
    */
-  constructor (msg: string, line: number, file: string) {
+  constructor(msg: string, line: number, file: string) {
     super('インデントエラー', msg, file, line)
     this.type = 'NakoIndentError'
     this.line = line
@@ -52,7 +52,7 @@ export class InternalLexerError extends NakoError {
    * @param {number | undefined} [line]
    * @param {string | undefined} [file]
    */
-  constructor (msg: string, preprocessedCodeStartOffset: number, preprocessedCodeEndOffset: number, line: number | undefined, file: string | undefined) {
+  constructor(msg: string, preprocessedCodeStartOffset: number, preprocessedCodeEndOffset: number, line: number | undefined, file: string | undefined) {
     super('字句解析エラー（内部エラー）', msg, file, line)
     this.type = 'InternalLexerError'
     this.preprocessedCodeStartOffset = preprocessedCodeStartOffset
@@ -72,7 +72,7 @@ export class NakoLexerError extends NakoError {
    * @param {number | undefined} line
    * @param {string | undefined} file
    */
-  constructor (
+  constructor(
     msg: string,
     startOffset: number,
     endOffset: number,
@@ -96,7 +96,7 @@ export class NakoSyntaxError extends NakoError {
    * @param {Ast} first
    * @param {Ast} [last]
    */
-  public static fromNode (msg: string, first: Ast | Token | SourceMap, last: Ast|undefined = undefined) {
+  public static fromNode(msg: string, first: Ast | Token | SourceMap, last: Ast|undefined = undefined) {
     if (!first) {
       return new NakoSyntaxError(msg, undefined, undefined, undefined, undefined)
     }
@@ -115,7 +115,7 @@ export class NakoSyntaxError extends NakoError {
    * @param {number | undefined} endOffset
    * @param {string | undefined} file
    */
-  constructor (msg: string, line: number | undefined, startOffset: number | undefined, endOffset: number | undefined, file: string | undefined) {
+  constructor(msg: string, line: number | undefined, startOffset: number | undefined, endOffset: number | undefined, file: string | undefined) {
     super('文法エラー', msg, file, line)
     this.type = 'NakoSyntaxError'
     this.file = file
@@ -131,7 +131,7 @@ export class NakoRuntimeError extends NakoError {
    * @param error エラー
    * @param lineNo 発生行
    */
-  constructor (error: Error | string, lineNo: string | undefined) {
+  constructor(error: Error | string, lineNo: string | undefined) {
     let msg = 'unknown'
     if (typeof error === 'string') {
       msg = error
@@ -183,7 +183,7 @@ export class NakoImportError extends NakoError {
    * @param {string} file
    * @param {number} line
    */
-  constructor (msg: string, file: string, line: number) {
+  constructor(msg: string, file: string, line: number) {
     super('取り込みエラー', msg, file, line)
     this.file = file
     this.line = line

package/core/src/nako_from_dncl.mts

@@ -23,7 +23,7 @@ const DNCL_SIMPLES: { [key: string]: string[] } = {
 /**
  * DNCLのソースコードをなでしこに変換する
  */
-export function convertDNCL (tokens: Token[]): Token[] {
+export function convertDNCL(tokens: Token[]): Token[] {
   if (!useDNCLmode(tokens)) { return tokens }
 
   // 一行ずつに分ける
@@ -192,7 +192,7 @@ export function convertDNCL (tokens: Token[]): Token[] {
   return tokens
 }
 
-function replaceAllElementV (line: Token[], ni: number): void {
+function replaceAllElementV(line: Token[], ni: number): void {
   //
   // const ni = findTokens(line, ['word:すべて', 'word:要素'])
   //
@@ -210,7 +210,7 @@ function replaceAllElementV (line: Token[], ni: number): void {
   line.splice(ni, 4, eq, begin, val, end, times, mul)
 }
 
-function replaceAtohantei (tokens: Token[], fi: number): void {
+function replaceAtohantei(tokens: Token[], fi: number): void {
   // `ここまで、(${r[1]})になるまでの間`
   const wo = findTokens(tokens, ['word:を'])
   if (wo >= 0) {
@@ -226,7 +226,7 @@ function replaceAtohantei (tokens: Token[], fi: number): void {
   tokens[fi + 1].value = '間'
 }
 
-function findTokens (tokens: Token[], findTypeValue: string[]): number {
+function findTokens(tokens: Token[], findTypeValue: string[]): number {
   const findA = findTypeValue.map(s => s.split(':'))
   for (let i = 0; i < tokens.length; i++) {
     let flag = true
@@ -246,7 +246,7 @@ function findTokens (tokens: Token[], findTypeValue: string[]): number {
   return -1
 }
 
-function useDNCLmode (tokens: Token[]): boolean {
+function useDNCLmode(tokens: Token[]): boolean {
   // 先頭の100語調べる
   for (let i = 0; i < tokens.length; i++) {
     if (i > 100) { break }

package/core/src/nako_from_dncl2.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * DNCL ver2 に対応する構文
  */

package/core/src/nako_from_dncl2.mts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+ 
 /**
  * DNCL ver2 に対応する構文
  */
@@ -31,7 +31,7 @@ const DNCL_SIMPLES: { [key: string]: string[] } = {
 /**
  * DNCLのソースコードをなでしこに変換する
  */
-export function convertDNCL2 (tokens: Token[]): Token[] {
+export function convertDNCL2(tokens: Token[]): Token[] {
   if (!useDNCL2mode(tokens)) { return tokens }
 
   // 一行ずつに分ける
@@ -272,7 +272,7 @@ export function convertDNCL2 (tokens: Token[]): Token[] {
  * @param fromIndex 検索場所
  * @returns 合致したかどうか
  */
-function tokenEq (typeValues: any[], lines: Token[], fromIndex: number): boolean {
+function tokenEq(typeValues: any[], lines: Token[], fromIndex: number): boolean {
   const check = (pattern: string|Array<string>, t: { type: string, value: string }): boolean => {
     if (pattern instanceof Array) {
       for (let i = 0; i < pattern.length; i++) {
@@ -298,7 +298,7 @@ function tokenEq (typeValues: any[], lines: Token[], fromIndex: number): boolean
   return true
 }
 
-function findTokens (tokens: Token[], findTypeValue: string[]): number {
+function findTokens(tokens: Token[], findTypeValue: string[]): number {
   const findA = findTypeValue.map(s => s.split(':'))
   for (let i = 0; i < tokens.length; i++) {
     let flag = true
@@ -318,7 +318,7 @@ function findTokens (tokens: Token[], findTypeValue: string[]): number {
   return -1
 }
 
-function useDNCL2mode (tokens: Token[]): boolean {
+function useDNCL2mode(tokens: Token[]): boolean {
   // 先頭の100語調べる
   for (let i = 0; i < tokens.length; i++) {
     if (i > 100) { break }

package/core/src/nako_gen.mjs

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * パーサーが生成した中間オブジェクトを実際のJavaScriptのコードに変換する。
  * なお速度優先で忠実にJavaScriptのコードを生成する。
@@ -225,7 +223,6 @@ export class NakoGen {
     }
     /** @param {Ast} node */
     static convPrint(node) {
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         return `__print(${node});`;
     }
     /** @param {AstStrValue} node */
@@ -347,7 +344,6 @@ export class NakoGen {
             }
             const name = t.name;
             this.usedFuncSet.add(name);
-            // eslint-disable-next-line @typescript-eslint/no-empty-function
             this.__self.__varslist[1].set(name, () => { }); // 事前に適当な値を設定
             this.varslistSet[1].names.add(name); // global
             const meta = t.meta;
@@ -356,7 +352,6 @@ export class NakoGen {
             }
             this.nakoFuncList.set(name, {
                 josi: meta.josi,
-                // eslint-disable-next-line @typescript-eslint/no-empty-function
                 fn: () => { },
                 type: 'func',
                 asyncFn: !!t.asyncFn,
@@ -661,10 +656,7 @@ export class NakoGen {
         commentSrc = commentSrc.replace(/\*\//g, '＊／');
         commentSrc = commentSrc.replace(/(^\s+|\s+$)/g, '');
         // コメントの行番号を得る
-        let lineNo = this.convLineno(node, false);
-        if (node.line === 0) {
-            lineNo = ''; // 0行目なら行番号は更新なし
-        }
+        const lineNo = this.convLineno(node, false);
         if (commentSrc === '' && lineNo === '') {
             return ';';
         }
@@ -857,7 +849,6 @@ export class NakoGen {
                 // 既に generate で作成済みのはず(念のため)
                 this.nakoFuncList.set(name, {
                     josi: node.meta.josi,
-                    // eslint-disable-next-line @typescript-eslint/no-empty-function
                     fn: () => { },
                     type: 'func',
                     asyncFn: false,
@@ -1062,7 +1053,7 @@ export class NakoGen {
         if (valueNode.type !== 'nop') {
             value = this._convGen(valueNode, true);
         }
-        if (value == null) {
+        if (value === null) {
             throw NakoSyntaxError.fromNode('代入する先の変数名がありません。', node);
         }
         code += ' = ' + value + ';\n';
@@ -1129,7 +1120,7 @@ export class NakoGen {
             `const ${varTemp} = ${temp};\n` +
             `const ${varFrom} = ${kara};\n` +
             `const ${varTo} = ${made};\n` +
-            `if (${varFrom} <= ${varTo}) { // up\n` +
+            `if (${varFrom} < ${varTo}) { // up\n` +
             `  if (${String(flagUp)}) {` +
             `    for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= ${inc}) {\n` +
             `      ${sorePrefex};${loopVarSetter}\n` +
@@ -1138,7 +1129,7 @@ export class NakoGen {
             '      // for block end\n' +
             '    };\n' +
             '  };\n' +
-            '} else { // down\n' +
+            `} else if (${varFrom} > ${varTo}) { // down\n` +
             `  if (${String(flagDown)}) {` +
             `    for (let ${varI} = ${varFrom}; ${varI} >= ${varTo}; ${varI}-= ${inc}) {\n` +
             `      ${sorePrefex};${loopVarSetter}\n` +
@@ -1147,6 +1138,13 @@ export class NakoGen {
             '      // for block end\n' +
             '    }\n' +
             '  };\n' +
+            '} else { // from == to\n' +
+            `  for (let ${varI} = ${varFrom}; ${varI} <= ${varTo}; ${varI}+= 1) {\n` +
+            `    ${sorePrefex};${loopVarSetter}\n` +
+            '    // for block begin\n' +
+            `    ${block}\n` +
+            '    // for block end\n' +
+            '  };\n' +
             '};\n' +
             `//[/convFor id=${idLoop}]\n`;
         return code;
@@ -1776,7 +1774,7 @@ export class NakoGen {
             value = this._convGen(astValue, true);
         }
         // 戻り値の検証
-        if (value == null) {
+        if (value === null) {
             throw NakoSyntaxError.fromNode('代入する先の変数名がありません。', node);
         }
         // 変数名
@@ -2355,7 +2353,7 @@ function removeDuplicateChars(code) {
             continue;
         }
         // 文字列・正規表現・テンプレートリテラルの開始チェック
-        if (ch === '"' || ch === "'") {
+        if (ch === '"' || ch === '\'') {
             inString = true;
             stringDelimiter = ch;
             result.push(ch);