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

package/dist/bin/vba-analyzer.cjs

@@ -41,6 +41,7 @@ __export(vba_analyzer_exports, {
   formatWorkspaceOutlineForMcp: () => formatWorkspaceOutline,
   formatWorkspaceReportForMcp: () => formatWorkspaceReportForMcp,
   formatWorkspaceSummary: () => formatWorkspaceSummary,
+  main: () => main,
   paramName: () => paramName,
   vbaTypeToTs: () => vbaTypeToTs
 });
@@ -113,7 +114,7 @@ var Lexer = class _Lexer {
       const startLine = this.line;
       const startColumn = this.column;
       if (this.pos >= this.input.length) {
-        return { type: 136 /* EOF */, value: "", line: startLine, column: startColumn };
+        return { type: 137 /* EOF */, value: "", line: startLine, column: startColumn };
       }
       const char = this.peek();
       if (char === "#") {
@@ -142,12 +143,12 @@ var Lexer = class _Lexer {
             }
             if (this.peek() === "#") {
               this.advance();
-              return { type: 134 /* Date */, value: dateValue, line: startLine, column: startColumn };
+              return { type: 135 /* Date */, value: dateValue, line: startLine, column: startColumn };
             }
           }
         }
         this.advance();
-        return { type: 111 /* OperatorHash */, value: "#", line: startLine, column: startColumn };
+        return { type: 112 /* OperatorHash */, value: "#", line: startLine, column: startColumn };
       }
       if (char === "_") {
         const next = this.pos + 1 < this.input.length ? this.input[this.pos + 1] : "\0";
@@ -185,7 +186,7 @@ var Lexer = class _Lexer {
       }
       if (char === "\n") {
         this.advance();
-        return { type: 135 /* Newline */, value: "\n", line: startLine, column: startColumn };
+        return { type: 136 /* Newline */, value: "\n", line: startLine, column: startColumn };
       }
       if (char === '"') {
         this.advance();
@@ -207,39 +208,39 @@ var Lexer = class _Lexer {
       }
       if (char === "=") {
         this.advance();
-        return { type: 120 /* OperatorEquals */, value: "=", line: startLine, column: startColumn };
+        return { type: 121 /* OperatorEquals */, value: "=", line: startLine, column: startColumn };
       }
       if (char === "<") {
         this.advance();
         if (this.peek() === ">") {
           this.advance();
-          return { type: 121 /* OperatorNotEquals */, value: "<>", line: startLine, column: startColumn };
+          return { type: 122 /* OperatorNotEquals */, value: "<>", line: startLine, column: startColumn };
         }
         if (this.peek() === "=") {
           this.advance();
-          return { type: 124 /* OperatorLessThanOrEqual */, value: "<=", line: startLine, column: startColumn };
+          return { type: 125 /* OperatorLessThanOrEqual */, value: "<=", line: startLine, column: startColumn };
         }
-        return { type: 122 /* OperatorLessThan */, value: "<", line: startLine, column: startColumn };
+        return { type: 123 /* OperatorLessThan */, value: "<", line: startLine, column: startColumn };
       }
       if (char === ">") {
         this.advance();
         if (this.peek() === "=") {
           this.advance();
-          return { type: 125 /* OperatorGreaterThanOrEqual */, value: ">=", line: startLine, column: startColumn };
+          return { type: 126 /* OperatorGreaterThanOrEqual */, value: ">=", line: startLine, column: startColumn };
         }
-        return { type: 123 /* OperatorGreaterThan */, value: ">", line: startLine, column: startColumn };
+        return { type: 124 /* OperatorGreaterThan */, value: ">", line: startLine, column: startColumn };
       }
       if (char === "+") {
         this.advance();
-        return { type: 112 /* OperatorPlus */, value: "+", line: startLine, column: startColumn };
+        return { type: 113 /* OperatorPlus */, value: "+", line: startLine, column: startColumn };
       }
       if (char === "-") {
         this.advance();
-        return { type: 113 /* OperatorMinus */, value: "-", line: startLine, column: startColumn };
+        return { type: 114 /* OperatorMinus */, value: "-", line: startLine, column: startColumn };
       }
       if (char === "!") {
         this.advance();
-        return { type: 132 /* OperatorExclamation */, value: "!", line: startLine, column: startColumn };
+        return { type: 133 /* OperatorExclamation */, value: "!", line: startLine, column: startColumn };
       }
       if (char === "&") {
         this.advance();
@@ -261,23 +262,23 @@ var Lexer = class _Lexer {
           if (NUMERIC_TYPE_SUFFIXES.has(this.peek())) this.advance();
           return { type: 1 /* Number */, value: "0o" + octStr, line: startLine, column: startColumn };
         }
-        return { type: 117 /* OperatorAmpersand */, value: "&", line: startLine, column: startColumn };
+        return { type: 118 /* OperatorAmpersand */, value: "&", line: startLine, column: startColumn };
       }
       if (char === ",") {
         this.advance();
-        return { type: 126 /* OperatorComma */, value: ",", line: startLine, column: startColumn };
+        return { type: 127 /* OperatorComma */, value: ",", line: startLine, column: startColumn };
       }
       if (char === "#") {
         this.advance();
-        return { type: 111 /* OperatorHash */, value: "#", line: startLine, column: startColumn };
+        return { type: 112 /* OperatorHash */, value: "#", line: startLine, column: startColumn };
       }
       if (char === "(") {
         this.advance();
-        return { type: 127 /* OperatorLParen */, value: "(", line: startLine, column: startColumn };
+        return { type: 128 /* OperatorLParen */, value: "(", line: startLine, column: startColumn };
       }
       if (char === ")") {
         this.advance();
-        return { type: 128 /* OperatorRParen */, value: ")", line: startLine, column: startColumn };
+        return { type: 129 /* OperatorRParen */, value: ")", line: startLine, column: startColumn };
       }
       if (char === "[") {
         this.advance();
@@ -286,23 +287,23 @@ var Lexer = class _Lexer {
           foreignStr += this.advance();
         }
         if (this.peek() === "]") this.advance();
-        return { type: 138 /* ForeignName */, value: foreignStr, line: startLine, column: startColumn };
+        return { type: 139 /* ForeignName */, value: foreignStr, line: startLine, column: startColumn };
       }
       if (char === ".") {
         this.advance();
-        return { type: 129 /* OperatorDot */, value: ".", line: startLine, column: startColumn };
+        return { type: 130 /* OperatorDot */, value: ".", line: startLine, column: startColumn };
       }
       if (char === ":") {
         this.advance();
         if (this.peek() === "=") {
           this.advance();
-          return { type: 131 /* OperatorColonEquals */, value: ":=", line: startLine, column: startColumn };
+          return { type: 132 /* OperatorColonEquals */, value: ":=", line: startLine, column: startColumn };
         }
-        return { type: 130 /* OperatorColon */, value: ":", line: startLine, column: startColumn };
+        return { type: 131 /* OperatorColon */, value: ":", line: startLine, column: startColumn };
       }
       if (char === ";") {
         this.advance();
-        return { type: 133 /* OperatorSemicolon */, value: ";", line: startLine, column: startColumn };
+        return { type: 134 /* OperatorSemicolon */, value: ";", line: startLine, column: startColumn };
       }
       if (this.isDigit(char)) {
         let numStr = "";
@@ -399,7 +400,7 @@ var Lexer = class _Lexer {
         if (lowerBase === "exit") return { type: 45 /* KeywordExit */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "byref") return { type: 46 /* KeywordByRef */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "byval") return { type: 47 /* KeywordByVal */, value: idStr, line: startLine, column: startColumn };
-        if (lowerBase === "mod") return { type: 118 /* KeywordMod */, value: idStr, line: startLine, column: startColumn };
+        if (lowerBase === "mod") return { type: 119 /* KeywordMod */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "type") return { type: 48 /* KeywordType */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "nothing") return { type: 49 /* KeywordNothing */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "optional") return { type: 50 /* KeywordOptional */, value: idStr, line: startLine, column: startColumn };
@@ -460,26 +461,42 @@ var Lexer = class _Lexer {
         if (lowerBase === "midb") return { type: 108 /* KeywordMid */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "width") return { type: 109 /* KeywordWidth */, value: idStr, line: startLine, column: startColumn };
         if (lowerBase === "addressof") return { type: 110 /* KeywordAddressOf */, value: idStr, line: startLine, column: startColumn };
+        if ([
+          "defbool",
+          "defbyte",
+          "defint",
+          "deflng",
+          "deflnglng",
+          "deflngptr",
+          "defsng",
+          "defdbl",
+          "defcur",
+          "defdate",
+          "defstr",
+          "defobj",
+          "defvar"
+        ].includes(lowerBase))
+          return { type: 111 /* KeywordDef */, value: idStr, line: startLine, column: startColumn };
         return { type: 0 /* Identifier */, value: idStr, line: startLine, column: startColumn };
       }
       if (char === "*") {
         this.advance();
-        return { type: 114 /* OperatorMultiply */, value: "*", line: startLine, column: startColumn };
+        return { type: 115 /* OperatorMultiply */, value: "*", line: startLine, column: startColumn };
       }
       if (char === "/") {
         this.advance();
-        return { type: 115 /* OperatorDivide */, value: "/", line: startLine, column: startColumn };
+        return { type: 116 /* OperatorDivide */, value: "/", line: startLine, column: startColumn };
       }
       if (char === "\\") {
         this.advance();
-        return { type: 116 /* OperatorIntDivide */, value: "\\", line: startLine, column: startColumn };
+        return { type: 117 /* OperatorIntDivide */, value: "\\", line: startLine, column: startColumn };
       }
       if (char === "^") {
         this.advance();
-        return { type: 119 /* OperatorPower */, value: "^", line: startLine, column: startColumn };
+        return { type: 120 /* OperatorPower */, value: "^", line: startLine, column: startColumn };
       }
       const unknownChar = this.advance();
-      return { type: 137 /* Unknown */, value: unknownChar, line: startLine, column: startColumn };
+      return { type: 138 /* Unknown */, value: unknownChar, line: startLine, column: startColumn };
     }
   }
   tokenize() {
@@ -488,7 +505,7 @@ var Lexer = class _Lexer {
     do {
       token = this.getNextToken();
       tokens.push(token);
-    } while (token.type !== 136 /* EOF */);
+    } while (token.type !== 137 /* EOF */);
     return tokens;
   }
 };
@@ -591,31 +608,52 @@ var Parser = class _Parser {
     ..._Parser.CONTEXTUAL_KW_STMT_ABSENT,
     ..._Parser.CONTEXTUAL_KW_STRUCTURAL
   ]);
-  /** <statement-keyword> tokens additionally permitted as IDENTIFIERs in
-   *  expression context (parsePrimary) for practical VBA compatibility —
-   *  e.g. as method names (obj.Print, ws.Get) or file I/O targets.
-   *  These remain <reserved-identifier> per §3.3.5.2. */
+  /** <statement-keyword> tokens that are <reserved-identifier> per §3.3.5.2 but whose
+   *  enum values fall in [KeywordBase, KeywordAddressOf].
+   *  These CANNOT be used as module-level procedure names (parseProcedureDeclaration rejects them).
+   *  They ARE permitted as member names in expression context (obj.Print, ws.Get, obj.Open) via
+   *  parsePrimary, which is why they appear in COMPAT_KW_EXPR. */
+  static STATEMENT_KW_RESERVED = /* @__PURE__ */ new Set([
+    81 /* KeywordOpen */,
+    82 /* KeywordClose */,
+    84 /* KeywordInput */,
+    85 /* KeywordPrint */,
+    86 /* KeywordPut */,
+    92 /* KeywordWrite */,
+    93 /* KeywordLock */,
+    98 /* KeywordSeek */,
+    100 /* KeywordUnlock */,
+    102 /* KeywordEvent */,
+    103 /* KeywordRaiseEvent */,
+    105 /* KeywordImplements */
+  ]);
+  /** <statement-keyword> tokens permitted as member names in parsePrimary (obj.Print, ws.Get,
+   *  obj.Open, etc.) per §3.3.5.2 "unrestricted-name" rule.
+   *  In parseStatementInner these keywords are all dispatched unconditionally before the
+   *  identifier branch, so the COMPAT_KW_EXPR entries there are never reached — they exist
+   *  solely for parsePrimary dot-member-access context. */
   static COMPAT_KW_EXPR = /* @__PURE__ */ new Set([
     98 /* KeywordSeek */,
-    // <statement-keyword>
     84 /* KeywordInput */,
-    // <statement-keyword> / <special-form>
     85 /* KeywordPrint */,
-    // <statement-keyword>
     86 /* KeywordPut */,
-    // <statement-keyword>
     20 /* KeywordGet */,
-    // <statement-keyword>
+    // enum < KeywordBase so also rejected by range check in parseProcedureDeclaration
     93 /* KeywordLock */,
-    // <statement-keyword>
-    100 /* KeywordUnlock */
-    // <statement-keyword>
+    100 /* KeywordUnlock */,
+    81 /* KeywordOpen */,
+    82 /* KeywordClose */,
+    // Non-reserved statement keywords: can be user-defined proc names (e.g. Function Kill()).
+    // Included here so "Kill = v", "Reset = v", "Width = v" fall through to identifier branch.
+    97 /* KeywordKill */,
+    99 /* KeywordReset */,
+    109 /* KeywordWidth */
   ]);
   errorRecovery;
   /** Returns true if token is a valid IDENTIFIER per §3.3.5.2:
    *  either a plain lex-identifier or a contextual keyword that is not reserved. */
   isIdentifier(token) {
-    return token.type === 0 /* Identifier */ || token.type === 138 /* ForeignName */ || _Parser.CONTEXTUAL_KW.has(token.type);
+    return token.type === 0 /* Identifier */ || token.type === 139 /* ForeignName */ || _Parser.CONTEXTUAL_KW.has(token.type);
   }
   constructor(tokens, options = {}) {
     this.tokens = tokens;
@@ -624,15 +662,24 @@ var Parser = class _Parser {
   }
   // Keywords can appear as property/class names in VBA (e.g. obj.Property, New Collection)
   isNameToken(token) {
-    return token.type === 0 /* Identifier */ || token.type === 138 /* ForeignName */ || token.type >= 3 /* KeywordFor */ && token.type <= 110 /* KeywordAddressOf */;
-  }
+    return token.type === 0 /* Identifier */ || token.type === 139 /* ForeignName */ || token.type >= 3 /* KeywordFor */ && token.type <= 110 /* KeywordAddressOf */;
+  }
+  /**
+   * Returns true if the current token stream contains a file-I/O Open statement pattern
+   * ("For <file-mode>") on the current logical line.
+   * Open "path" For Input|Output|Append|Random|Binary ... As #n  →  true
+   * Open()  /  Open = value  /  Open x  (user-defined call)       →  false
+   *
+   * This syntactic check lets the parser disambiguate without a pre-scan:
+   * VBA §3.3.5.3 — user-defined procedures (priority 2) > built-in statement keywords (priority 3).
+   */
   recordError(message, token) {
     const pos = { line: token.line, column: token.column };
     this._diagnostics.push({ message, loc: { start: pos, end: pos }, severity: "error" });
   }
   throwMissingRParen() {
     const peek = this.peek();
-    if (peek.type === 135 /* Newline */) {
+    if (peek.type === 136 /* Newline */) {
       const prevToken = this.tokens[Math.max(0, this.pos - 1)];
       if (prevToken && this.isContinuationEndToken(prevToken.type)) {
         this.throwError(
@@ -644,24 +691,24 @@ var Parser = class _Parser {
     this.throwError(`Parse error: Expected ')' at line ${peek.line} `);
   }
   isContinuationEndToken(type) {
-    return type === 112 /* OperatorPlus */ || type === 113 /* OperatorMinus */ || type === 114 /* OperatorMultiply */ || type === 115 /* OperatorDivide */ || type === 116 /* OperatorIntDivide */ || type === 119 /* OperatorPower */ || type === 117 /* OperatorAmpersand */ || type === 120 /* OperatorEquals */ || type === 121 /* OperatorNotEquals */ || type === 122 /* OperatorLessThan */ || type === 123 /* OperatorGreaterThan */ || type === 124 /* OperatorLessThanOrEqual */ || type === 125 /* OperatorGreaterThanOrEqual */ || type === 126 /* OperatorComma */ || type === 127 /* OperatorLParen */ || type === 26 /* KeywordAnd */ || type === 27 /* KeywordOr */ || type === 64 /* KeywordXor */ || type === 65 /* KeywordEqv */ || type === 66 /* KeywordImp */ || type === 118 /* KeywordMod */ || type === 63 /* KeywordLike */ || type === 51 /* KeywordIs */ || type === 28 /* KeywordNot */;
+    return type === 113 /* OperatorPlus */ || type === 114 /* OperatorMinus */ || type === 115 /* OperatorMultiply */ || type === 116 /* OperatorDivide */ || type === 117 /* OperatorIntDivide */ || type === 120 /* OperatorPower */ || type === 118 /* OperatorAmpersand */ || type === 121 /* OperatorEquals */ || type === 122 /* OperatorNotEquals */ || type === 123 /* OperatorLessThan */ || type === 124 /* OperatorGreaterThan */ || type === 125 /* OperatorLessThanOrEqual */ || type === 126 /* OperatorGreaterThanOrEqual */ || type === 127 /* OperatorComma */ || type === 128 /* OperatorLParen */ || type === 26 /* KeywordAnd */ || type === 27 /* KeywordOr */ || type === 64 /* KeywordXor */ || type === 65 /* KeywordEqv */ || type === 66 /* KeywordImp */ || type === 119 /* KeywordMod */ || type === 63 /* KeywordLike */ || type === 51 /* KeywordIs */ || type === 28 /* KeywordNot */;
   }
   tokenDisplay(value) {
     return value.replace(/\n/g, "<\u6539\u884C>").replace(/\r/g, "<CR>").replace(/\t/g, "<\u30BF\u30D6>");
   }
   throwError(message, token) {
     const peek = this.peek();
-    const t = token ?? (peek.type !== 136 /* EOF */ ? peek : this.tokens[Math.max(0, this.pos - 1)]);
+    const t = token ?? (peek.type !== 137 /* EOF */ ? peek : this.tokens[Math.max(0, this.pos - 1)]);
     throw new ParseError(message, t.line, t.column);
   }
   syncToNextTopLevelStatement() {
-    while (this.peek().type !== 136 /* EOF */ && this.peek().type !== 135 /* Newline */) {
+    while (this.peek().type !== 137 /* EOF */ && this.peek().type !== 136 /* Newline */) {
       this.advance();
     }
     while (this.isAtEndTerminator()) {
       this.advance();
       this.advance();
-      while (this.peek().type !== 136 /* EOF */ && this.peek().type !== 135 /* Newline */) {
+      while (this.peek().type !== 137 /* EOF */ && this.peek().type !== 136 /* Newline */) {
         this.advance();
       }
     }
@@ -689,6 +736,18 @@ var Parser = class _Parser {
     }
     return { type: "OptionCompareStatement", mode };
   }
+  validateParameterOrder(params) {
+    let seenOptional = false;
+    for (const p of params) {
+      if (p.isParamArray) break;
+      if (p.isOptional) {
+        seenOptional = true;
+      } else if (seenOptional) {
+        const line = p.loc?.start?.line ?? this.peek().line;
+        this.throwError(`Compile error at line ${line}: Non-optional parameter '${p.name}' cannot follow an Optional parameter`);
+      }
+    }
+  }
   parseParameter() {
     let isByVal = false;
     let isOptional = false;
@@ -710,20 +769,20 @@ var Parser = class _Parser {
     }
     const nameToken = this.advance();
     let isArray = false;
-    if (this.match(127 /* OperatorLParen */)) {
-      this.consume(128 /* OperatorRParen */, "Expected ')' after parameter name");
+    if (this.match(128 /* OperatorLParen */)) {
+      this.consume(129 /* OperatorRParen */, "Expected ')' after parameter name");
       isArray = true;
     }
     let paramType;
     if (this.match(23 /* KeywordAs */)) {
       paramType = this.advance().value;
-      if (this.peek().type === 129 /* OperatorDot */) {
+      if (this.peek().type === 130 /* OperatorDot */) {
         this.advance();
         paramType += "." + this.advance().value;
       }
     }
     let defaultValue;
-    if (this.match(120 /* OperatorEquals */)) {
+    if (this.match(121 /* OperatorEquals */)) {
       defaultValue = this.parseExpression();
     }
     return {
@@ -739,10 +798,43 @@ var Parser = class _Parser {
       loc: { start: { line: nameToken.line, column: nameToken.column }, end: { line: nameToken.line, column: nameToken.column + nameToken.value.length } }
     };
   }
+  parseDefDirective() {
+    const defToken = this.advance();
+    const keyword = defToken.value.toLowerCase().replace(/[$%&#@!^]$/, "");
+    const typeMap = {
+      defbool: "Boolean",
+      defbyte: "Byte",
+      defint: "Integer",
+      deflng: "Long",
+      deflnglng: "LongLong",
+      deflngptr: "LongPtr",
+      defsng: "Single",
+      defdbl: "Double",
+      defcur: "Currency",
+      defdate: "Date",
+      defstr: "String",
+      defobj: "Object",
+      defvar: "Variant"
+    };
+    const vbaType = typeMap[keyword] ?? "Variant";
+    const ranges = [];
+    do {
+      const fromTok = this.advance();
+      const from = fromTok.value.charAt(0).toLowerCase();
+      let to = from;
+      if (this.peek().type === 114 /* OperatorMinus */) {
+        this.advance();
+        const toTok = this.advance();
+        to = toTok.value.charAt(0).toLowerCase();
+      }
+      ranges.push({ from, to });
+    } while (this.match(127 /* OperatorComma */));
+    return { type: "DefDirective", vbaType, ranges };
+  }
   parseAttributeStatement() {
     this.advance();
     const name = this.advance().value;
-    this.consume(120 /* OperatorEquals */, "Expected '=' after Attribute name");
+    this.consume(121 /* OperatorEquals */, "Expected '=' after Attribute name");
     const value = this.parseExpression();
     return { type: "AttributeStatement", name, value };
   }
@@ -800,7 +892,7 @@ var Parser = class _Parser {
       }
     }
     this.consume(23 /* KeywordAs */, "Expected 'As' in Open statement");
-    this.match(111 /* OperatorHash */);
+    this.match(112 /* OperatorHash */);
     const fileNumber = this.parseExpression();
     return { type: "OpenStatement", path: path2, mode, access, lock, fileNumber };
   }
@@ -808,34 +900,34 @@ var Parser = class _Parser {
     this.advance();
     const fileNumbers = [];
     while (!this.isAtTerminator()) {
-      this.match(111 /* OperatorHash */);
+      this.match(112 /* OperatorHash */);
       fileNumbers.push(this.parseExpression());
-      if (!this.match(126 /* OperatorComma */)) break;
+      if (!this.match(127 /* OperatorComma */)) break;
     }
     return { type: "CloseStatement", fileNumbers };
   }
   parsePrintStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' in Print statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Print statement");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' after file number in Print statement");
+    this.consume(127 /* OperatorComma */, "Expected ',' after file number in Print statement");
     const expressions = [];
     while (!this.isAtTerminator()) {
       if (this.match(95 /* KeywordSpc */)) {
-        this.consume(127 /* OperatorLParen */, "Expected '(' after Spc");
+        this.consume(128 /* OperatorLParen */, "Expected '(' after Spc");
         expressions.push({ type: "Spc", val: this.parseExpression() });
-        this.consume(128 /* OperatorRParen */, "Expected ')' after Spc");
+        this.consume(129 /* OperatorRParen */, "Expected ')' after Spc");
       } else if (this.match(96 /* KeywordTab */)) {
-        if (this.match(127 /* OperatorLParen */)) {
+        if (this.match(128 /* OperatorLParen */)) {
           expressions.push({ type: "Tab", val: this.parseExpression() });
-          this.consume(128 /* OperatorRParen */, "Expected ')' after Tab");
+          this.consume(129 /* OperatorRParen */, "Expected ')' after Tab");
         } else {
           expressions.push("Tab");
         }
-      } else if (this.peek().type === 126 /* OperatorComma */) {
+      } else if (this.peek().type === 127 /* OperatorComma */) {
         this.advance();
         expressions.push("Comma");
-      } else if (this.peek().type === 133 /* OperatorSemicolon */) {
+      } else if (this.peek().type === 134 /* OperatorSemicolon */) {
         this.advance();
         expressions.push("Semicolon");
       } else {
@@ -848,9 +940,9 @@ var Parser = class _Parser {
   parseLineInputStatement() {
     this.advance();
     this.consume(84 /* KeywordInput */, "Expected 'Input' after 'Line'");
-    this.consume(111 /* OperatorHash */, "Expected '#' in Line Input statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Line Input statement");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' after file number");
+    this.consume(127 /* OperatorComma */, "Expected ',' after file number");
     const variable = this.parsePrimary();
     if (variable.type !== "Identifier") {
       this.throwError(`Parse error: Expected variable name in Line Input at line ${this.peek().line}`);
@@ -859,14 +951,14 @@ var Parser = class _Parser {
   }
   parsePutStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' in Put statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Put statement");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' after file number");
+    this.consume(127 /* OperatorComma */, "Expected ',' after file number");
     let recordNumber = void 0;
-    if (this.peek().type !== 126 /* OperatorComma */) {
+    if (this.peek().type !== 127 /* OperatorComma */) {
       recordNumber = this.parseExpression();
     }
-    this.consume(126 /* OperatorComma */, "Expected second ',' in Put statement");
+    this.consume(127 /* OperatorComma */, "Expected second ',' in Put statement");
     const data = this.parseExpression();
     return { type: "PutStatement", fileNumber, recordNumber, data };
   }
@@ -877,47 +969,47 @@ var Parser = class _Parser {
   }
   parseWriteStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' in Write statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Write statement");
     const fileNumber = this.parseExpression();
     const items = [];
-    if (this.match(126 /* OperatorComma */)) {
+    if (this.match(127 /* OperatorComma */)) {
       while (!this.isAtTerminator()) {
         items.push(this.parseExpression());
-        if (!this.match(126 /* OperatorComma */)) break;
+        if (!this.match(127 /* OperatorComma */)) break;
       }
     }
     return { type: "WriteStatement", fileNumber, items };
   }
   parseInputStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' in Input statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Input statement");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' in Input statement");
+    this.consume(127 /* OperatorComma */, "Expected ',' in Input statement");
     const variables = [];
     while (!this.isAtTerminator()) {
       variables.push(this.parseExpression());
-      if (!this.match(126 /* OperatorComma */)) break;
+      if (!this.match(127 /* OperatorComma */)) break;
     }
     return { type: "InputStatement", fileNumber, variables };
   }
   parseGetStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' in Get statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Get statement");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' in Get statement");
+    this.consume(127 /* OperatorComma */, "Expected ',' in Get statement");
     let recordNumber = void 0;
-    if (this.peek().type !== 126 /* OperatorComma */) {
+    if (this.peek().type !== 127 /* OperatorComma */) {
       recordNumber = this.parseExpression();
     }
-    this.consume(126 /* OperatorComma */, "Expected ',' in Get statement");
+    this.consume(127 /* OperatorComma */, "Expected ',' in Get statement");
     const variable = this.parseExpression();
     return { type: "GetStatement", fileNumber, recordNumber, variable };
   }
   parseSeekStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' in Seek statement");
+    this.consume(112 /* OperatorHash */, "Expected '#' in Seek statement");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' in Seek statement");
+    this.consume(127 /* OperatorComma */, "Expected ',' in Seek statement");
     const position = this.parseExpression();
     return { type: "SeekStatement", fileNumber, position };
   }
@@ -954,15 +1046,16 @@ var Parser = class _Parser {
       aliasName = this.advance().value.replace(/^"|"$/g, "");
     }
     let parameters = [];
-    if (this.peek().type === 127 /* OperatorLParen */) {
+    if (this.peek().type === 128 /* OperatorLParen */) {
       this.advance();
-      while (this.peek().type !== 128 /* OperatorRParen */ && this.peek().type !== 136 /* EOF */) {
+      while (this.peek().type !== 129 /* OperatorRParen */ && this.peek().type !== 137 /* EOF */) {
         parameters.push(this.parseParameter());
-        if (this.peek().type === 126 /* OperatorComma */) {
+        if (this.peek().type === 127 /* OperatorComma */) {
           this.advance();
         }
       }
-      this.consume(128 /* OperatorRParen */, "Expected ')' after declare parameters");
+      this.consume(129 /* OperatorRParen */, "Expected ')' after declare parameters");
+      this.validateParameterOrder(parameters);
     }
     let returnType;
     if (!isSub) {
@@ -999,7 +1092,7 @@ var Parser = class _Parser {
   // argument starters). When one of these follows a greedily-parsed CallExpression in a
   // statement context, it signals that the `(args)` was actually part of the argument expression.
   isBinaryOnlyOperator(type) {
-    return type === 114 /* OperatorMultiply */ || type === 115 /* OperatorDivide */ || type === 116 /* OperatorIntDivide */ || type === 119 /* OperatorPower */ || type === 112 /* OperatorPlus */ || type === 113 /* OperatorMinus */ || type === 117 /* OperatorAmpersand */ || type === 121 /* OperatorNotEquals */ || type === 122 /* OperatorLessThan */ || type === 123 /* OperatorGreaterThan */ || type === 124 /* OperatorLessThanOrEqual */ || type === 125 /* OperatorGreaterThanOrEqual */ || type === 118 /* KeywordMod */;
+    return type === 115 /* OperatorMultiply */ || type === 116 /* OperatorDivide */ || type === 117 /* OperatorIntDivide */ || type === 120 /* OperatorPower */ || type === 113 /* OperatorPlus */ || type === 114 /* OperatorMinus */ || type === 118 /* OperatorAmpersand */ || type === 122 /* OperatorNotEquals */ || type === 123 /* OperatorLessThan */ || type === 124 /* OperatorGreaterThan */ || type === 125 /* OperatorLessThanOrEqual */ || type === 126 /* OperatorGreaterThanOrEqual */ || type === 119 /* KeywordMod */;
   }
   // Returns true if there is whitespace between the previous token and the current token (same line).
   // Used to distinguish `Foo(arg)` (no space = function-call postfix) from
@@ -1013,7 +1106,7 @@ var Parser = class _Parser {
   }
   isAtTerminator() {
     const type = this.peek().type;
-    return type === 135 /* Newline */ || type === 136 /* EOF */ || type === 130 /* OperatorColon */;
+    return type === 136 /* Newline */ || type === 137 /* EOF */ || type === 131 /* OperatorColon */;
   }
   consume(expectedType, message) {
     if (this.peek().type === expectedType) {
@@ -1022,7 +1115,7 @@ var Parser = class _Parser {
     this.throwError(`Parse error at line ${this.peek().line}: ${message}`);
   }
   skipNewlines() {
-    while (this.match(135 /* Newline */)) {
+    while (this.match(136 /* Newline */)) {
     }
   }
   // Build a SourceLocation spanning from start token to end token (inclusive).
@@ -1060,7 +1153,7 @@ var Parser = class _Parser {
       diagnostics: this._diagnostics
     };
     this.skipNewlines();
-    while (this.peek().type !== 136 /* EOF */) {
+    while (this.peek().type !== 137 /* EOF */) {
       const startPos = this.pos;
       const startToken = this.peek();
       try {
@@ -1079,7 +1172,7 @@ var Parser = class _Parser {
         }
         this.syncToNextTopLevelStatement();
       }
-      if (this.pos === startPos && this.peek().type !== 136 /* EOF */) {
+      if (this.pos === startPos && this.peek().type !== 137 /* EOF */) {
         if (this.isAtEndTerminator()) {
           this.advance();
           this.advance();
@@ -1116,9 +1209,70 @@ var Parser = class _Parser {
     }
     return stmt;
   }
+  /**
+   * Parse an identifier, method call, or assignment statement.
+   * Called from the identifier branch of parseStatementInner AND from the ARCH-1
+   * user-proc override path (when a built-in keyword is user-defined as a procedure).
+   */
+  parseIdentifierOrCallStatement() {
+    const token = this.peek();
+    if ((token.type === 0 /* Identifier */ || _Parser.CONTEXTUAL_KW.has(token.type)) && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 131 /* OperatorColon */) {
+      const labelName = token.value;
+      this.advance();
+      this.advance();
+      return { type: "LabelStatement", label: labelName };
+    }
+    if (token.type === 1 /* Number */) {
+      const labelName = token.value;
+      this.advance();
+      this.match(131 /* OperatorColon */);
+      return { type: "LabelStatement", label: labelName };
+    }
+    const savedPos = this.pos;
+    const expr = this.parsePrimary();
+    if (this.match(121 /* OperatorEquals */)) {
+      return {
+        type: "AssignmentStatement",
+        left: expr,
+        right: this.parseExpression()
+      };
+    } else {
+      if (expr.type === "CallExpression" && this.isBinaryOnlyOperator(this.peek().type)) {
+        this.pos = savedPos;
+        const callee = this.parsePrimary(
+          /* stopBeforeSpacedLParen= */
+          true
+        );
+        const args2 = [this.parseCallArgument()];
+        while (this.match(127 /* OperatorComma */)) {
+          args2.push(this.parseCallArgument());
+        }
+        return { type: "CallStatement", expression: { type: "CallExpression", callee, args: args2 } };
+      }
+      const args = [];
+      if (this.peek().type !== 136 /* Newline */ && this.peek().type !== 137 /* EOF */ && this.peek().type !== 9 /* KeywordElse */ && this.peek().type !== 8 /* KeywordElseIf */ && this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 14 /* KeywordLoop */) {
+        args.push(this.parseCallArgument());
+        while (this.match(127 /* OperatorComma */)) {
+          args.push(this.parseCallArgument());
+        }
+      }
+      if (args.length > 0) {
+        return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args } };
+      } else if (expr.type === "CallExpression") {
+        const callExpr = expr;
+        if (callExpr.args.length === 0 && callExpr.callee.type === "Identifier" && !callExpr.callee.foreign) {
+          const line = callExpr.loc?.start.line ?? this.peek().line;
+          this.throwError(`Parse error: syntax error at line ${line}`);
+        }
+        return { type: "CallStatement", expression: callExpr };
+      } else {
+        return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args: [] } };
+      }
+    }
+  }
   parseStatementInner() {
     const token = this.peek();
-    if (_Parser.CONTEXTUAL_KW.has(token.type) && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 130 /* OperatorColon */) {
+    if (_Parser.CONTEXTUAL_KW.has(token.type) && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 131 /* OperatorColon */) {
       const labelName = token.value;
       this.advance();
       this.advance();
@@ -1150,6 +1304,9 @@ var Parser = class _Parser {
         stmt2.scope = scope;
         return stmt2;
       }
+      if (next.type === 102 /* KeywordEvent */) {
+        return this.parseEventDeclaration(scope);
+      }
       const stmt = this.parseDimStatement(false, true);
       if (stmt) {
         stmt.scope = scope;
@@ -1164,7 +1321,7 @@ var Parser = class _Parser {
       return this.parseDoWhileStatement();
     } else if (token.type === 12 /* KeywordWhile */) {
       return this.parseWhileStatement();
-    } else if (token.type === 17 /* KeywordSub */ || token.type === 18 /* KeywordFunction */ || token.type === 19 /* KeywordProperty */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 17 /* KeywordSub */ || token.type === 18 /* KeywordFunction */ || token.type === 19 /* KeywordProperty */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseProcedureDeclaration();
     } else if (token.type === 68 /* KeywordStatic */) {
       this.advance();
@@ -1203,13 +1360,15 @@ var Parser = class _Parser {
       } else {
         return this.parseOnGoToSubStatement();
       }
-    } else if (token.type === 35 /* KeywordError */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 35 /* KeywordError */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseErrorStatement();
     } else if (token.type === 37 /* KeywordGoSub */) {
       return this.parseGoSubStatement();
     } else if (token.type === 38 /* KeywordReturn */) {
       this.advance();
       return { type: "ReturnStatement" };
+    } else if (token.type === 108 /* KeywordMid */ && this.hasMidAssignmentAhead()) {
+      return this.parseMidStatement();
     } else if (token.type === 39 /* KeywordLSet */) {
       return this.parseLSetStatement();
     } else if (token.type === 40 /* KeywordRSet */) {
@@ -1224,9 +1383,9 @@ var Parser = class _Parser {
       return this.parseResumeStatement();
     } else if (token.type === 105 /* KeywordImplements */) {
       return this.parseImplementsDirective();
-    } else if (token.type === 106 /* KeywordAppActivate */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 106 /* KeywordAppActivate */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseAppActivateStatement();
-    } else if (token.type === 107 /* KeywordSendKeys */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 107 /* KeywordSendKeys */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseSendKeysStatement();
     } else if (token.type === 29 /* KeywordOption */) {
       this.advance();
@@ -1249,6 +1408,8 @@ var Parser = class _Parser {
         return { type: "OptionPrivateModuleStatement" };
       }
       return null;
+    } else if (token.type === 111 /* KeywordDef */) {
+      return this.parseDefDirective();
     } else if (token.type === 74 /* KeywordAttribute */) {
       return this.parseAttributeStatement();
     } else if (token.type === 75 /* KeywordDeclare */) {
@@ -1265,13 +1426,13 @@ var Parser = class _Parser {
       return this.parseOpenStatement();
     } else if (token.type === 82 /* KeywordClose */) {
       return this.parseCloseStatement();
-    } else if (token.type === 83 /* KeywordLine */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 83 /* KeywordLine */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseLineInputStatement();
     } else if (token.type === 85 /* KeywordPrint */) {
       return this.parsePrintStatement();
     } else if (token.type === 86 /* KeywordPut */) {
       return this.parsePutStatement();
-    } else if (token.type === 20 /* KeywordGet */) {
+    } else if (token.type === 20 /* KeywordGet */ && this.peek(1).type === 112 /* OperatorHash */) {
       return this.parseGetStatement();
     } else if (token.type === 84 /* KeywordInput */) {
       return this.parseInputStatement();
@@ -1279,9 +1440,9 @@ var Parser = class _Parser {
       return this.parseWriteStatement();
     } else if (token.type === 98 /* KeywordSeek */) {
       return this.parseSeekStatement();
-    } else if (token.type === 99 /* KeywordReset */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 99 /* KeywordReset */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseResetStatement();
-    } else if (token.type === 97 /* KeywordKill */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 97 /* KeywordKill */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseKillStatement();
     } else if (token.type === 102 /* KeywordEvent */) {
       return this.parseEventDeclaration();
@@ -1291,9 +1452,9 @@ var Parser = class _Parser {
       return this.parseLockStatement();
     } else if (token.type === 100 /* KeywordUnlock */) {
       return this.parseUnlockStatement();
-    } else if (token.type === 109 /* KeywordWidth */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 109 /* KeywordWidth */ && this.peek(1).type === 112 /* OperatorHash */) {
       return this.parseWidthStatement();
-    } else if (token.type === 69 /* KeywordClass */ && this.peek(1).type !== 120 /* OperatorEquals */) {
+    } else if (token.type === 69 /* KeywordClass */ && this.peek(1).type !== 121 /* OperatorEquals */) {
       return this.parseClassDeclaration();
     } else if (token.type === 33 /* KeywordCall */) {
       this.advance();
@@ -1304,67 +1465,16 @@ var Parser = class _Parser {
         return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args: [] } };
       }
       this.throwError(`Parse error: Expected procedure call after 'Call'`);
-    } else if (token.type === 0 /* Identifier */ || token.type === 138 /* ForeignName */ || token.type === 129 /* OperatorDot */ || token.type === 1 /* Number */ || _Parser.CONTEXTUAL_KW.has(token.type)) {
-      if ((token.type === 0 /* Identifier */ || _Parser.CONTEXTUAL_KW.has(token.type)) && this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 130 /* OperatorColon */) {
-        const labelName = token.value;
-        this.advance();
-        this.advance();
-        return { type: "LabelStatement", label: labelName };
-      } else if (token.type === 1 /* Number */) {
-        const labelName = token.value;
-        this.advance();
-        this.match(130 /* OperatorColon */);
-        return { type: "LabelStatement", label: labelName };
-      }
-      const savedPos = this.pos;
-      const expr = this.parsePrimary();
-      if (this.match(120 /* OperatorEquals */)) {
-        return {
-          type: "AssignmentStatement",
-          left: expr,
-          right: this.parseExpression()
-        };
-      } else {
-        if (expr.type === "CallExpression" && this.isBinaryOnlyOperator(this.peek().type)) {
-          this.pos = savedPos;
-          const callee = this.parsePrimary(
-            /* stopBeforeSpacedLParen= */
-            true
-          );
-          const args2 = [this.parseCallArgument()];
-          while (this.match(126 /* OperatorComma */)) {
-            args2.push(this.parseCallArgument());
-          }
-          return { type: "CallStatement", expression: { type: "CallExpression", callee, args: args2 } };
-        }
-        const args = [];
-        if (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */ && this.peek().type !== 9 /* KeywordElse */ && this.peek().type !== 8 /* KeywordElseIf */ && this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 14 /* KeywordLoop */) {
-          args.push(this.parseCallArgument());
-          while (this.match(126 /* OperatorComma */)) {
-            args.push(this.parseCallArgument());
-          }
-        }
-        if (args.length > 0) {
-          return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args } };
-        } else if (expr.type === "CallExpression") {
-          const callExpr = expr;
-          if (callExpr.args.length === 0 && callExpr.callee.type === "Identifier" && !callExpr.callee.foreign) {
-            const line = callExpr.loc?.start.line ?? this.peek().line;
-            this.throwError(`Parse error: syntax error at line ${line}`);
-          }
-          return { type: "CallStatement", expression: callExpr };
-        } else {
-          return { type: "CallStatement", expression: { type: "CallExpression", callee: expr, args: [] } };
-        }
-      }
-    } else if (token.type === 137 /* Unknown */) {
+    } else if (token.type === 0 /* Identifier */ || token.type === 139 /* ForeignName */ || token.type === 130 /* OperatorDot */ || token.type === 70 /* KeywordMe */ || token.type === 1 /* Number */ || _Parser.CONTEXTUAL_KW.has(token.type) || _Parser.COMPAT_KW_EXPR.has(token.type)) {
+      return this.parseIdentifierOrCallStatement();
+    } else if (token.type === 138 /* Unknown */) {
       this.throwError(`Parse error: Unknown token '${this.tokenDisplay(token.value)}' at line ${token.line}`);
     } else {
       this.advance();
     }
     return null;
   }
-  parseProcedureDeclaration(scope, isStatic) {
+  parseProcedureDeclaration(scope, isStatic, isClassMember = false) {
     const isFunction = this.peek().type === 18 /* KeywordFunction */;
     const isProperty = this.peek().type === 19 /* KeywordProperty */;
     this.advance();
@@ -1382,23 +1492,27 @@ var Parser = class _Parser {
     if (!this.isIdentifier(idToken) && (idToken.type < 79 /* KeywordBase */ || idToken.type > 110 /* KeywordAddressOf */)) {
       this.throwError(`Parse error at line ${idToken.line}: Expected procedure name (Found ${this.tokenDisplay(idToken.value)})`);
     }
+    if (!isClassMember && _Parser.STATEMENT_KW_RESERVED.has(idToken.type)) {
+      this.throwError(`Compile error at line ${idToken.line}: '${idToken.value}' is a reserved word and cannot be used as a procedure name`);
+    }
     const name = this.makeIdentifier(idToken);
     const parameters = [];
     let paramsEndColumn;
-    if (this.match(127 /* OperatorLParen */)) {
-      if (this.peek().type !== 128 /* OperatorRParen */) {
+    if (this.match(128 /* OperatorLParen */)) {
+      if (this.peek().type !== 129 /* OperatorRParen */) {
         parameters.push(this.parseParameter());
-        while (this.match(126 /* OperatorComma */)) {
+        while (this.match(127 /* OperatorComma */)) {
           parameters.push(this.parseParameter());
         }
       }
-      const rParen = this.consume(128 /* OperatorRParen */, "Expected ')' after procedure parameters");
+      const rParen = this.consume(129 /* OperatorRParen */, "Expected ')' after procedure parameters");
       paramsEndColumn = rParen.column + 1;
+      this.validateParameterOrder(parameters);
     }
     let returnType;
     if (this.match(23 /* KeywordAs */)) {
       returnType = this.advance().value;
-      if (this.peek().type === 129 /* OperatorDot */) {
+      if (this.peek().type === 130 /* OperatorDot */) {
         this.advance();
         returnType += "." + this.advance().value;
       }
@@ -1410,7 +1524,7 @@ var Parser = class _Parser {
     this.skipNewlines();
     const body = [];
     const expectedEndStr = isFunction ? "Function" : isProperty ? "Property" : "Sub";
-    while (!this.isAtEndTerminator() && this.peek().type !== 136 /* EOF */) {
+    while (!this.isAtEndTerminator() && this.peek().type !== 137 /* EOF */) {
       const stmt = this.parseStatement();
       if (stmt) body.push(stmt);
       this.skipNewlines();
@@ -1421,7 +1535,7 @@ var Parser = class _Parser {
       if (endToken.value.toLowerCase() !== expectedEndStr.toLowerCase()) {
         this.throwError(`Parse error: Expected '${expectedEndStr}' after 'End' at line ${endToken.line}`);
       }
-    } else if (this.peek().type === 136 /* EOF */) {
+    } else if (this.peek().type === 137 /* EOF */) {
       this.throwError(`Parse error: Expected 'End ${expectedEndStr}'`);
     }
     return { type: "ProcedureDeclaration", isFunction, isProperty, propertyType, name, parameters, returnType, body, scope: scope || "public", isStatic, paramsEndColumn };
@@ -1444,9 +1558,9 @@ var Parser = class _Parser {
       let isNew = false;
       let objectType;
       let arrayEndColumn;
-      if (this.match(127 /* OperatorLParen */)) {
+      if (this.match(128 /* OperatorLParen */)) {
         isArray = true;
-        if (this.peek().type !== 128 /* OperatorRParen */) {
+        if (this.peek().type !== 129 /* OperatorRParen */) {
           arrayBounds = [];
           while (true) {
             let lower;
@@ -1456,13 +1570,13 @@ var Parser = class _Parser {
               upper = this.parseExpression();
             }
             arrayBounds.push({ lower, upper });
-            if (!this.match(126 /* OperatorComma */)) {
+            if (!this.match(127 /* OperatorComma */)) {
               break;
             }
           }
         }
         const rParenTok = this.peek();
-        if (this.match(128 /* OperatorRParen */)) {
+        if (this.match(129 /* OperatorRParen */)) {
           arrayEndColumn = rParenTok.column + 1;
         }
       }
@@ -1473,14 +1587,14 @@ var Parser = class _Parser {
         const typeToken = this.peek();
         if (this.isNameToken(typeToken)) {
           objectType = this.advance().value;
-          if (this.peek().type === 129 /* OperatorDot */) {
+          if (this.peek().type === 130 /* OperatorDot */) {
             this.advance();
             objectType += "." + this.advance().value;
           }
         }
       }
       declarations.push({ name, isArray, arrayBounds, isNew, isWithEvents, objectType, arrayEndColumn });
-      if (this.match(126 /* OperatorComma */)) {
+      if (this.match(127 /* OperatorComma */)) {
         continue;
       } else {
         break;
@@ -1496,14 +1610,14 @@ var Parser = class _Parser {
     if (this.match(23 /* KeywordAs */)) {
       this.advance();
     }
-    if (!this.match(120 /* OperatorEquals */)) this.throwError(`Parse error: Expected '=' in Const at line ${this.peek().line}`);
+    if (!this.match(121 /* OperatorEquals */)) this.throwError(`Parse error: Expected '=' in Const at line ${this.peek().line}`);
     const value = this.parseExpression();
     return { type: "ConstDeclaration", name, value };
   }
   parseSetStatement() {
     this.advance();
     const left = this.parsePrimary();
-    if (!this.match(120 /* OperatorEquals */)) this.throwError(`Parse error: Expected '=' in Set statement at line ${this.peek().line}`);
+    if (!this.match(121 /* OperatorEquals */)) this.throwError(`Parse error: Expected '=' in Set statement at line ${this.peek().line}`);
     const right = this.parseExpression();
     return { type: "SetStatement", left, right };
   }
@@ -1515,7 +1629,7 @@ var Parser = class _Parser {
       const labelToken = this.advance();
       label = labelToken.value;
     } else {
-      while (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */) {
+      while (this.peek().type !== 136 /* Newline */ && this.peek().type !== 137 /* EOF */) {
         label += this.advance().value + " ";
       }
       label = label.trim();
@@ -1544,7 +1658,7 @@ var Parser = class _Parser {
   parseGoToStatement() {
     this.advance();
     const labelToken = this.advance();
-    if (labelToken.type !== 0 /* Identifier */ && labelToken.type !== 1 /* Number */) {
+    if (!this.isIdentifier(labelToken) && labelToken.type !== 1 /* Number */) {
       this.throwError(`Parse error: Expected identifier or number after 'GoTo' at line ${labelToken.line}`);
     }
     return { type: "GoToStatement", label: labelToken.value };
@@ -1552,7 +1666,7 @@ var Parser = class _Parser {
   parseResumeStatement() {
     this.advance();
     let target = "";
-    while (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */) {
+    while (this.peek().type !== 136 /* Newline */ && this.peek().type !== 137 /* EOF */) {
       target += this.advance().value;
     }
     return { type: "ResumeStatement", target: target.trim() };
@@ -1573,8 +1687,8 @@ var Parser = class _Parser {
     const idToken = this.advance();
     const name = this.makeIdentifier(idToken);
     const bounds = [];
-    if (this.match(127 /* OperatorLParen */)) {
-      if (this.peek().type !== 128 /* OperatorRParen */) {
+    if (this.match(128 /* OperatorLParen */)) {
+      if (this.peek().type !== 129 /* OperatorRParen */) {
         while (true) {
           let lower;
           let upper = this.parseExpression();
@@ -1583,12 +1697,12 @@ var Parser = class _Parser {
             upper = this.parseExpression();
           }
           bounds.push({ lower, upper });
-          if (!this.match(126 /* OperatorComma */)) {
+          if (!this.match(127 /* OperatorComma */)) {
             break;
           }
         }
       }
-      this.match(128 /* OperatorRParen */);
+      this.match(129 /* OperatorRParen */);
     }
     let objectType;
     if (this.match(23 /* KeywordAs */)) {
@@ -1605,18 +1719,18 @@ var Parser = class _Parser {
     const typeName = nameToken.value;
     const members = [];
     this.skipNewlines();
-    while (this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 136 /* EOF */) {
+    while (this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 137 /* EOF */) {
       const memberNameToken = this.advance();
       if (!this.isWordToken(memberNameToken)) {
         this.throwError(`Parse error: Expected member name in Type at line ${memberNameToken.line}`);
       }
-      if (this.peek().type === 127 /* OperatorLParen */) {
+      if (this.peek().type === 128 /* OperatorLParen */) {
         this.advance();
         let depth = 1;
-        while (depth > 0 && this.peek().type !== 136 /* EOF */ && this.peek().type !== 135 /* Newline */) {
+        while (depth > 0 && this.peek().type !== 137 /* EOF */ && this.peek().type !== 136 /* Newline */) {
           const t = this.advance();
-          if (t.type === 127 /* OperatorLParen */) depth++;
-          else if (t.type === 128 /* OperatorRParen */) depth--;
+          if (t.type === 128 /* OperatorLParen */) depth++;
+          else if (t.type === 129 /* OperatorRParen */) depth--;
         }
       }
       if (!this.match(23 /* KeywordAs */)) {
@@ -1643,14 +1757,14 @@ var Parser = class _Parser {
     const name = this.makeIdentifier(nameToken);
     const members = [];
     this.skipNewlines();
-    while (this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 136 /* EOF */) {
+    while (this.peek().type !== 10 /* KeywordEnd */ && this.peek().type !== 137 /* EOF */) {
       const memberNameToken = this.advance();
       if (!this.isWordToken(memberNameToken)) {
         this.throwError(`Parse error: Expected member name in Enum at line ${memberNameToken.line}`);
       }
       const memberName = this.makeIdentifier(memberNameToken);
       let value;
-      if (this.match(120 /* OperatorEquals */)) {
+      if (this.match(121 /* OperatorEquals */)) {
         value = this.parseExpression();
       }
       members.push({ name: memberName, value });
@@ -1667,7 +1781,7 @@ var Parser = class _Parser {
   parseClassDeclaration() {
     this.advance();
     const nameToken = this.advance();
-    if (nameToken.type !== 0 /* Identifier */) {
+    if (!this.isIdentifier(nameToken)) {
       this.throwError(`Parse error: Expected class name after 'Class' at line ${nameToken.line}`);
     }
     return this.parseClassBody(nameToken.value, true);
@@ -1677,12 +1791,12 @@ var Parser = class _Parser {
     const procedures = [];
     const body = [];
     this.skipNewlines();
-    while (this.peek().type !== 136 /* EOF */) {
+    while (this.peek().type !== 137 /* EOF */) {
       if (untilEndClass && this.peek().type === 10 /* KeywordEnd */ && this.peek(1).type === 69 /* KeywordClass */) {
         break;
       }
       const tok = this.peek();
-      if (tok.type === 135 /* Newline */) {
+      if (tok.type === 136 /* Newline */) {
         this.skipNewlines();
         continue;
       }
@@ -1693,7 +1807,7 @@ var Parser = class _Parser {
       }
       const inner = this.peek();
       if (inner.type === 17 /* KeywordSub */ || inner.type === 18 /* KeywordFunction */ || inner.type === 19 /* KeywordProperty */) {
-        const proc = this.parseProcedureDeclaration(scope);
+        const proc = this.parseProcedureDeclaration(scope, void 0, true);
         proc.moduleName = className;
         procedures.push(proc);
         body.push(proc);
@@ -1709,13 +1823,16 @@ var Parser = class _Parser {
       } else if (inner.type === 102 /* KeywordEvent */) {
         const event = this.parseEventDeclaration(scope);
         body.push(event);
+      } else if (inner.type === 31 /* KeywordConst */) {
+        const constDecl = this.parseConstDeclaration();
+        body.push(constDecl);
       } else if (inner.type === 68 /* KeywordStatic */) {
         this.advance();
         const field = this.parseDimStatement(true, true);
         field.scope = scope ?? "public";
         fields.push(field);
         body.push(field);
-      } else if (scope !== void 0 && inner.type === 0 /* Identifier */) {
+      } else if (scope !== void 0 && (this.isIdentifier(inner) || inner.type === 104 /* KeywordWithEvents */)) {
         const field = this.parseDimStatement(false, true);
         field.scope = scope;
         fields.push(field);
@@ -1743,7 +1860,7 @@ var Parser = class _Parser {
       this.throwError(`Parse error: Expected identifier after 'For' at line ${idToken.line} `);
     }
     const identifier = this.makeIdentifier(idToken);
-    if (!this.match(120 /* OperatorEquals */)) {
+    if (!this.match(121 /* OperatorEquals */)) {
       this.throwError(`Parse error: Expected '=' in For statement at line ${this.peek().line} `);
     }
     const startExpr = this.parseExpression();
@@ -1757,7 +1874,7 @@ var Parser = class _Parser {
     }
     this.skipNewlines();
     const body = [];
-    while (this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 136 /* EOF */ && !this.isAtEndTerminator()) {
+    while (this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 137 /* EOF */ && !this.isAtEndTerminator()) {
       const stmt = this.parseStatement();
       if (stmt) body.push(stmt);
       this.skipNewlines();
@@ -1799,7 +1916,7 @@ var Parser = class _Parser {
     const collection = this.parseExpression();
     this.skipNewlines();
     const body = [];
-    while (this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 136 /* EOF */ && !this.isAtEndTerminator()) {
+    while (this.peek().type !== 5 /* KeywordNext */ && this.peek().type !== 137 /* EOF */ && !this.isAtEndTerminator()) {
       const stmt = this.parseStatement();
       if (stmt) body.push(stmt);
       this.skipNewlines();
@@ -1832,18 +1949,18 @@ var Parser = class _Parser {
     if (!this.match(7 /* KeywordThen */)) {
       this.throwError(`Parse error: Expected 'Then' after condition at line ${this.peek().line}`);
     }
-    const isMultiLine = this.peek().type === 135 /* Newline */;
+    const isMultiLine = this.peek().type === 136 /* Newline */;
     const consequent = [];
     let alternate = null;
     if (!isMultiLine) {
-      while (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */ && this.peek().type !== 9 /* KeywordElse */) {
+      while (this.peek().type !== 136 /* Newline */ && this.peek().type !== 137 /* EOF */ && this.peek().type !== 9 /* KeywordElse */) {
         const stmt = this.parseStatement(false);
         if (stmt) consequent.push(stmt);
       }
       if (this.peek().type === 9 /* KeywordElse */) {
         this.advance();
         alternate = [];
-        while (this.peek().type !== 135 /* Newline */ && this.peek().type !== 136 /* EOF */) {
+        while (this.peek().type !== 136 /* Newline */ && this.peek().type !== 137 /* EOF */) {
           const stmt = this.parseStatement(false);
           if (stmt) alternate.push(stmt);
         }
@@ -1856,7 +1973,7 @@ var Parser = class _Parser {
       };
     }
     this.skipNewlines();
-    while (!this.isAtEndTerminator() && this.peek().type !== 9 /* KeywordElse */ && this.peek().type !== 8 /* KeywordElseIf */ && this.peek().type !== 136 /* EOF */) {
+    while (!this.isAtEndTerminator() && this.peek().type !== 9 /* KeywordElse */ && this.peek().type !== 8 /* KeywordElseIf */ && this.peek().type !== 137 /* EOF */) {
       const stmt = this.parseStatement();
       if (stmt) consequent.push(stmt);
       this.skipNewlines();
@@ -1866,7 +1983,7 @@ var Parser = class _Parser {
     } else if (this.match(9 /* KeywordElse */)) {
       this.skipNewlines();
       alternate = [];
-      while (!this.isAtEndTerminator() && this.peek().type !== 136 /* EOF */) {
+      while (!this.isAtEndTerminator() && this.peek().type !== 137 /* EOF */) {
         const stmt = this.parseStatement();
         if (stmt) alternate.push(stmt);
         this.skipNewlines();
@@ -1903,7 +2020,7 @@ var Parser = class _Parser {
     }
     this.skipNewlines();
     const body = [];
-    while (this.peek().type !== 14 /* KeywordLoop */ && this.peek().type !== 136 /* EOF */ && !this.isAtEndTerminator()) {
+    while (this.peek().type !== 14 /* KeywordLoop */ && this.peek().type !== 137 /* EOF */ && !this.isAtEndTerminator()) {
       const stmt = this.parseStatement();
       if (stmt) body.push(stmt);
       this.skipNewlines();
@@ -1935,7 +2052,7 @@ var Parser = class _Parser {
     const condition = this.parseExpression();
     this.skipNewlines();
     const body = [];
-    while (this.peek().type !== 13 /* KeywordWend */ && this.peek().type !== 136 /* EOF */ && !this.isAtEndTerminator()) {
+    while (this.peek().type !== 13 /* KeywordWend */ && this.peek().type !== 137 /* EOF */ && !this.isAtEndTerminator()) {
       const stmt = this.parseStatement();
       if (stmt) body.push(stmt);
       this.skipNewlines();
@@ -1954,7 +2071,7 @@ var Parser = class _Parser {
     this.skipNewlines();
     const cases = [];
     let elseBody = null;
-    while (!this.isAtEndTerminator() && this.peek().type !== 136 /* EOF */) {
+    while (!this.isAtEndTerminator() && this.peek().type !== 137 /* EOF */) {
       if (this.peek().type !== 54 /* KeywordCase */) {
         this.throwError(`Parse error: Expected 'Case' in Select Case at line ${this.peek().line}`);
       }
@@ -1963,7 +2080,7 @@ var Parser = class _Parser {
         this.advance();
         this.skipNewlines();
         elseBody = [];
-        while (!this.isAtEndTerminator() && this.peek().type !== 54 /* KeywordCase */ && this.peek().type !== 136 /* EOF */) {
+        while (!this.isAtEndTerminator() && this.peek().type !== 54 /* KeywordCase */ && this.peek().type !== 137 /* EOF */) {
           const stmt = this.parseStatement();
           if (stmt) elseBody.push(stmt);
           this.skipNewlines();
@@ -1972,12 +2089,12 @@ var Parser = class _Parser {
       }
       const ranges = [];
       ranges.push(this.parseRangeClause());
-      while (this.match(126 /* OperatorComma */)) {
+      while (this.match(127 /* OperatorComma */)) {
         ranges.push(this.parseRangeClause());
       }
       this.skipNewlines();
       const body = [];
-      while (!this.isAtEndTerminator() && this.peek().type !== 54 /* KeywordCase */ && this.peek().type !== 136 /* EOF */) {
+      while (!this.isAtEndTerminator() && this.peek().type !== 54 /* KeywordCase */ && this.peek().type !== 137 /* EOF */) {
         const stmt = this.parseStatement();
         if (stmt) body.push(stmt);
         this.skipNewlines();
@@ -1997,7 +2114,7 @@ var Parser = class _Parser {
     const expression = this.parseExpression();
     this.skipNewlines();
     const body = [];
-    while (!this.isAtEndTerminator() && this.peek().type !== 136 /* EOF */) {
+    while (!this.isAtEndTerminator() && this.peek().type !== 137 /* EOF */) {
       const stmt = this.parseStatement();
       if (stmt) body.push(stmt);
       this.skipNewlines();
@@ -2014,7 +2131,7 @@ var Parser = class _Parser {
     const isKeyword = this.peek().type === 51 /* KeywordIs */;
     if (isKeyword) this.advance();
     const compOp = this.peek();
-    if (compOp.type === 120 /* OperatorEquals */ || compOp.type === 121 /* OperatorNotEquals */ || compOp.type === 122 /* OperatorLessThan */ || compOp.type === 123 /* OperatorGreaterThan */ || compOp.type === 124 /* OperatorLessThanOrEqual */ || compOp.type === 125 /* OperatorGreaterThanOrEqual */) {
+    if (compOp.type === 121 /* OperatorEquals */ || compOp.type === 122 /* OperatorNotEquals */ || compOp.type === 123 /* OperatorLessThan */ || compOp.type === 124 /* OperatorGreaterThan */ || compOp.type === 125 /* OperatorLessThanOrEqual */ || compOp.type === 126 /* OperatorGreaterThanOrEqual */) {
       this.advance();
       const value = this.parseExpression();
       return { kind: "comparison", operator: compOp.value, value };
@@ -2094,7 +2211,7 @@ var Parser = class _Parser {
   }
   parseEquality() {
     let left = this.parseRelational();
-    while (this.peek().type === 120 /* OperatorEquals */ || this.peek().type === 121 /* OperatorNotEquals */ || this.peek().type === 51 /* KeywordIs */ || this.peek().type === 63 /* KeywordLike */) {
+    while (this.peek().type === 121 /* OperatorEquals */ || this.peek().type === 122 /* OperatorNotEquals */ || this.peek().type === 51 /* KeywordIs */ || this.peek().type === 63 /* KeywordLike */) {
       const operator = this.advance().value;
       const right = this.parseRelational();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2103,7 +2220,7 @@ var Parser = class _Parser {
   }
   parseRelational() {
     let left = this.parseConcatenation();
-    while (this.peek().type === 122 /* OperatorLessThan */ || this.peek().type === 123 /* OperatorGreaterThan */ || this.peek().type === 124 /* OperatorLessThanOrEqual */ || this.peek().type === 125 /* OperatorGreaterThanOrEqual */) {
+    while (this.peek().type === 123 /* OperatorLessThan */ || this.peek().type === 124 /* OperatorGreaterThan */ || this.peek().type === 125 /* OperatorLessThanOrEqual */ || this.peek().type === 126 /* OperatorGreaterThanOrEqual */) {
       const operator = this.advance().value;
       const right = this.parseConcatenation();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2112,7 +2229,7 @@ var Parser = class _Parser {
   }
   parseConcatenation() {
     let left = this.parseAdditive();
-    while (this.peek().type === 117 /* OperatorAmpersand */) {
+    while (this.peek().type === 118 /* OperatorAmpersand */) {
       const operator = this.advance().value;
       const right = this.parseAdditive();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2121,7 +2238,7 @@ var Parser = class _Parser {
   }
   parseAdditive() {
     let left = this.parseModulo();
-    while (this.peek().type === 112 /* OperatorPlus */ || this.peek().type === 113 /* OperatorMinus */) {
+    while (this.peek().type === 113 /* OperatorPlus */ || this.peek().type === 114 /* OperatorMinus */) {
       const operator = this.advance().value;
       const right = this.parseModulo();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2130,7 +2247,7 @@ var Parser = class _Parser {
   }
   parseModulo() {
     let left = this.parseIntDivision();
-    while (this.peek().type === 118 /* KeywordMod */) {
+    while (this.peek().type === 119 /* KeywordMod */) {
       const operator = this.advance().value;
       const right = this.parseIntDivision();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2139,7 +2256,7 @@ var Parser = class _Parser {
   }
   parseIntDivision() {
     let left = this.parseMultiplicative();
-    while (this.peek().type === 116 /* OperatorIntDivide */) {
+    while (this.peek().type === 117 /* OperatorIntDivide */) {
       const operator = this.advance().value;
       const right = this.parseMultiplicative();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2148,7 +2265,7 @@ var Parser = class _Parser {
   }
   parseMultiplicative() {
     let left = this.parseUnary();
-    while (this.peek().type === 114 /* OperatorMultiply */ || this.peek().type === 115 /* OperatorDivide */) {
+    while (this.peek().type === 115 /* OperatorMultiply */ || this.peek().type === 116 /* OperatorDivide */) {
       const operator = this.advance().value;
       const right = this.parseUnary();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2156,7 +2273,7 @@ var Parser = class _Parser {
     return left;
   }
   parseUnary() {
-    if (this.peek().type === 113 /* OperatorMinus */ || this.peek().type === 112 /* OperatorPlus */) {
+    if (this.peek().type === 114 /* OperatorMinus */ || this.peek().type === 113 /* OperatorPlus */) {
       const opTok = this.tokens[this.pos];
       const operator = this.advance().value;
       const argument = this.parseUnary();
@@ -2168,7 +2285,7 @@ var Parser = class _Parser {
   }
   parseExponentiation() {
     let left = this.parsePrimary();
-    while (this.peek().type === 119 /* OperatorPower */) {
+    while (this.peek().type === 120 /* OperatorPower */) {
       const operator = this.advance().value;
       const right = this.parsePrimary();
       left = { type: "BinaryExpression", operator, left, right, loc: this.makeBinaryLoc(left, right) };
@@ -2187,15 +2304,24 @@ var Parser = class _Parser {
       expr = { type: "NumberLiteral", value: Number(cleanVal), typeSuffix, isFloat };
     } else if (token.type === 2 /* String */) {
       expr = { type: "StringLiteral", value: token.value };
-    } else if (token.type === 134 /* Date */) {
+    } else if (token.type === 135 /* Date */) {
       expr = { type: "DateLiteral", value: token.value };
-    } else if (token.type === 138 /* ForeignName */) {
+    } else if (token.type === 139 /* ForeignName */) {
       expr = { type: "Identifier", name: token.value, foreign: true };
     } else if (token.type === 0 /* Identifier */ || _Parser.CONTEXTUAL_KW.has(token.type) || _Parser.COMPAT_KW_EXPR.has(token.type)) {
       expr = { type: "Identifier", name: token.value };
     } else if (token.type === 110 /* KeywordAddressOf */) {
-      const procName = this.consume(0 /* Identifier */, "Expected procedure name after 'AddressOf'");
-      expr = { type: "AddressOfExpression", procedureName: { type: "Identifier", name: procName.value } };
+      const firstTok = this.advance();
+      if (!this.isIdentifier(firstTok)) this.throwError(`Parse error at line ${firstTok.line}: Expected procedure name after 'AddressOf'`);
+      let moduleName;
+      let procTok = firstTok;
+      if (this.peek().type === 130 /* OperatorDot */) {
+        this.advance();
+        moduleName = firstTok.value;
+        procTok = this.advance();
+        if (!this.isIdentifier(procTok)) this.throwError(`Parse error at line ${procTok.line}: Expected procedure name after 'AddressOf ${moduleName}.'`);
+      }
+      expr = { type: "AddressOfExpression", procedureName: { type: "Identifier", name: procTok.value }, moduleName };
     } else if (token.type === 44 /* KeywordEmpty */) {
       expr = { type: "Identifier", name: token.value };
     } else if (token.type === 49 /* KeywordNothing */) {
@@ -2212,14 +2338,14 @@ var Parser = class _Parser {
         this.throwError(`Parse error: Expected class name after 'New' at line ${classNameToken.line}`);
       }
       let className = classNameToken.value;
-      if (this.peek().type === 129 /* OperatorDot */) {
+      if (this.peek().type === 130 /* OperatorDot */) {
         this.advance();
         className += "." + this.advance().value;
       }
       expr = { type: "NewExpression", className };
-    } else if (token.type === 127 /* OperatorLParen */) {
+    } else if (token.type === 128 /* OperatorLParen */) {
       const innerExpr = this.parseExpression();
-      if (!this.match(128 /* OperatorRParen */)) {
+      if (!this.match(129 /* OperatorRParen */)) {
         this.throwMissingRParen();
       }
       expr = { type: "ParenthesizedExpression", expression: innerExpr };
@@ -2229,18 +2355,18 @@ var Parser = class _Parser {
         this.throwError(`Parse error: Expected 'Is' after 'TypeOf' at line ${this.peek().line}`);
       }
       const typeToken = this.advance();
-      if (typeToken.type !== 0 /* Identifier */ && typeToken.type !== 25 /* KeywordCollection */) {
+      if (!this.isIdentifier(typeToken) && typeToken.type !== 25 /* KeywordCollection */) {
         this.throwError(`Parse error: Expected type name after 'Is' at line ${typeToken.line}`);
       }
       expr = { type: "TypeOfIsExpression", expression: expr, typeName: typeToken.value };
-    } else if (token.type === 129 /* OperatorDot */) {
+    } else if (token.type === 130 /* OperatorDot */) {
       const propToken = this.advance();
       if (!this.isNameToken(propToken)) {
         this.throwError(`Parse error: Expected identifier after '.' at line ${propToken.line}`);
       }
       const property = { type: "Identifier", name: propToken.value };
       expr = { type: "ImplicitWithObjectExpression", property };
-    } else if (token.type === 135 /* Newline */) {
+    } else if (token.type === 136 /* Newline */) {
       const prevToken = this.tokens[Math.max(0, this.pos - 2)];
       if (prevToken && this.isContinuationEndToken(prevToken.type)) {
         this.throwError(
@@ -2255,31 +2381,31 @@ var Parser = class _Parser {
     }
     expr.loc = this.exprLoc(startTok, this.tokens[this.pos - 1]);
     while (true) {
-      if (this.match(129 /* OperatorDot */)) {
-        if (this.peek().type === 136 /* EOF */) this.throwError("Expected property name after '.'");
+      if (this.match(130 /* OperatorDot */)) {
+        if (this.peek().type === 137 /* EOF */) this.throwError("Expected property name after '.'");
         const propToken = this.advance();
         const property = { type: "Identifier", name: propToken.value };
         expr = { type: "MemberExpression", object: expr, property };
         expr.loc = this.exprLoc(startTok, this.tokens[this.pos - 1]);
-      } else if (this.match(132 /* OperatorExclamation */)) {
-        if (this.peek().type === 136 /* EOF */) this.throwError("Expected identifier after '!'");
+      } else if (this.match(133 /* OperatorExclamation */)) {
+        if (this.peek().type === 137 /* EOF */) this.throwError("Expected identifier after '!'");
         const propToken = this.advance();
         const property = { type: "Identifier", name: propToken.value };
         expr = { type: "DictionaryAccessExpression", object: expr, property };
         expr.loc = this.exprLoc(startTok, this.tokens[this.pos - 1]);
-      } else if (this.peek().type === 127 /* OperatorLParen */) {
+      } else if (this.peek().type === 128 /* OperatorLParen */) {
         if (stopBeforeSpacedLParen && this.hasSpaceBeforeCurrentToken()) {
           break;
         }
         this.advance();
         const args = [];
-        if (this.peek().type !== 128 /* OperatorRParen */) {
+        if (this.peek().type !== 129 /* OperatorRParen */) {
           args.push(this.parseCallArgument());
-          while (this.match(126 /* OperatorComma */)) {
+          while (this.match(127 /* OperatorComma */)) {
             args.push(this.parseCallArgument());
           }
         }
-        if (!this.match(128 /* OperatorRParen */)) {
+        if (!this.match(129 /* OperatorRParen */)) {
           this.throwMissingRParen();
         }
         expr = { type: "CallExpression", callee: expr, args };
@@ -2293,10 +2419,10 @@ var Parser = class _Parser {
   // Parse a call argument, handling named arguments (e.g., shift:=xlUp)
   parseCallArgument() {
     const next = this.peek().type;
-    if (next === 126 /* OperatorComma */ || next === 128 /* OperatorRParen */ || this.isAtTerminator()) {
+    if (next === 127 /* OperatorComma */ || next === 129 /* OperatorRParen */ || this.isAtTerminator()) {
       return { type: "MissingArgument" };
     }
-    if (this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 131 /* OperatorColonEquals */ && typeof this.peek().value === "string" && /^[A-Za-z_]\w*$/.test(this.peek().value)) {
+    if (this.pos + 1 < this.tokens.length && this.tokens[this.pos + 1].type === 132 /* OperatorColonEquals */ && typeof this.peek().value === "string" && /^[A-Za-z_]\w*$/.test(this.peek().value)) {
       const nameToken = this.advance();
       this.advance();
       const value = this.parseExpression();
@@ -2318,11 +2444,11 @@ var Parser = class _Parser {
     const labels = [];
     while (true) {
       const labelToken = this.advance();
-      if (labelToken.type !== 0 /* Identifier */ && labelToken.type !== 1 /* Number */) {
+      if (!this.isIdentifier(labelToken) && labelToken.type !== 1 /* Number */) {
         this.throwError(`Parse error: Expected label (identifier or number) in On...GoTo/GoSub at line ${labelToken.line}`);
       }
       labels.push(labelToken.value);
-      if (!this.match(126 /* OperatorComma */)) {
+      if (!this.match(127 /* OperatorComma */)) {
         break;
       }
     }
@@ -2331,7 +2457,7 @@ var Parser = class _Parser {
   parseGoSubStatement() {
     this.advance();
     const labelToken = this.advance();
-    if (labelToken.type !== 0 /* Identifier */ && labelToken.type !== 1 /* Number */) {
+    if (!this.isIdentifier(labelToken) && labelToken.type !== 1 /* Number */) {
       this.throwError(`Parse error: Expected label after GoSub at line ${labelToken.line}`);
     }
     return { type: "GoSubStatement", label: labelToken.value };
@@ -2339,7 +2465,7 @@ var Parser = class _Parser {
   parseLSetStatement() {
     this.advance();
     const left = this.parsePrimary();
-    if (!this.match(120 /* OperatorEquals */)) {
+    if (!this.match(121 /* OperatorEquals */)) {
       this.throwError(`Parse error: Expected '=' in LSet statement at line ${this.peek().line}`);
     }
     const right = this.parseExpression();
@@ -2348,12 +2474,45 @@ var Parser = class _Parser {
   parseRSetStatement() {
     this.advance();
     const left = this.parsePrimary();
-    if (!this.match(120 /* OperatorEquals */)) {
+    if (!this.match(121 /* OperatorEquals */)) {
       this.throwError(`Parse error: Expected '=' in RSet statement at line ${this.peek().line}`);
     }
     const right = this.parseExpression();
     return { type: "RSetStatement", left, right };
   }
+  hasMidAssignmentAhead() {
+    if (this.peek(1).type !== 128 /* OperatorLParen */) return false;
+    let depth = 0;
+    let i = 1;
+    while (this.pos + i < this.tokens.length) {
+      const t = this.tokens[this.pos + i];
+      if (t.type === 128 /* OperatorLParen */) depth++;
+      else if (t.type === 129 /* OperatorRParen */) {
+        depth--;
+        if (depth === 0) {
+          return this.tokens[this.pos + i + 1]?.type === 121 /* OperatorEquals */;
+        }
+      } else if (t.type === 136 /* Newline */ || t.type === 137 /* EOF */) break;
+      i++;
+    }
+    return false;
+  }
+  parseMidStatement() {
+    const midToken = this.advance();
+    const isByte = midToken.value.toLowerCase().startsWith("midb");
+    this.consume(128 /* OperatorLParen */, "Expected '(' after Mid");
+    const target = this.parseExpression();
+    this.consume(127 /* OperatorComma */, "Expected ',' after Mid target");
+    const start = this.parseExpression();
+    let length = null;
+    if (this.match(127 /* OperatorComma */)) {
+      length = this.parseExpression();
+    }
+    this.consume(129 /* OperatorRParen */, "Expected ')' after Mid arguments");
+    this.consume(121 /* OperatorEquals */, "Expected '=' in Mid statement");
+    const value = this.parseExpression();
+    return { type: "MidStatement", target, start, length, value, isByte };
+  }
   parseErrorStatement() {
     this.advance();
     const errorNumber = this.parseExpression();
@@ -2361,46 +2520,50 @@ var Parser = class _Parser {
   }
   parseEventDeclaration(scope) {
     this.advance();
-    const idToken = this.consume(0 /* Identifier */, "Expected identifier after 'Event'");
+    const idToken = this.advance();
+    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'Event' at line ${idToken.line}`);
     const name = { type: "Identifier", name: idToken.value };
     const parameters = [];
-    if (this.match(127 /* OperatorLParen */)) {
-      if (this.peek().type !== 128 /* OperatorRParen */) {
+    if (this.match(128 /* OperatorLParen */)) {
+      if (this.peek().type !== 129 /* OperatorRParen */) {
         parameters.push(this.parseParameter());
-        while (this.match(126 /* OperatorComma */)) {
+        while (this.match(127 /* OperatorComma */)) {
           parameters.push(this.parseParameter());
         }
       }
-      this.consume(128 /* OperatorRParen */, "Expected ')' after event parameters");
+      this.consume(129 /* OperatorRParen */, "Expected ')' after event parameters");
+      this.validateParameterOrder(parameters);
     }
     return { type: "EventDeclaration", name, parameters, scope };
   }
   parseRaiseEventStatement() {
     this.advance();
-    const idToken = this.consume(0 /* Identifier */, "Expected identifier after 'RaiseEvent'");
+    const idToken = this.advance();
+    if (!this.isIdentifier(idToken) && !this.isNameToken(idToken)) this.throwError(`Expected identifier after 'RaiseEvent' at line ${idToken.line}`);
     const eventName = { type: "Identifier", name: idToken.value };
     const args = [];
-    if (this.match(127 /* OperatorLParen */)) {
-      if (this.peek().type !== 128 /* OperatorRParen */) {
+    if (this.match(128 /* OperatorLParen */)) {
+      if (this.peek().type !== 129 /* OperatorRParen */) {
         args.push(this.parseExpression());
-        while (this.match(126 /* OperatorComma */)) {
+        while (this.match(127 /* OperatorComma */)) {
           args.push(this.parseExpression());
         }
       }
-      this.consume(128 /* OperatorRParen */, "Expected ')' after RaiseEvent arguments");
+      this.consume(129 /* OperatorRParen */, "Expected ')' after RaiseEvent arguments");
     }
     return { type: "RaiseEventStatement", eventName, args };
   }
   parseImplementsDirective() {
     this.advance();
-    const idToken = this.consume(0 /* Identifier */, "Expected interface name after 'Implements'");
+    const idToken = this.advance();
+    if (!this.isIdentifier(idToken)) this.throwError(`Parse error at line ${idToken.line}: Expected interface name after 'Implements'`);
     return { type: "ImplementsDirective", interfaceName: idToken.value };
   }
   parseAppActivateStatement() {
     this.advance();
     const title = this.parseExpression();
     let wait;
-    if (this.match(126 /* OperatorComma */)) {
+    if (this.match(127 /* OperatorComma */)) {
       wait = this.parseExpression();
     }
     return { type: "AppActivateStatement", title, wait };
@@ -2409,17 +2572,17 @@ var Parser = class _Parser {
     this.advance();
     const keys = this.parseExpression();
     let wait;
-    if (this.match(126 /* OperatorComma */)) {
+    if (this.match(127 /* OperatorComma */)) {
       wait = this.parseExpression();
     }
     return { type: "SendKeysStatement", keys, wait };
   }
   parseLockStatement() {
     this.advance();
-    this.match(111 /* OperatorHash */);
+    this.match(112 /* OperatorHash */);
     const fileNumber = this.parseExpression();
     let recordRange;
-    if (this.match(126 /* OperatorComma */)) {
+    if (this.match(127 /* OperatorComma */)) {
       const start = this.parseExpression();
       let end;
       if (this.match(4 /* KeywordTo */)) {
@@ -2431,10 +2594,10 @@ var Parser = class _Parser {
   }
   parseUnlockStatement() {
     this.advance();
-    this.match(111 /* OperatorHash */);
+    this.match(112 /* OperatorHash */);
     const fileNumber = this.parseExpression();
     let recordRange;
-    if (this.match(126 /* OperatorComma */)) {
+    if (this.match(127 /* OperatorComma */)) {
       const start = this.parseExpression();
       let end;
       if (this.match(4 /* KeywordTo */)) {
@@ -2446,9 +2609,9 @@ var Parser = class _Parser {
   }
   parseWidthStatement() {
     this.advance();
-    this.consume(111 /* OperatorHash */, "Expected '#' after Width");
+    this.consume(112 /* OperatorHash */, "Expected '#' after Width");
     const fileNumber = this.parseExpression();
-    this.consume(126 /* OperatorComma */, "Expected ',' after file number");
+    this.consume(127 /* OperatorComma */, "Expected ',' after file number");
     const width = this.parseExpression();
     return { type: "WidthStatement", fileNumber, width };
   }
@@ -2705,6 +2868,11 @@ function evaluateCCExpr(expr, resolve) {
 // ../../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";
+
+// ../../test-libs/vba-analyzer.ts
 function isStatementArray(v) {
   return Array.isArray(v);
 }
@@ -3728,6 +3896,18 @@ function collectVarRefsInBody(stmts, writes, reads, skipVars) {
         collectReadsInExpr(stmt.right, reads);
         break;
       }
+      case "MidStatement": {
+        const w = extractWriteName(stmt.target);
+        if (w && !skipVars.has(w)) {
+          if (!writes.has(w)) writes.set(w, []);
+          writes.get(w).push(line);
+        }
+        collectReadsInExpr(stmt.target, reads);
+        collectReadsInExpr(stmt.start, reads);
+        if (stmt.length) collectReadsInExpr(stmt.length, reads);
+        collectReadsInExpr(stmt.value, reads);
+        break;
+      }
       case "ReDimStatement": {
         const w = stmt.name?.name?.toLowerCase() ?? null;
         if (w && !skipVars.has(w)) {
@@ -3900,6 +4080,12 @@ function collectWriteAttrs(stmts, targets, selfRefs, boolOnly, arrayWrites) {
         if (stmt.left?.type === "CallExpression") arrayWrites.add(w);
       }
     }
+    if (stmt.type === "MidStatement") {
+      const w = extractWriteName(stmt.target);
+      if (w && targets.has(w)) {
+        selfRefs.add(w);
+      }
+    }
     const sub = (s) => collectWriteAttrs(Array.isArray(s) ? s : [s], targets, selfRefs, boolOnly, arrayWrites);
     if (stmt.body) sub(stmt.body);
     if (stmt.consequent) sub(stmt.consequent);
@@ -4208,7 +4394,8 @@ function analyzeFile(filePath) {
       definedTypes: /* @__PURE__ */ new Set(),
       callsByProc: /* @__PURE__ */ new Map(),
       xlVbConstantRefs: /* @__PURE__ */ new Set(),
-      commentedCodeBlocks: detectCommentedCode(src, filePath)
+      commentedCodeBlocks: detectCommentedCode(src, filePath),
+      withEventsVars: /* @__PURE__ */ new Set()
     };
   }
   if (ast.diagnostics && ast.diagnostics.length > 0) {
@@ -4287,13 +4474,22 @@ function analyzeFile(filePath) {
   const xlVbConstantRefs = collectExcelConstantRefs(ast);
   const gotoGraphs = procs.map((proc) => analyzeGotoInProc(proc));
   const loopAnalyses = procs.map((proc, i) => analyzeLoopsInProc(proc, gotoGraphs[i]));
+  const withEventsVars = /* @__PURE__ */ new Set();
+  for (const s of ast.body) {
+    if (s.type === "VariableDeclaration") {
+      for (const decl of s.declarations ?? []) {
+        if (decl.isWithEvents) withEventsVars.add((decl.name?.name ?? "").toLowerCase());
+      }
+    }
+  }
   return {
     report: { filePath, totalLines: lines.length, procedureCount: procedures.length, procedures, prefixClusters, warnings, gotoGraphs, loopAnalyses },
     definedProcs,
     definedTypes,
     callsByProc,
     xlVbConstantRefs,
-    commentedCodeBlocks: detectCommentedCode(src, filePath)
+    commentedCodeBlocks: detectCommentedCode(src, filePath),
+    withEventsVars
   };
 }
 function buildWorkspaceReport(analyses) {
@@ -4325,6 +4521,10 @@ function buildWorkspaceReport(analyses) {
   for (const a of analyses) {
     for (const p of a.report.procedures) {
       if (p.referenceCount === 0) {
+        const nameLower = p.name.toLowerCase();
+        const sep = nameLower.indexOf("_");
+        const isEventHandler = nameLower === "class_initialize" || nameLower === "class_terminate" || sep > 0 && a.withEventsVars.has(nameLower.slice(0, sep));
+        if (isEventHandler) continue;
         if (p.scope === "private") {
           deadCodeCandidates.push({
             file: a.report.filePath,
@@ -4989,10 +5189,13 @@ function buildDiffJson(baseline, current) {
     }
   };
 }
-function main() {
-  const args = process.argv.slice(2);
+function main(args) {
+  if (args.includes("--version") || args.includes("-v")) {
+    console.log(VERSION);
+    process.exit(0);
+  }
   if (args.length === 0 || args.includes("--help")) {
-    console.log("Usage: npx tsx test-libs/vba-analyzer.ts <file-or-dir> [options]");
+    console.log("Usage: vba-runner analyze <file-or-dir> [options]");
     console.log("");
     console.log("  --json                JSON \u5F62\u5F0F\u3067\u51FA\u529B\uFF08\u30D7\u30ED\u30B0\u30E9\u30E0\u9023\u643A\u7528\uFF09");
     console.log("  --diff <baseline>     baseline JSON \u3068\u306E\u5DEE\u5206\u3092\u8868\u793A\uFF08--json \u3068\u4F75\u7528\u53EF\uFF09");
@@ -5002,6 +5205,7 @@ function main() {
     console.log("  --goto-graph          GoTo \u6587\u306E\u5236\u5FA1\u30D5\u30ED\u30FC\u30B0\u30E9\u30D5\u3068\u30EA\u30D5\u30A1\u30AF\u30BF\u30EA\u30F3\u30B0\u63D0\u6848\u3092\u8868\u793A");
     console.log("  --cross-iter          \u30AF\u30ED\u30B9\u30A4\u30C6\u30EC\u30FC\u30B7\u30E7\u30F3\u5909\u6570\uFF08ByRef \u5FC5\u8981\u5909\u6570\uFF09\u306E\u4E00\u89A7\u3092\u8868\u793A");
     console.log("  --gen-test-dir <dir>  \u30C6\u30B9\u30C8\u7528\u30BD\u30FC\u30B9\u3092\u6307\u5B9A\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u751F\u6210\uFF08const.ts \u7B49\uFF09");
+    console.log("  --version             \u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8868\u793A");
     process.exit(args.length === 0 ? 1 : 0);
   }
   const wantJson = args.includes("--json");
@@ -5076,7 +5280,7 @@ function main() {
   );
   if (hasParseErrors) process.exit(1);
 }
-if (process.argv[1]?.includes("vba-analyzer")) main();
+if (process.argv[1]?.includes("vba-analyzer")) main(process.argv.slice(2));
 function analyzeWorkspaceForMcpFromFiles(files) {
   const analyses = files.map((f) => analyzeFile(f));
   return buildWorkspaceReport(analyses);
@@ -5100,6 +5304,7 @@ function formatWorkspaceReportForMcp(w) {
   formatWorkspaceOutlineForMcp,
   formatWorkspaceReportForMcp,
   formatWorkspaceSummary,
+  main,
   paramName,
   vbaTypeToTs
 });