vba-runner 0.1.1-alpha.2 → 0.1.1-alpha.4

package/dist/bin/vba-analyzer.cjs

@@ -2521,7 +2521,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2539,7 +2539,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2864,13 +2864,39 @@ function evaluateCCExpr(expr, resolve) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/vba-analyzer.ts
 var fs = __toESM(require("fs"), 1);
 var path = __toESM(require("path"), 1);
 
 // ../../test-libs/version.ts
-var VERSION = "0.1.1-alpha.1";
+var import_fs = require("fs");
+var import_path = require("path");
+function readVersion() {
+  for (const rel of ["../build/runner/package.json", "../../package.json"]) {
+    try {
+      return JSON.parse((0, import_fs.readFileSync)((0, import_path.join)(__dirname, rel), "utf8")).version;
+    } catch {
+    }
+  }
+  return "unknown";
+}
+var VERSION = readVersion();
 
 // ../../test-libs/vba-analyzer.ts
 function isStatementArray(v) {
@@ -4379,7 +4405,9 @@ function analyzeGotoInProc(proc) {
   };
 }
 function analyzeFile(filePath) {
-  const src = fs.readFileSync(filePath, "utf-8");
+  const ext = path.extname(filePath).toLowerCase();
+  const raw = fs.readFileSync(filePath, "utf-8");
+  const src = stripVBAFileHeader(raw);
   const lines = src.split("\n");
   const warnings = [];
   let ast;

package/dist/bin/vba-formatter.cjs

@@ -943,7 +943,18 @@ function applyEdits(source, edits) {
 }
 
 // ../../test-libs/version.ts
-var VERSION = "0.1.1-alpha.1";
+var import_fs = require("fs");
+var import_path = require("path");
+function readVersion() {
+  for (const rel of ["../build/runner/package.json", "../../package.json"]) {
+    try {
+      return JSON.parse((0, import_fs.readFileSync)((0, import_path.join)(__dirname, rel), "utf8")).version;
+    } catch {
+    }
+  }
+  return "unknown";
+}
+var VERSION = readVersion();
 
 // ../../test-libs/vba-formatter.ts
 var VBA_EXTENSIONS = /\.(bas|cls|frm)$/i;

package/dist/bin/vba-parse-check.cjs

@@ -2508,7 +2508,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2526,7 +2526,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2604,16 +2604,46 @@ var Parser = class _Parser {
   }
 };
 
+// ../../src/engine/preprocessor.ts
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
+
 // ../../test-libs/vba-parse-check.ts
 var fs = __toESM(require("fs"), 1);
 var path = __toESM(require("path"), 1);
 
 // ../../test-libs/version.ts
-var VERSION = "0.1.1-alpha.1";
+var import_fs = require("fs");
+var import_path = require("path");
+function readVersion() {
+  for (const rel of ["../build/runner/package.json", "../../package.json"]) {
+    try {
+      return JSON.parse((0, import_fs.readFileSync)((0, import_path.join)(__dirname, rel), "utf8")).version;
+    } catch {
+    }
+  }
+  return "unknown";
+}
+var VERSION = readVersion();
 
 // ../../test-libs/vba-parse-check.ts
 function checkFile(filePath) {
-  const src = fs.readFileSync(filePath, "utf8");
+  const ext = path.extname(filePath).toLowerCase();
+  const raw = fs.readFileSync(filePath, "utf8");
+  const src = stripVBAFileHeader(raw);
   const diags = [];
   const lexer = new Lexer(src);
   let tokens;

package/dist/bin/vba-run.cjs

@@ -2510,7 +2510,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2528,7 +2528,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -4294,6 +4294,16 @@ var Evaluator = class _Evaluator {
   inConstEval = false;
   vbaCallStack = [];
   debugHook = null;
+  /**
+   * resolveIdentifiers 完了後に true になる。
+   * evaluateModule はこのフラグを見て、バッチロード中（false）はモジュールレベル
+   * 実行文を pendingTopLevel に退避し、インタラクティブ呼び出し（true）では即時実行する。
+   */
+  resolveIdentifiersDone = false;
+  /** Pass 1 で配列境界を評価できなかった VariableDeclaration。Pass 2 で再評価。 */
+  pendingArrayDecls = [];
+  /** Pass 1 でシンボルテーブルに退避したモジュールレベル実行文。Pass 2 後に実行。 */
+  pendingTopLevel = [];
   constructor(onPrint, config = {}) {
     this.builtinEnv = new Environment();
     this.env = this.builtinEnv;
@@ -5715,22 +5725,70 @@ var Evaluator = class _Evaluator {
     }
   }
   /**
-   * Pass 1: 1モジュール分の AST を登録する。
-   * 手続き・変数を env に登録する。
-   * モジュールレベル ConstDeclaration はスキップし、Pass 2（resolveIdentifiers）で評価する。
+   * モジュールレベルでシンボルテーブルに登録すべき宣言文かどうかを返す。
+   * false の場合はモジュールレベル実行文として pendingTopLevel に退避する。
+   */
+  isModuleLevelDeclaration(stmt) {
+    switch (stmt.type) {
+      case "ProcedureDeclaration":
+      case "VariableDeclaration":
+      case "ConstDeclaration":
+      case "TypeDeclaration":
+      case "ClassDeclaration":
+      case "EnumDeclaration":
+      case "OptionExplicitStatement":
+      case "OptionBaseStatement":
+      case "OptionCompareStatement":
+      case "OptionPrivateModuleStatement":
+      case "DefDirective":
+      case "AttributeStatement":
+      case "DeclareStatement":
+      case "EventDeclaration":
+      case "ImplementsDirective":
+      case "LabelStatement":
+        return true;
+      default:
+        return false;
+    }
+  }
+  /**
+   * Pass 1: 1モジュール分の AST を登録する（シンボルテーブル構築）。
    *
-   * Option Explicit チェックは Pass 2（resolveIdentifiers）に一本化している。
-   * Pass 2 は全モジュール名を知った精密モードで実行され、Pass 1 の保守的チェックの
-   * 厳密な上位集合なので、ここでは行わない。
+   * - ConstDeclaration      → スキップ。Pass 2（resolveIdentifiers）で依存順に評価。
+   * - VariableDeclaration   → 配列境界なしは即時登録。配列境界ありは pendingArrayDecls
+   *                           に退避し Pass 2 で Const 解決後に評価。
+   * - モジュールレベル実行文 → resolveIdentifiers 完了前（バッチロード中）は
+   *                           pendingTopLevel に退避。Pass 2 後に実行。
+   *                           resolveIdentifiers 完了後（インタラクティブ呼び出し）は
+   *                           即時実行（evalExpression や追加モジュールロード等）。
    */
   evaluateModule(program) {
     if (this.currentSourceModule && !this.env.hasVariable(this.currentSourceModule.toLowerCase())) {
       this.env.set(this.currentSourceModule.toLowerCase(), new VbaNamespaceRef(this.currentSourceModule, "module"));
     }
+    const batchMode = !this.resolveIdentifiersDone;
+    const topLevelStmts = [];
     for (const stmt of program.body) {
-      if (stmt.type === "ConstDeclaration") continue;
+      if (stmt.type === "ConstDeclaration") {
+        if (!batchMode) this.evaluateConstDeclaration(stmt);
+        continue;
+      }
+      if (batchMode && stmt.type === "VariableDeclaration") {
+        const varDecl = stmt;
+        if (varDecl.declarations.some((d) => d.isArray && d.arrayBounds && d.arrayBounds.length > 0)) {
+          this.pendingArrayDecls.push({ stmt: varDecl, moduleName: this.currentSourceModule || "" });
+          continue;
+        }
+      }
+      if (batchMode && !this.isModuleLevelDeclaration(stmt)) {
+        topLevelStmts.push(stmt);
+        continue;
+      }
       this.evaluateStatement(stmt);
     }
+    if (batchMode && topLevelStmts.length > 0) {
+      this.pendingTopLevel.push({ moduleName: this.currentSourceModule || "", stmts: topLevelStmts });
+    }
   }
   /** @deprecated Use {@link evaluateModule} instead. */
   evaluate(program) {
@@ -7001,6 +7059,13 @@ var Evaluator = class _Evaluator {
       this.evaluateConstDeclaration(stmt);
       this.currentSourceModule = prev;
     }
+    for (const { stmt, moduleName } of this.pendingArrayDecls) {
+      const prev = this.currentSourceModule;
+      this.currentSourceModule = moduleName;
+      this.evaluateVariableDeclaration(stmt);
+      this.currentSourceModule = prev;
+    }
+    this.pendingArrayDecls = [];
     for (const { ast, moduleName } of modules) {
       const seen = /* @__PURE__ */ new Set();
       for (const stmt of ast.body) {
@@ -7026,6 +7091,16 @@ var Evaluator = class _Evaluator {
         }
       }
     }
+    this.resolveIdentifiersDone = true;
+    for (const { moduleName, stmts } of this.pendingTopLevel) {
+      const prev = this.currentSourceModule;
+      this.currentSourceModule = moduleName;
+      for (const stmt of stmts) {
+        this.evaluateStatement(stmt);
+      }
+      this.currentSourceModule = prev;
+    }
+    this.pendingTopLevel = [];
   }
   /** @deprecated Use {@link resolveIdentifiers} instead. */
   reEvaluateModuleConstsAll(modules) {
@@ -9707,9 +9782,35 @@ function evaluateCCExpr(expr, resolve2) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/version.ts
-var VERSION = "0.1.1-alpha.1";
+var import_fs = require("fs");
+var import_path2 = require("path");
+function readVersion() {
+  for (const rel of ["../build/runner/package.json", "../../package.json"]) {
+    try {
+      return JSON.parse((0, import_fs.readFileSync)((0, import_path2.join)(__dirname, rel), "utf8")).version;
+    } catch {
+    }
+  }
+  return "unknown";
+}
+var VERSION = readVersion();
 
 // ../../test-libs/vba-run.ts
 var VBA_EXTENSIONS = /* @__PURE__ */ new Set([".bas", ".cls", ".frm"]);
@@ -9754,8 +9855,10 @@ function main(args) {
   for (const file of files) {
     const moduleName = path4.basename(file, path4.extname(file));
     ev.setSourceModule(moduleName);
-    const src = preprocess(fs2.readFileSync(file, "utf-8"));
     const ext = path4.extname(file).toLowerCase();
+    let src = fs2.readFileSync(file, "utf-8");
+    src = stripVBAFileHeader(src);
+    src = preprocess(src);
     const isRawCls = ext === ".cls" && !src.trim().toLowerCase().startsWith("class ") && !src.toLowerCase().includes("end class");
     const ast = new Parser(new Lexer(src).tokenize(), isRawCls ? { parseAsClass: moduleName } : {}).parse();
     ev.evaluateModule(ast);

package/dist/bin/vba-runner.cjs

@@ -2500,7 +2500,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2518,7 +2518,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -4284,6 +4284,16 @@ var Evaluator = class _Evaluator {
   inConstEval = false;
   vbaCallStack = [];
   debugHook = null;
+  /**
+   * resolveIdentifiers 完了後に true になる。
+   * evaluateModule はこのフラグを見て、バッチロード中（false）はモジュールレベル
+   * 実行文を pendingTopLevel に退避し、インタラクティブ呼び出し（true）では即時実行する。
+   */
+  resolveIdentifiersDone = false;
+  /** Pass 1 で配列境界を評価できなかった VariableDeclaration。Pass 2 で再評価。 */
+  pendingArrayDecls = [];
+  /** Pass 1 でシンボルテーブルに退避したモジュールレベル実行文。Pass 2 後に実行。 */
+  pendingTopLevel = [];
   constructor(onPrint, config = {}) {
     this.builtinEnv = new Environment();
     this.env = this.builtinEnv;
@@ -5705,22 +5715,70 @@ var Evaluator = class _Evaluator {
     }
   }
   /**
-   * Pass 1: 1モジュール分の AST を登録する。
-   * 手続き・変数を env に登録する。
-   * モジュールレベル ConstDeclaration はスキップし、Pass 2（resolveIdentifiers）で評価する。
+   * モジュールレベルでシンボルテーブルに登録すべき宣言文かどうかを返す。
+   * false の場合はモジュールレベル実行文として pendingTopLevel に退避する。
+   */
+  isModuleLevelDeclaration(stmt) {
+    switch (stmt.type) {
+      case "ProcedureDeclaration":
+      case "VariableDeclaration":
+      case "ConstDeclaration":
+      case "TypeDeclaration":
+      case "ClassDeclaration":
+      case "EnumDeclaration":
+      case "OptionExplicitStatement":
+      case "OptionBaseStatement":
+      case "OptionCompareStatement":
+      case "OptionPrivateModuleStatement":
+      case "DefDirective":
+      case "AttributeStatement":
+      case "DeclareStatement":
+      case "EventDeclaration":
+      case "ImplementsDirective":
+      case "LabelStatement":
+        return true;
+      default:
+        return false;
+    }
+  }
+  /**
+   * Pass 1: 1モジュール分の AST を登録する（シンボルテーブル構築）。
    *
-   * Option Explicit チェックは Pass 2（resolveIdentifiers）に一本化している。
-   * Pass 2 は全モジュール名を知った精密モードで実行され、Pass 1 の保守的チェックの
-   * 厳密な上位集合なので、ここでは行わない。
+   * - ConstDeclaration      → スキップ。Pass 2（resolveIdentifiers）で依存順に評価。
+   * - VariableDeclaration   → 配列境界なしは即時登録。配列境界ありは pendingArrayDecls
+   *                           に退避し Pass 2 で Const 解決後に評価。
+   * - モジュールレベル実行文 → resolveIdentifiers 完了前（バッチロード中）は
+   *                           pendingTopLevel に退避。Pass 2 後に実行。
+   *                           resolveIdentifiers 完了後（インタラクティブ呼び出し）は
+   *                           即時実行（evalExpression や追加モジュールロード等）。
    */
   evaluateModule(program) {
     if (this.currentSourceModule && !this.env.hasVariable(this.currentSourceModule.toLowerCase())) {
       this.env.set(this.currentSourceModule.toLowerCase(), new VbaNamespaceRef(this.currentSourceModule, "module"));
     }
+    const batchMode = !this.resolveIdentifiersDone;
+    const topLevelStmts = [];
     for (const stmt of program.body) {
-      if (stmt.type === "ConstDeclaration") continue;
+      if (stmt.type === "ConstDeclaration") {
+        if (!batchMode) this.evaluateConstDeclaration(stmt);
+        continue;
+      }
+      if (batchMode && stmt.type === "VariableDeclaration") {
+        const varDecl = stmt;
+        if (varDecl.declarations.some((d) => d.isArray && d.arrayBounds && d.arrayBounds.length > 0)) {
+          this.pendingArrayDecls.push({ stmt: varDecl, moduleName: this.currentSourceModule || "" });
+          continue;
+        }
+      }
+      if (batchMode && !this.isModuleLevelDeclaration(stmt)) {
+        topLevelStmts.push(stmt);
+        continue;
+      }
       this.evaluateStatement(stmt);
     }
+    if (batchMode && topLevelStmts.length > 0) {
+      this.pendingTopLevel.push({ moduleName: this.currentSourceModule || "", stmts: topLevelStmts });
+    }
   }
   /** @deprecated Use {@link evaluateModule} instead. */
   evaluate(program) {
@@ -6991,6 +7049,13 @@ var Evaluator = class _Evaluator {
       this.evaluateConstDeclaration(stmt);
       this.currentSourceModule = prev;
     }
+    for (const { stmt, moduleName } of this.pendingArrayDecls) {
+      const prev = this.currentSourceModule;
+      this.currentSourceModule = moduleName;
+      this.evaluateVariableDeclaration(stmt);
+      this.currentSourceModule = prev;
+    }
+    this.pendingArrayDecls = [];
     for (const { ast, moduleName } of modules) {
       const seen = /* @__PURE__ */ new Set();
       for (const stmt of ast.body) {
@@ -7016,6 +7081,16 @@ var Evaluator = class _Evaluator {
         }
       }
     }
+    this.resolveIdentifiersDone = true;
+    for (const { moduleName, stmts } of this.pendingTopLevel) {
+      const prev = this.currentSourceModule;
+      this.currentSourceModule = moduleName;
+      for (const stmt of stmts) {
+        this.evaluateStatement(stmt);
+      }
+      this.currentSourceModule = prev;
+    }
+    this.pendingTopLevel = [];
   }
   /** @deprecated Use {@link resolveIdentifiers} instead. */
   reEvaluateModuleConstsAll(modules) {
@@ -9697,9 +9772,35 @@ function evaluateCCExpr(expr, resolve2) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/version.ts
-var VERSION = "0.1.1-alpha.1";
+var import_fs = require("fs");
+var import_path2 = require("path");
+function readVersion() {
+  for (const rel of ["../build/runner/package.json", "../../package.json"]) {
+    try {
+      return JSON.parse((0, import_fs.readFileSync)((0, import_path2.join)(__dirname, rel), "utf8")).version;
+    } catch {
+    }
+  }
+  return "unknown";
+}
+var VERSION = readVersion();
 
 // ../../test-libs/vba-run.ts
 var VBA_EXTENSIONS = /* @__PURE__ */ new Set([".bas", ".cls", ".frm"]);
@@ -9744,8 +9845,10 @@ function main(args) {
   for (const file of files) {
     const moduleName = path4.basename(file, path4.extname(file));
     ev.setSourceModule(moduleName);
-    const src = preprocess(fs2.readFileSync(file, "utf-8"));
     const ext = path4.extname(file).toLowerCase();
+    let src = fs2.readFileSync(file, "utf-8");
+    src = stripVBAFileHeader(src);
+    src = preprocess(src);
     const isRawCls = ext === ".cls" && !src.trim().toLowerCase().startsWith("class ") && !src.toLowerCase().includes("end class");
     const ast = new Parser(new Lexer(src).tokenize(), isRawCls ? { parseAsClass: moduleName } : {}).parse();
     ev.evaluateModule(ast);
@@ -11271,7 +11374,9 @@ function analyzeGotoInProc(proc) {
   };
 }
 function analyzeFile(filePath) {
-  const src = fs3.readFileSync(filePath, "utf-8");
+  const ext = path5.extname(filePath).toLowerCase();
+  const raw = fs3.readFileSync(filePath, "utf-8");
+  const src = stripVBAFileHeader(raw);
   const lines = src.split("\n");
   const warnings = [];
   let ast;
@@ -12730,7 +12835,9 @@ if (process.argv[1]?.includes("vba-formatter")) main3(process.argv.slice(2));
 var fs5 = __toESM(require("fs"), 1);
 var path7 = __toESM(require("path"), 1);
 function checkFile(filePath) {
-  const src = fs5.readFileSync(filePath, "utf8");
+  const ext = path7.extname(filePath).toLowerCase();
+  const raw = fs5.readFileSync(filePath, "utf8");
+  const src = stripVBAFileHeader(raw);
   const diags = [];
   const lexer = new Lexer(src);
   let tokens;

package/dist/lib.cjs

@@ -2522,7 +2522,7 @@ var Parser = class _Parser {
   parseEventDeclaration(scope) {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -2540,7 +2540,7 @@ var Parser = class _Parser {
   parseRaiseEventStatement() {
     this.advance();
     const idToken = this.advance();
-    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
+    if (!this.isIdentifier(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
     if (this.match(128 /* OperatorLParen */)) {
@@ -4306,6 +4306,16 @@ var Evaluator = class _Evaluator {
   inConstEval = false;
   vbaCallStack = [];
   debugHook = null;
+  /**
+   * resolveIdentifiers 完了後に true になる。
+   * evaluateModule はこのフラグを見て、バッチロード中（false）はモジュールレベル
+   * 実行文を pendingTopLevel に退避し、インタラクティブ呼び出し（true）では即時実行する。
+   */
+  resolveIdentifiersDone = false;
+  /** Pass 1 で配列境界を評価できなかった VariableDeclaration。Pass 2 で再評価。 */
+  pendingArrayDecls = [];
+  /** Pass 1 でシンボルテーブルに退避したモジュールレベル実行文。Pass 2 後に実行。 */
+  pendingTopLevel = [];
   constructor(onPrint, config = {}) {
     this.builtinEnv = new Environment();
     this.env = this.builtinEnv;
@@ -5727,22 +5737,70 @@ var Evaluator = class _Evaluator {
     }
   }
   /**
-   * Pass 1: 1モジュール分の AST を登録する。
-   * 手続き・変数を env に登録する。
-   * モジュールレベル ConstDeclaration はスキップし、Pass 2（resolveIdentifiers）で評価する。
+   * モジュールレベルでシンボルテーブルに登録すべき宣言文かどうかを返す。
+   * false の場合はモジュールレベル実行文として pendingTopLevel に退避する。
+   */
+  isModuleLevelDeclaration(stmt) {
+    switch (stmt.type) {
+      case "ProcedureDeclaration":
+      case "VariableDeclaration":
+      case "ConstDeclaration":
+      case "TypeDeclaration":
+      case "ClassDeclaration":
+      case "EnumDeclaration":
+      case "OptionExplicitStatement":
+      case "OptionBaseStatement":
+      case "OptionCompareStatement":
+      case "OptionPrivateModuleStatement":
+      case "DefDirective":
+      case "AttributeStatement":
+      case "DeclareStatement":
+      case "EventDeclaration":
+      case "ImplementsDirective":
+      case "LabelStatement":
+        return true;
+      default:
+        return false;
+    }
+  }
+  /**
+   * Pass 1: 1モジュール分の AST を登録する（シンボルテーブル構築）。
    *
-   * Option Explicit チェックは Pass 2（resolveIdentifiers）に一本化している。
-   * Pass 2 は全モジュール名を知った精密モードで実行され、Pass 1 の保守的チェックの
-   * 厳密な上位集合なので、ここでは行わない。
+   * - ConstDeclaration      → スキップ。Pass 2（resolveIdentifiers）で依存順に評価。
+   * - VariableDeclaration   → 配列境界なしは即時登録。配列境界ありは pendingArrayDecls
+   *                           に退避し Pass 2 で Const 解決後に評価。
+   * - モジュールレベル実行文 → resolveIdentifiers 完了前（バッチロード中）は
+   *                           pendingTopLevel に退避。Pass 2 後に実行。
+   *                           resolveIdentifiers 完了後（インタラクティブ呼び出し）は
+   *                           即時実行（evalExpression や追加モジュールロード等）。
    */
   evaluateModule(program) {
     if (this.currentSourceModule && !this.env.hasVariable(this.currentSourceModule.toLowerCase())) {
       this.env.set(this.currentSourceModule.toLowerCase(), new VbaNamespaceRef(this.currentSourceModule, "module"));
     }
+    const batchMode = !this.resolveIdentifiersDone;
+    const topLevelStmts = [];
     for (const stmt of program.body) {
-      if (stmt.type === "ConstDeclaration") continue;
+      if (stmt.type === "ConstDeclaration") {
+        if (!batchMode) this.evaluateConstDeclaration(stmt);
+        continue;
+      }
+      if (batchMode && stmt.type === "VariableDeclaration") {
+        const varDecl = stmt;
+        if (varDecl.declarations.some((d) => d.isArray && d.arrayBounds && d.arrayBounds.length > 0)) {
+          this.pendingArrayDecls.push({ stmt: varDecl, moduleName: this.currentSourceModule || "" });
+          continue;
+        }
+      }
+      if (batchMode && !this.isModuleLevelDeclaration(stmt)) {
+        topLevelStmts.push(stmt);
+        continue;
+      }
       this.evaluateStatement(stmt);
     }
+    if (batchMode && topLevelStmts.length > 0) {
+      this.pendingTopLevel.push({ moduleName: this.currentSourceModule || "", stmts: topLevelStmts });
+    }
   }
   /** @deprecated Use {@link evaluateModule} instead. */
   evaluate(program) {
@@ -7013,6 +7071,13 @@ var Evaluator = class _Evaluator {
       this.evaluateConstDeclaration(stmt);
       this.currentSourceModule = prev;
     }
+    for (const { stmt, moduleName } of this.pendingArrayDecls) {
+      const prev = this.currentSourceModule;
+      this.currentSourceModule = moduleName;
+      this.evaluateVariableDeclaration(stmt);
+      this.currentSourceModule = prev;
+    }
+    this.pendingArrayDecls = [];
     for (const { ast, moduleName } of modules) {
       const seen = /* @__PURE__ */ new Set();
       for (const stmt of ast.body) {
@@ -7038,6 +7103,16 @@ var Evaluator = class _Evaluator {
         }
       }
     }
+    this.resolveIdentifiersDone = true;
+    for (const { moduleName, stmts } of this.pendingTopLevel) {
+      const prev = this.currentSourceModule;
+      this.currentSourceModule = moduleName;
+      for (const stmt of stmts) {
+        this.evaluateStatement(stmt);
+      }
+      this.currentSourceModule = prev;
+    }
+    this.pendingTopLevel = [];
   }
   /** @deprecated Use {@link resolveIdentifiers} instead. */
   reEvaluateModuleConstsAll(modules) {
@@ -9666,6 +9741,21 @@ function evaluateCCExpr(expr, resolve2) {
   }
   return parseOr();
 }
+function stripVBAFileHeader(source) {
+  const lines = source.split("\n");
+  if (!lines[0]?.trimEnd().toUpperCase().startsWith("VERSION")) return source;
+  const result = [...lines];
+  let i = 0;
+  result[i] = "";
+  i++;
+  while (i < result.length) {
+    const trimmed = result[i].trimEnd().toUpperCase();
+    result[i] = "";
+    i++;
+    if (trimmed === "END") break;
+  }
+  return result.join("\n");
+}
 
 // ../../test-libs/mock-loader.ts
 var fs = __toESM(require("fs"), 1);
@@ -9720,7 +9810,8 @@ function loadVbaMock(file, evaluator) {
     const source = fs.readFileSync(file, "utf-8");
     const ext = path4.extname(file).toLowerCase();
     const moduleName = path4.basename(file, ext);
-    const processed = preprocess(source);
+    const stripped = stripVBAFileHeader(source);
+    const processed = preprocess(stripped);
     const isRawCls = ext === ".cls" && !processed.trim().toLowerCase().startsWith("class ") && !processed.toLowerCase().includes("end class");
     const parseOpts = isRawCls ? { parseAsClass: moduleName } : {};
     const classesBefore = evaluator.getRegisteredClassNames();
@@ -10577,8 +10668,9 @@ var VBARunner = class {
       try {
         const moduleName = path5.basename(file, path5.extname(file));
         this.evaluator.setSourceModule(moduleName);
-        source = preprocess(source, config.compilerConstants);
         const ext = path5.extname(file).toLowerCase();
+        source = stripVBAFileHeader(source);
+        source = preprocess(source, config.compilerConstants);
         const isRawCls = ext === ".cls" && !source.trim().toLowerCase().startsWith("class ") && !source.toLowerCase().includes("end class");
         const parseOpts = isRawCls ? { parseAsClass: moduleName } : {};
         const ast = new Parser(new Lexer(source).tokenize(), parseOpts).parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vba-runner",
-  "version": "0.1.1-alpha.2",
+  "version": "0.1.1-alpha.4",
   "description": "VBA execution engine with test runner and CLI tools (analyzer, formatter, parse-check)",
   "type": "module",
   "license": "MIT",