nadesiko3 3.7.13 → 3.7.14

package/core/src/nako_lexer.mts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+ 
 // なでしこの字句解析を行う
 // 既に全角半角を揃えたコードに対して字句解析を行う
 import { opPriority } from './nako_parser_const.mjs'
@@ -32,7 +32,7 @@ export class NakoLexer {
   /**
    * @param logger
    */
-  constructor (logger: NakoLogger) {
+  constructor(logger: NakoLogger) {
     this.logger = logger // 字句解析した際,確認された関数の一覧
     this.funclist = new Map()
     this.modList = [] // 字句解析した際,取り込むモジュール一覧 --- nako3::lex で更新される
@@ -44,12 +44,12 @@ export class NakoLexer {
   }
 
   /** 関数一覧をセット */
-  setFuncList (listMap: FuncList) {
+  setFuncList(listMap: FuncList) {
     this.funclist = listMap
   }
 
   /** モジュール公開既定値一覧をセット */
-  setModuleExport (exportObj: ExportMap) {
+  setModuleExport(exportObj: ExportMap) {
     this.moduleExport = exportObj
   }
 
@@ -58,7 +58,7 @@ export class NakoLexer {
    * @param {boolean} isFirst
    * @param {string} filename
    */
-  replaceTokens (tokens: Token[], isFirst: boolean, filename: string) {
+  replaceTokens(tokens: Token[], isFirst: boolean, filename: string) {
     this.result = tokens
     this.modName = NakoLexer.filenameToModName(filename)
     // 関数の定義があれば funclist を更新
@@ -126,7 +126,7 @@ export class NakoLexer {
    * ファイル内で定義されている関数名を列挙する。結果はfunclistに書き込む。その他のトークンの置換処理も行う。
    * シンタックスハイライトの処理から呼び出すためにstaticメソッドにしている。
    */
-  static preDefineFunc (tokens: Token[], logger: NakoLogger, funclist: FuncList, moduleexport: ExportMap) {
+  static preDefineFunc(tokens: Token[], logger: NakoLogger, funclist: FuncList, moduleexport: ExportMap) {
     // 関数を先読みして定義
     let i = 0
     let isFuncPointer = false
@@ -300,7 +300,7 @@ export class NakoLexer {
   }
 
   /** 文字列を{と}の部分で分割する。中括弧が対応していない場合nullを返す。 */
-  splitStringEx (code: string): string[] | null {
+  splitStringEx(code: string): string[] | null {
     /** @type {string[]} */
     const list = []
 
@@ -319,7 +319,7 @@ export class NakoLexer {
     return list
   }
 
-  _replaceWord (tokens: Token[]): void {
+  _replaceWord(tokens: Token[]): void {
     let comment = []
     let i = 0
     let isFuncPointer = false
@@ -524,7 +524,7 @@ export class NakoLexer {
    * インデントの個数を数える
    * @returns 戻り値として[インデント数, 読み飛ばすべき文字数]を返す
    */
-  countIndent (src: string): number[] {
+  countIndent(src: string): number[] {
     let indent = 0
     for (let i = 0; i < src.length; i++) {
       const c = src.charAt(i)
@@ -543,7 +543,7 @@ export class NakoLexer {
    * @param line 先頭行の行番号
    * @param filename ファイル名
    */
-  tokenize (src: string, line: number, filename: string): Token[] {
+  tokenize(src: string, line: number, filename: string): Token[] {
     const srcLength: number = src.length
     const result: Token[] = []
     let columnCurrent
@@ -722,17 +722,17 @@ export class NakoLexer {
         }
 
         switch (ruleName) {
-          case 'def_test': {
-            isDefTest = true
-            break
-          }
-          case 'eol': { // eolの処理はほかに↑と↓にある
-            isDefTest = false
-            break
-          }
-          default: {
-            break
-          }
+        case 'def_test': {
+          isDefTest = true
+          break
+        }
+        case 'eol': { // eolの処理はほかに↑と↓にある
+          isDefTest = false
+          break
+        }
+        default: {
+          break
+        }
         }
         // ここまで‰(#682) を処理
         if (ruleName === 'dec_lineno') {
@@ -773,7 +773,7 @@ export class NakoLexer {
   }
 
   // トークン配列をtype文字列に変換
-  static tokensToTypeStr (tokens: Token[], sep: string) {
+  static tokensToTypeStr(tokens: Token[], sep: string) {
     const a = tokens.map((v) => {
       return v.type
     })
@@ -785,7 +785,7 @@ export class NakoLexer {
    * @param {string} filename
    * @returns {string}
    */
-  static filenameToModName (filename: string) {
+  static filenameToModName(filename: string) {
     if (!filename) { return 'main' }
     // パスがあればパスを削除
     filename = filename.replace(/[\\:]/g, '/') // Windowsのpath記号を/に置換

package/core/src/nako_logger.mjs

@@ -59,7 +59,7 @@ function stringifyPosition(p) {
     return `${p.file || ''}${p.line === undefined ? '' : `(${p.line + 1}行目): `}`;
 }
 export function parsePosition(line) {
-    const m = line.match(/^l(\d+)\:(.+)/);
+    const m = line.match(/^l(\d+):(.+)/);
     let lineNo = 0;
     let fileName = 'main.nako3';
     if (m) {

package/core/src/nako_logger.mts

@@ -17,23 +17,23 @@ export class LogLevel {
   public static stdout = 6
 
   // string to level no
-  public static fromS (levelStr: string): number {
+  public static fromS(levelStr: string): number {
     let level: number = LogLevel.trace
     switch (levelStr) {
-      case 'all': level = LogLevel.all; break
-      case 'trace': level = LogLevel.trace; break
-      case 'debug': level = LogLevel.debug; break
-      case 'info': level = LogLevel.info; break
-      case 'warn': level = LogLevel.warn; break
-      case 'error': level = LogLevel.error; break
-      case 'stdout': level = LogLevel.stdout; break
-      default:
-        throw new Error('[NakoLogger] unknown logger level:' + levelStr)
+    case 'all': level = LogLevel.all; break
+    case 'trace': level = LogLevel.trace; break
+    case 'debug': level = LogLevel.debug; break
+    case 'info': level = LogLevel.info; break
+    case 'warn': level = LogLevel.warn; break
+    case 'error': level = LogLevel.error; break
+    case 'stdout': level = LogLevel.stdout; break
+    default:
+      throw new Error('[NakoLogger] unknown logger level:' + levelStr)
     }
     return level
   }
 
-  public static toString (level: number): string {
+  public static toString(level: number): string {
     const levels: string[] = ['all', 'trace', 'debug', 'info', 'warn', 'error', 'stdout']
     return levels[level]
   }
@@ -62,13 +62,13 @@ type LogListener = (data: LogListenerData) => void;
  * エラー位置を日本語で表示する。
  * たとえば `stringifyPosition({ file: "foo.txt", line: 5 })` は `"foo.txt(6行目):"` を出力する。
  */
-function stringifyPosition (p: PositionOrNull): string {
+function stringifyPosition(p: PositionOrNull): string {
   if (!p) { return '' }
   return `${p.file || ''}${p.line === undefined ? '' : `(${p.line + 1}行目): `}`
 }
 
-export function parsePosition (line: string): Position {
-  const m = line.match(/^l(\d+)\:(.+)/)
+export function parsePosition(line: string): Position {
+  const m = line.match(/^l(\d+):(.+)/)
   let lineNo = 0
   let fileName = 'main.nako3'
   if (m) {
@@ -97,17 +97,17 @@ export class NakoLogger {
   private listeners: NakoLoggerListener[]
   private logs: string
   private position: string
-  public constructor () {
+  public constructor() {
     this.listeners = []
     this.logs = ''
     this.position = ''
   }
 
-  public getErrorLogs (): [string, string] {
+  public getErrorLogs(): [string, string] {
     return [this.logs.replace(/\s+$/, ''), this.position]
   }
 
-  public clear (): void {
+  public clear(): void {
     this.logs = ''
     this.position = ''
   }
@@ -117,7 +117,7 @@ export class NakoLogger {
    * @param levelStr
    * @param callback
    */
-  public addListener (levelStr: string, callback: LogListener): void {
+  public addListener(levelStr: string, callback: LogListener): void {
     const level: number = LogLevel.fromS(levelStr)
     this.listeners.push({ level, callback })
   }
@@ -126,7 +126,7 @@ export class NakoLogger {
    * addListenerメソッドで設定したコールバックを取り外す。
    * @param {LogListener} callback
    */
-  public removeListener (callback: LogListener): void {
+  public removeListener(callback: LogListener): void {
     this.listeners = this.listeners.filter((l) => l.callback !== callback)
   }
 
@@ -134,7 +134,7 @@ export class NakoLogger {
    * @param {string} message
    * @param {Position | null} position
    */
-  public trace (message: string, position: PositionOrNull = null):void {
+  public trace(message: string, position: PositionOrNull = null):void {
     this.sendI(LogLevel.trace, `${NakoColors.color.bold}[デバッグ情報（詳細）]${NakoColors.color.reset}${stringifyPosition(position)}${message}`, position)
   }
 
@@ -142,7 +142,7 @@ export class NakoLogger {
    * @param {string} message
    * @param {Position | null} position
    */
-  public debug (message: string, position: PositionOrNull = null): void {
+  public debug(message: string, position: PositionOrNull = null): void {
     this.sendI(LogLevel.debug, `${NakoColors.color.bold}[デバッグ情報]${NakoColors.color.reset}${stringifyPosition(position)}${message}`, position)
   }
 
@@ -150,7 +150,7 @@ export class NakoLogger {
    * @param {string} message
    * @param {Position | null} position
    */
-  public info (message: string, position: PositionOrNull = null): void {
+  public info(message: string, position: PositionOrNull = null): void {
     this.sendI(LogLevel.info, `${NakoColors.color.bold}${NakoColors.color.blue}[情報]${NakoColors.color.reset}${stringifyPosition(position)}${message}`, position)
   }
 
@@ -158,7 +158,7 @@ export class NakoLogger {
    * @param {string} message
    * @param {Position | null} position
    */
-  public warn (message: string, position: PositionOrNull = null):void {
+  public warn(message: string, position: PositionOrNull = null):void {
     this.sendI(LogLevel.warn, `${NakoColors.color.bold}${NakoColors.color.green}[警告]${NakoColors.color.reset}${stringifyPosition(position)}${message}`, position)
   }
 
@@ -166,23 +166,23 @@ export class NakoLogger {
    * @param {string | Error} message
    * @param {Position | null} position
    */
-  public error (message: string | Error | NakoError, position: PositionOrNull = null):void {
+  public error(message: string | Error | NakoError, position: PositionOrNull = null):void {
     // NakoErrorか判定 (`message instanceof NakoError`では判定できない場合がある)
     if (message instanceof Error && typeof (message as NakoError).type === 'string') {
       // NakoErrorか
       const etype: string = (message as NakoError).type
       switch (etype) {
-        case 'NakoRuntimeError':
-        case 'NakoError':
-          if (message instanceof NakoError) {
-            const e: NakoError = message
-            let pos: any = position
-            if (pos === null || pos === undefined) {
-              pos = { file: e.file, line: e.line || 0, startOffset: 0, endOffset: 0 }
-            }
-            this.sendI(LogLevel.error, e.message, pos)
-            return
+      case 'NakoRuntimeError':
+      case 'NakoError':
+        if (message instanceof NakoError) {
+          const e: NakoError = message
+          let pos: any = position
+          if (pos === null || pos === undefined) {
+            pos = { file: e.file, line: e.line || 0, startOffset: 0, endOffset: 0 }
           }
+          this.sendI(LogLevel.error, e.message, pos)
+          return
+        }
       }
     }
     if (message instanceof Error) {
@@ -196,7 +196,7 @@ export class NakoLogger {
   }
 
   /** RuntimeErrorを生成する */
-  public runtimeError (error: any, posStr: string): NakoRuntimeError {
+  public runtimeError(error: any, posStr: string): NakoRuntimeError {
     const e = new NakoRuntimeError(error, posStr)
     return e
   }
@@ -205,18 +205,18 @@ export class NakoLogger {
    * @param {string} message
    * @param {Position | null} position
    */
-  public stdout (message: string, position: PositionOrNull = null): void {
+  public stdout(message: string, position: PositionOrNull = null): void {
     this.sendI(LogLevel.stdout, `${message}`, position)
   }
 
   /** 指定したlevelのlistenerにメッセージを送る。htmlやbrowserConsoleは無ければnodeConsoleから生成する。 */
-  public send (levelStr: string, nodeConsole: string, position: PositionOrNull, html: string|null = null, browserConsole: [string, string] | null = null): void {
+  public send(levelStr: string, nodeConsole: string, position: PositionOrNull, html: string|null = null, browserConsole: [string, string] | null = null): void {
     const i = LogLevel.fromS(levelStr)
     this.sendI(i, nodeConsole, position, html, browserConsole)
   }
 
   /** 指定したlevelのlistenerにメッセージを送る。htmlやbrowserConsoleは無ければnodeConsoleから生成する。 */
-  public sendI (level: number, nodeConsole: string, position: PositionOrNull, html: string|null = null, browserConsole: [string, string] | null = null): void {
+  public sendI(level: number, nodeConsole: string, position: PositionOrNull, html: string|null = null, browserConsole: [string, string] | null = null): void {
     const makeData = () => {
       // nodeConsoleからnoColor, nodeCondoleなどの形式を生成する。
       const formats = NakoColors.convertColorTextFormat(nodeConsole)

package/core/src/nako_parser3.mjs

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * nadesiko v3 parser
  */
@@ -341,7 +340,7 @@ export class NakoParser extends NakoParserBase {
             else {
                 throw NakoSyntaxError.fromNode('関数の属性の指定が正しくありません。『{』と『}』で囲む必要があります。', def);
             }
-            if (funcAttribute != null) {
+            if (funcAttribute !== null) {
                 if (funcAttribute.value === '公開') {
                     isExport = true;
                 }
@@ -533,7 +532,7 @@ export class NakoParser extends NakoParserBase {
             return null;
         }
         const mosi = this.get(); // skip もし
-        if (mosi == null) {
+        if (mosi === null) {
             return null;
         }
         while (this.check('comma')) {
@@ -1140,7 +1139,7 @@ export class NakoParser extends NakoParserBase {
         }
         if (vFrom === null || vTo === null) {
             // 『AからBの範囲を繰り返す』構文のとき (#1704)
-            if (vFrom == null && vTo && (vTo.type === 'func' && vTo.name === '範囲')) {
+            if (vFrom === null && vTo && (vTo.type === 'func' && vTo.name === '範囲')) {
                 // ok
             }
             else {
@@ -1745,7 +1744,7 @@ export class NakoParser extends NakoParserBase {
                 this.modName = space;
             }
             const isexport = this.isExportStack.pop();
-            if (isexport != null) {
+            if (isexport !== null && isexport !== undefined) {
                 this.isExportDefault = isexport;
             }
         }