yini-parser 1.5.0 → 1.6.0

package/dist/grammar/generated/YiniParserVisitor.d.ts

@@ -2,24 +2,33 @@ import { ParseTreeVisitor } from 'antlr4';
 import { YiniContext } from "./YiniParser.js";
 import { PrologContext } from "./YiniParser.js";
 import { Terminal_stmtContext } from "./YiniParser.js";
+import { Terminal_triviaContext } from "./YiniParser.js";
 import { StmtContext } from "./YiniParser.js";
+import { Full_line_comment_stmtContext } from "./YiniParser.js";
+import { Disabled_line_stmtContext } from "./YiniParser.js";
 import { Invalid_section_stmtContext } from "./YiniParser.js";
 import { Meta_stmtContext } from "./YiniParser.js";
 import { DirectiveContext } from "./YiniParser.js";
+import { Yini_directiveContext } from "./YiniParser.js";
+import { Yini_mode_declarationContext } from "./YiniParser.js";
 import { AnnotationContext } from "./YiniParser.js";
 import { EolContext } from "./YiniParser.js";
 import { AssignmentContext } from "./YiniParser.js";
 import { MemberContext } from "./YiniParser.js";
 import { ValueContext } from "./YiniParser.js";
+import { Scalar_valueContext } from "./YiniParser.js";
+import { Concat_expressionContext } from "./YiniParser.js";
+import { Concat_tailContext } from "./YiniParser.js";
+import { Concat_operandContext } from "./YiniParser.js";
+import { String_literalContext } from "./YiniParser.js";
 import { Object_literalContext } from "./YiniParser.js";
 import { Object_membersContext } from "./YiniParser.js";
 import { Object_memberContext } from "./YiniParser.js";
+import { Object_member_separatorContext } from "./YiniParser.js";
 import { List_literalContext } from "./YiniParser.js";
 import { ElementsContext } from "./YiniParser.js";
 import { Number_literalContext } from "./YiniParser.js";
 import { Null_literalContext } from "./YiniParser.js";
-import { String_literalContext } from "./YiniParser.js";
-import { String_concatContext } from "./YiniParser.js";
 import { Boolean_literalContext } from "./YiniParser.js";
 import { Bad_meta_textContext } from "./YiniParser.js";
 import { Bad_memberContext } from "./YiniParser.js";
@@ -49,12 +58,30 @@ export default class YiniParserVisitor<Result> extends ParseTreeVisitor<Result>
      * @return the visitor result
      */
     visitTerminal_stmt?: (ctx: Terminal_stmtContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.terminal_trivia`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTerminal_trivia?: (ctx: Terminal_triviaContext) => Result;
     /**
      * Visit a parse tree produced by `YiniParser.stmt`.
      * @param ctx the parse tree
      * @return the visitor result
      */
     visitStmt?: (ctx: StmtContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.full_line_comment_stmt`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitFull_line_comment_stmt?: (ctx: Full_line_comment_stmtContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.disabled_line_stmt`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitDisabled_line_stmt?: (ctx: Disabled_line_stmtContext) => Result;
     /**
      * Visit a parse tree produced by `YiniParser.invalid_section_stmt`.
      * @param ctx the parse tree
@@ -73,6 +100,18 @@ export default class YiniParserVisitor<Result> extends ParseTreeVisitor<Result>
      * @return the visitor result
      */
     visitDirective?: (ctx: DirectiveContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.yini_directive`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitYini_directive?: (ctx: Yini_directiveContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.yini_mode_declaration`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitYini_mode_declaration?: (ctx: Yini_mode_declarationContext) => Result;
     /**
      * Visit a parse tree produced by `YiniParser.annotation`.
      * @param ctx the parse tree
@@ -103,6 +142,36 @@ export default class YiniParserVisitor<Result> extends ParseTreeVisitor<Result>
      * @return the visitor result
      */
     visitValue?: (ctx: ValueContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.scalar_value`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitScalar_value?: (ctx: Scalar_valueContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.concat_expression`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitConcat_expression?: (ctx: Concat_expressionContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.concat_tail`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitConcat_tail?: (ctx: Concat_tailContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.concat_operand`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitConcat_operand?: (ctx: Concat_operandContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.string_literal`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitString_literal?: (ctx: String_literalContext) => Result;
     /**
      * Visit a parse tree produced by `YiniParser.object_literal`.
      * @param ctx the parse tree
@@ -121,6 +190,12 @@ export default class YiniParserVisitor<Result> extends ParseTreeVisitor<Result>
      * @return the visitor result
      */
     visitObject_member?: (ctx: Object_memberContext) => Result;
+    /**
+     * Visit a parse tree produced by `YiniParser.object_member_separator`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitObject_member_separator?: (ctx: Object_member_separatorContext) => Result;
     /**
      * Visit a parse tree produced by `YiniParser.list_literal`.
      * @param ctx the parse tree
@@ -145,18 +220,6 @@ export default class YiniParserVisitor<Result> extends ParseTreeVisitor<Result>
      * @return the visitor result
      */
     visitNull_literal?: (ctx: Null_literalContext) => Result;
-    /**
-     * Visit a parse tree produced by `YiniParser.string_literal`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitString_literal?: (ctx: String_literalContext) => Result;
-    /**
-     * Visit a parse tree produced by `YiniParser.string_concat`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitString_concat?: (ctx: String_concatContext) => Result;
     /**
      * Visit a parse tree produced by `YiniParser.boolean_literal`.
      * @param ctx the parse tree

package/dist/grammar/generated/YiniParserVisitor.js

@@ -1,5 +1,5 @@
 "use strict";
-// Generated from ./grammar/v1.0.0-rc.5/YiniParser.g4 by ANTLR 4.13.2
+// Generated from ./grammar/v1.0.0-rc.6/YiniParser.g4 by ANTLR 4.13.2
 Object.defineProperty(exports, "__esModule", { value: true });
 const antlr4_1 = require("antlr4");
 /**

package/dist/index.d.ts

@@ -25,6 +25,7 @@ import YINI from './YINI';
 export default YINI;
 export declare const parse: typeof YINI.parse;
 export declare const parseFile: typeof YINI.parseFile;
+export declare const parseForTooling: typeof YINI.parseForTooling;
 export declare const getTabSize: typeof YINI.getTabSize;
 export declare const setTabSize: typeof YINI.setTabSize;
 /**
@@ -42,4 +43,4 @@ export declare const setTabSize: typeof YINI.setTabSize;
  *
  * @packageDocumentation
  */
-export type { ParsedObject, AllUserOptions, YiniParseResult, OnDuplicateKey, DuplicateKeyPolicy, DocumentTerminatorRule, EmptyValueRule, FailLevelKey, PreferredFailLevel, BasicOptions, PrimaryUserParams, ParseOptions, IssuePayload, MetaSchemaVersion, OrderGuarantee, ResultMetadata, } from './types';
+export type { ParsedObject, AllUserOptions, YiniParseResult, YiniToolingParseResult, ToolingDiagnostic, ToolingDiagnosticSeverity, OnDuplicateKey, DuplicateKeyPolicy, DocumentTerminatorRule, EmptyValueRule, FailLevelKey, PreferredFailLevel, BasicOptions, PrimaryUserParams, ParseOptions, ParseForToolingOptions, IssuePayload, MetaSchemaVersion, OrderGuarantee, ResultMetadata, } from './types';

package/dist/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTabSize = exports.getTabSize = exports.parseFile = exports.parse = void 0;
+exports.setTabSize = exports.getTabSize = exports.parseForTooling = exports.parseFile = exports.parse = void 0;
 /*
     This file is a pure barrel file.
 
@@ -13,9 +13,9 @@ exports.setTabSize = exports.getTabSize = exports.parseFile = exports.parse = vo
     Run the code with the following command:
         npm start
     or
-        npm run start:dev
+        npm run start:main
     or
-        npm run start:dev:debug
+        npm run start:main:dev:debug
     
     /END
 */
@@ -47,6 +47,7 @@ const YINI_1 = __importDefault(require("./YINI"));
 exports.default = YINI_1.default; // Public package API.
 exports.parse = YINI_1.default.parse;
 exports.parseFile = YINI_1.default.parseFile;
+exports.parseForTooling = YINI_1.default.parseForTooling;
 exports.getTabSize = YINI_1.default.getTabSize;
 exports.setTabSize = YINI_1.default.setTabSize;
 //# sourceMappingURL=index.js.map

package/dist/parsers/extractHeaderParts.d.ts

@@ -1,27 +1,20 @@
 import { ErrorDataHandler } from '../core/errorDataHandler';
 import { StmtContext } from '../grammar/generated/YiniParser';
 /**
- * Check and identify the section header parts via tokenizing the parts and return them as strings.
- * @param rawHeaderLine Raw line with the section header where the header
- * marker will be identified. E.g. does the header start with '^^^' or '^3'
- * and then some identifier.
+ * Extracts the marker sequence, optional numeric shorthand depth,
+ * section name, and backticked-name flag from a YINI section header line.
  *
- * Below, copied from YINI Specification v1.0.0 Beta 7.
- * Form 1: Identifier of Simple Form:
- * - Keys must be non-empty.
- * - Keys are case-sensitive (`Title` and `title` are different).
- * - Can only contain letters (a-z or A-Z), digits (0-9) and underscores `_`.
- * - Must begin with a letter or an underscore `_`.
- * - Note: Cannot contain hyphens (`-`) or periods (`.`).
+ * Examples:
+ * - ^ Section
+ * - ^^ Section
+ * - ^^^_^^^_^ Section
+ * - ^10 Section
+ * - §2 Section
+ * - < `Backticked Section`
  *
- * Form 2: Backticked Identifier:
- * - A phrase is a name wrapped in backticks  ``` ` ```.
- * - Backticked identifiers must be on a single line and must not contain tabs or new lines unless using escaping codes, except for ordinary spaces.
- * - Special control characters (U+0000–U+001F) must be escaped.
- *
- * @note Implemented without regexp to keep it less cryptic, etc.
- * @note Returns the parts as strings; each part needs to be analyzed separately against the contraints in the specifications.
- * @returns An object with the identified header parts: marker characters, parsed name, and parsed level string.
+ * @note This function only splits the header into parts.
+ *       Validation of marker depth, marker separator placement, mixed markers,
+ *       and section name rules is handled by parseSectionHeader.ts.
  */
 declare const extractHeaderParts: (rawLine: string, errorHandler?: ErrorDataHandler | null, ctx?: StmtContext | null) => {
     strMarkerChars: string;

package/dist/parsers/extractHeaderParts.js

@@ -1,31 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// src/parsers/extractHeaderParts.ts
 const errorDataHandler_1 = require("../core/errorDataHandler");
 const print_1 = require("../utils/print");
 const yiniHelpers_1 = require("../utils/yiniHelpers");
 const extractSignificantYiniLine_1 = require("./extractSignificantYiniLine");
 /**
- * Check and identify the section header parts via tokenizing the parts and return them as strings.
- * @param rawHeaderLine Raw line with the section header where the header
- * marker will be identified. E.g. does the header start with '^^^' or '^3'
- * and then some identifier.
+ * Extracts the marker sequence, optional numeric shorthand depth,
+ * section name, and backticked-name flag from a YINI section header line.
  *
- * Below, copied from YINI Specification v1.0.0 Beta 7.
- * Form 1: Identifier of Simple Form:
- * - Keys must be non-empty.
- * - Keys are case-sensitive (`Title` and `title` are different).
- * - Can only contain letters (a-z or A-Z), digits (0-9) and underscores `_`.
- * - Must begin with a letter or an underscore `_`.
- * - Note: Cannot contain hyphens (`-`) or periods (`.`).
+ * Examples:
+ * - ^ Section
+ * - ^^ Section
+ * - ^^^_^^^_^ Section
+ * - ^10 Section
+ * - §2 Section
+ * - < `Backticked Section`
  *
- * Form 2: Backticked Identifier:
- * - A phrase is a name wrapped in backticks  ``` ` ```.
- * - Backticked identifiers must be on a single line and must not contain tabs or new lines unless using escaping codes, except for ordinary spaces.
- * - Special control characters (U+0000–U+001F) must be escaped.
- *
- * @note Implemented without regexp to keep it less cryptic, etc.
- * @note Returns the parts as strings; each part needs to be analyzed separately against the contraints in the specifications.
- * @returns An object with the identified header parts: marker characters, parsed name, and parsed level string.
+ * @note This function only splits the header into parts.
+ *       Validation of marker depth, marker separator placement, mixed markers,
+ *       and section name rules is handled by parseSectionHeader.ts.
  */
 const extractHeaderParts = (rawLine, errorHandler = null, ctx = null) => {
     (0, print_1.debugPrint)('-> Entered extractHeaderParts(..)');
@@ -33,9 +27,13 @@ const extractHeaderParts = (rawLine, errorHandler = null, ctx = null) => {
     const str = (0, extractSignificantYiniLine_1.extractYiniLine)(rawLine);
     (0, print_1.debugPrint)('rawLine: >>>' + rawLine + '<<<');
     (0, print_1.debugPrint)('    str: >>>' + str + '<<<');
-    // Edge case: empty line.
     if (!str) {
-        errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Internal-Error', 'Received blank argument in extractHeaderParts(..)', 'Sorry, an unintended internal error happened.');
+        if (errorHandler) {
+            errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Internal-Error', 'Received blank argument in extractHeaderParts(..)', 'Sorry, an unintended internal error happened.');
+        }
+        else {
+            throw new Error('Internal error: extractHeaderParts(..) received a blank argument.');
+        }
     }
     let pos = 0;
     const len = str.length;
@@ -43,48 +41,61 @@ const extractHeaderParts = (rawLine, errorHandler = null, ctx = null) => {
     let numberPart = '';
     let sectionNamePart = '';
     let isBacktickedName = false;
-    // 1. Skip leading whitespace.
-    while (pos < len && (str[pos] === ' ' || str[pos] === '\t'))
+    // 1. Skip leading horizontal whitespace.
+    while (pos < len && (str[pos] === ' ' || str[pos] === '\t')) {
         pos++;
-    // 2. Collect marker(s): ^, <, §, €.
-    while (pos < len && (0, yiniHelpers_1.isMarkerCharacter)(str[pos])) {
+    }
+    // 2. Collect the first section marker character.
+    if (pos < len && (0, yiniHelpers_1.isMarkerCharacter)(str[pos])) {
         markerCharsPart += str[pos];
         pos++;
     }
-    // 3. Numeric part (for numeric shorthand; only if single marker found).
-    if (markerCharsPart.length === 1 &&
-        pos < len &&
-        str[pos] >= '1' &&
-        str[pos] <= '9') {
-        // Start collecting number part.
+    // 3. Numeric shorthand: only allowed after a single marker character,
+    //    for example ^10 Section or §2 Section.
+    if (pos < len && str[pos] >= '1' && str[pos] <= '9') {
         while (pos < len && str[pos] >= '0' && str[pos] <= '9') {
             numberPart += str[pos];
             pos++;
         }
-        markerCharsPart += numberPart; // E.g., "^7".
+        const hasWhitespaceAfterNumber = pos >= len || str[pos] === ' ' || str[pos] === '\t';
+        if (!hasWhitespaceAfterNumber && errorHandler) {
+            errorHandler.pushOrBail((0, errorDataHandler_1.toErrorLocation)(ctx), 'Syntax-Error', 'Missing whitespace after numeric shorthand section marker.', `Numeric shorthand section headers require whitespace after the number. Got '${str}'.`, "Use a form such as '^10 Section', not '^10Section'.");
+        }
+    }
+    else {
+        // 4. Repeated marker sequence. Separators '_' are collected here too,
+        //    so parseSectionHeader.ts can validate their placement.
+        while (pos < len && (str[pos] === '_' || (0, yiniHelpers_1.isMarkerCharacter)(str[pos]))) {
+            markerCharsPart += str[pos];
+            pos++;
+        }
     }
-    // 4. Skip whitespace between marker and section name.
-    while (pos < len && (str[pos] === ' ' || str[pos] === '\t'))
+    // 5. Skip horizontal whitespace between marker and section name.
+    while (pos < len && (str[pos] === ' ' || str[pos] === '\t')) {
         pos++;
-    // 5. Collect section name (identifier or backticked).
+    }
+    // 6. Collect section name.
     if (pos < len && str[pos] === '`') {
-        // Backticked identifier.
-        let start = pos;
-        pos++; // Skip initial backtick.
-        while (pos < len && str[pos] !== '`')
+        const start = pos;
+        pos++; // Skip opening backtick.
+        while (pos < len) {
+            const ch = str[pos];
+            // Skip escaped character inside backticked identifier.
+            if (ch === '\\') {
+                pos += 2;
+                continue;
+            }
+            if (ch === '`') {
+                pos++; // Include closing backtick.
+                break;
+            }
             pos++;
-        pos++; // Include the closing backtick (if found).
+        }
         sectionNamePart = str.slice(start, pos).trim();
         isBacktickedName = true;
     }
     else {
-        // Non-backticked: take the rest of the line, trim off any trailing comments, etc.
         sectionNamePart = str.slice(pos).trim();
-        // Optionally, strip trailing comments or newlines here if needed.
-    }
-    if (isBacktickedName) {
-        (0, print_1.debugPrint)('Backticed sectionNamePart: ' + sectionNamePart);
-        // sectionNamePart = trimBackticks(sectionNamePart)
     }
     (0, print_1.debugPrint)();
     (0, print_1.debugPrint)('------');

package/dist/parsers/parseNumber.d.ts

@@ -1,11 +1,29 @@
 /**
+ * Parses a YINI number literal into a JavaScript number.
+ *
  * @property {string | undefined} [tag]
- *           This parameter is for debugging only. Its
- *           contents may change at any time and should not
- *           be relied upon for any significant purpose.
+ *           This property is for debugging only. Its contents may change
+ *           at any time and should not be relied upon for any significant
+ *           purpose.
+ * @examples
+ * scientific = 1.23e4
+ * binary_alt = %1010
+ * duodecimal = 0z2EX9
+ * positive = +123
+ *
+ * a = 1_000
+ * b = +1_000
+ * c = 1.23_45e4
+ * d = 1.23e+4_5
+ * e = 0x_FF_AA
+ * f = hex:_FF_AA
+ * g = 0b_1010_1100
+ * h = %_1010_1100
+ * i = 0o_755_644
+ * j = 0z_2E_X9
  */
-declare const parseNumberLiteral: (txt: string) => {
-    tag: string | undefined;
-    value: number | undefined;
+export declare function parseNumberLiteral(rawText: string): {
+    value: number;
+    tag?: string;
 };
 export default parseNumberLiteral;

package/dist/parsers/parseNumber.js

@@ -1,84 +1,149 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const number_1 = require("../utils/number");
+exports.parseNumberLiteral = parseNumberLiteral;
+// src/parsers/parseNumber.ts
 const print_1 = require("../utils/print");
 /**
+ * Parses a YINI number literal into a JavaScript number.
+ *
  * @property {string | undefined} [tag]
- *           This parameter is for debugging only. Its
- *           contents may change at any time and should not
- *           be relied upon for any significant purpose.
+ *           This property is for debugging only. Its contents may change
+ *           at any time and should not be relied upon for any significant
+ *           purpose.
+ * @examples
+ * scientific = 1.23e4
+ * binary_alt = %1010
+ * duodecimal = 0z2EX9
+ * positive = +123
+ *
+ * a = 1_000
+ * b = +1_000
+ * c = 1.23_45e4
+ * d = 1.23e+4_5
+ * e = 0x_FF_AA
+ * f = hex:_FF_AA
+ * g = 0b_1010_1100
+ * h = %_1010_1100
+ * i = 0o_755_644
+ * j = 0z_2E_X9
  */
-const parseNumberLiteral = (txt) => {
-    (0, print_1.debugPrint)('-> Entered parseNumberLiteral(..), txt: ' + txt);
-    if (/^[+-]?(?:\d+\.\d*|\d*\.?\d+)e[+-]?\d+$/i.test(txt)) {
-        // Exp. numbers
+function parseNumberLiteral(rawText) {
+    const raw = rawText.trim();
+    const signChar = raw.startsWith('-') || raw.startsWith('+') ? raw[0] : '';
+    const signFactor = signChar === '-' ? -1 : 1;
+    const unsigned = signChar ? raw.slice(1) : raw;
+    const decDigits = String.raw `\d(?:_?\d)*`;
+    const hexDigits = String.raw `[0-9a-fA-F](?:_?[0-9a-fA-F])*`;
+    const binDigits = String.raw `[01](?:_?[01])*`;
+    const octDigits = String.raw `[0-7](?:_?[0-7])*`;
+    const duoDigits = String.raw `[0-9aAbBxXeE](?:_?[0-9aAbBxXeE])*`;
+    // --- Exponent notation ---------
+    // Examples: 1e3, 1.23e4, 1_000e2, 1.23e-4, .5e2.
+    // Underscores may appear between digits, but not adjacent or at the end.
+    const expPattern = new RegExp(`^(?:${decDigits}(?:\\.${decDigits})?|\\.${decDigits})[eE][+-]?${decDigits}$`);
+    if (expPattern.test(unsigned)) {
         (0, print_1.debugPrint)('* Identified as an exp number');
+        const normalized = `${signChar}${unsigned.replace(/_/g, '')}`;
         return {
+            value: Number(normalized),
             tag: 'From exp number, Number-Float',
-            // value: parseInt(txt.replace('#', '0x'), 16),
-            value: parseFloat(txt),
         };
     }
-    // --- Hexadecimal ---------
-    if (/^[+-]?(0[xX]|#)/.test(txt)) {
-        // Prefix: 0x, 0X, #
+    // --- Hexadecimal with prefix 0x / 0X ---------
+    // Prefix: 0x or 0X.
+    // Allows underscores immediately after the prefix or between hex digits.
+    // Examples: 0xFF, 0x_FF, 0xFF_AA.
+    const hexPattern = new RegExp(`^0[xX]_?${hexDigits}$`);
+    if (hexPattern.test(unsigned)) {
         (0, print_1.debugPrint)('* Identified as a hex number');
-        (0, print_1.debugPrint)('parsed out HEX: ' + txt.replace(/0[xX]|#/, ''));
+        const normalized = unsigned.replace(/^0[xX]_?/, '').replace(/_/g, '');
         return {
+            value: signFactor * Number.parseInt(normalized, 16),
             tag: 'From hex number, Number-Integer',
-            // value: parseInt(txt.replace('#', '0x'), 16),
-            value: parseInt(txt.replace(/0[xX]|#/, ''), 16),
         };
     }
-    // --- Binary ---------
-    if (/^[+-]?(0[bB]|%)/.test(txt)) {
-        // Prefix: 0b, 0B, %
+    // --- Hexadecimal with explicit prefix hex: ---------
+    // Prefix: hex: or HEX:.
+    // Whitespace after hex: is not allowed.
+    // Allows underscores immediately after the prefix or between hex digits.
+    // Examples: hex:FF, hex:_FF, hex:FF_AA.
+    const explicitHexPattern = new RegExp(`^hex:_?${hexDigits}$`, 'i');
+    if (explicitHexPattern.test(unsigned)) {
+        (0, print_1.debugPrint)('* Identified as an explicit hex number');
+        const normalized = unsigned.replace(/^hex:_?/i, '').replace(/_/g, '');
+        return {
+            value: signFactor * Number.parseInt(normalized, 16),
+            tag: 'From explicit hex number, Number-Integer',
+        };
+    }
+    // --- Binary with prefix 0b / 0B or % ---------
+    // Prefix: 0b, 0B, or %.
+    // Allows underscores immediately after the prefix or between binary digits.
+    // Examples: 0b1010, 0b_1010, 0b1010_1100, %1010, %_1010.
+    const binPattern = new RegExp(`^(?:0[bB]|%)_?${binDigits}$`);
+    if (binPattern.test(unsigned)) {
         (0, print_1.debugPrint)('* Identified as a bin number');
-        (0, print_1.debugPrint)('parsed out BIN: ' + txt.replace(/0[bB]|%/, ''));
+        const normalized = unsigned
+            .replace(/^(?:0[bB]|%)_?/, '')
+            .replace(/_/g, '');
         return {
+            value: signFactor * Number.parseInt(normalized, 2),
             tag: 'From bin number, Number-Integer',
-            value: parseInt(txt.replace(/0[bB]|%/, ''), 2),
         };
     }
-    // --- Octal ---------
-    if (/^[+-]?0[oO]/.test(txt)) {
-        // Prefix: 0o, 0O
-        (0, print_1.debugPrint)('* Identified as a oct number');
-        (0, print_1.debugPrint)('parsed out OCT: ' + txt.replace(/0[oO]/, ''));
+    // --- Octal with prefix 0o / 0O ---------
+    // Prefix: 0o or 0O.
+    // Allows underscores immediately after the prefix or between octal digits.
+    // Examples: 0o755, 0o_755, 0o755_644.
+    const octPattern = new RegExp(`^0[oO]_?${octDigits}$`);
+    if (octPattern.test(unsigned)) {
+        (0, print_1.debugPrint)('* Identified as an oct number');
+        const normalized = unsigned.replace(/^0[oO]_?/, '').replace(/_/g, '');
         return {
+            value: signFactor * Number.parseInt(normalized, 8),
             tag: 'From oct number, Number-Integer',
-            value: parseInt(txt.replace(/0[oO]/, ''), 8),
         };
     }
-    // --- Duodecimal ---------
-    if (/^[+-]?0[zZ]/.test(txt)) {
-        // Prefix: 0z, 0Z, x = A = 10, e = B = 11.
+    // --- Duodecimal / dozenal with prefix 0z / 0Z ---------
+    // Prefix: 0z or 0Z.
+    // x/X = A/a = 10, e/E = B/b = 11.
+    // Allows underscores immediately after the prefix or between duodecimal digits.
+    // Examples: 0z2EX9, 0z_2EX9, 0z2E_X9.
+    const duoPattern = new RegExp(`^0[zZ]_?${duoDigits}$`);
+    if (duoPattern.test(unsigned)) {
         (0, print_1.debugPrint)('* Identified as a duodecimal number');
-        (0, print_1.debugPrint)('parsed out DOZ: ' + txt.replace(/0[zZ]/, ''));
-        txt = txt.replace(/[xX]/g, 'A');
-        txt = txt.replace(/[eE]/g, 'B');
-        (0, print_1.debugPrint)('Converter to AB form: ' + txt.replace(/0[zZ]/, ''));
+        const normalized = unsigned
+            .replace(/^0[zZ]_?/, '')
+            .replace(/_/g, '')
+            .replace(/[xX]/g, 'A')
+            .replace(/[eE]/g, 'B');
         return {
+            value: signFactor * Number.parseInt(normalized, 12),
             tag: 'From doz (duodecimal) number, Number-Integer',
-            value: parseInt(txt.replace(/0[zZ]/, ''), 12),
         };
     }
-    // In a regex literal the dot must be escaped (\.) to match a literal '.'
-    if (/\./.test(txt)) {
-        (0, print_1.debugPrint)('* Identified as a float number');
+    // --- Decimal integer / float ---------
+    // Allows underscores between decimal digits.
+    // Examples: 1000, +1000, -1000, 1_000, 3.14, 3.141_592, .5.
+    const decimalPattern = new RegExp(`^(?:${decDigits}(?:\\.${decDigits})?|\\.${decDigits})$`);
+    if (decimalPattern.test(unsigned)) {
+        (0, print_1.debugPrint)(/\./.test(unsigned)
+            ? '* Identified as a float number'
+            : '* Identified as an int number');
+        const normalized = `${signChar}${unsigned.replace(/_/g, '')}`;
         return {
-            tag: 'From float number, Number-Float',
-            value: parseFloat(txt),
+            value: Number(normalized),
+            tag: /\./.test(unsigned)
+                ? 'From float number, Number-Float'
+                : 'From int number, Number-Integer',
         };
     }
-    // TODO: Depending, on mode, below continue or break on error
-    //console.error('Error: Failed to parse number value: ' + txt)
-    if (!(0, number_1.isValidJSNumber)(txt)) {
-        (0, print_1.debugPrint)('* Identified as invalid number');
-        return { tag: 'From invalid number/value', value: undefined };
-    }
-    (0, print_1.debugPrint)('* Identified as a int number');
-    return { tag: 'From int number, Number-Integer', value: parseInt(txt) };
-};
+    // --- Invalid number literal ---------
+    (0, print_1.debugPrint)('* Identified as invalid number');
+    return {
+        value: Number.NaN,
+        tag: 'From invalid number/value',
+    };
+}
 exports.default = parseNumberLiteral;
 //# sourceMappingURL=parseNumber.js.map