Skip to content

Commit 0f7dba2

Browse files
barsdeveloperbarsdeveloper
committed
better name
1 parent 4c59cb0 commit 0f7dba2

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎dist/parsernostrum.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ class RegExpParser extends Parser {
566566

567567
static #createEscapeable = character => String.raw`[^${character}\\]*(?:\\.[^${character}\\]*)*`
568568
static #numberRegex = /[-\+]?(?:\d*\.)?\d+/
569-
static commonParser = {
569+
static common = {
570570
number: new RegExp(this.#numberRegex.source + String.raw`(?!\.)`),
571571
numberInteger: /[\-\+]?\d+(?!\.\d)/,
572572
numberNatural: /\d+/,
@@ -620,7 +620,7 @@ class RegExpParser extends Parser {
620620
doToString(context, indent, path) {
621621
let result = "/" + this.#regexp.source + "/";
622622
const shortname = Object
623-
.entries(RegExpParser.commonParser)
623+
.entries(RegExpParser.common)
624624
.find(([k, v]) => v.source === this.#regexp.source)?.[0];
625625
if (shortname) {
626626
result = "P." + shortname;
@@ -685,9 +685,9 @@ class MapParser extends Parser {
685685
}
686686
let result = this.#parser.toString(context, indent, childrenPath);
687687
if (this.#parser instanceof RegExpParser) {
688-
if (Object.values(RegExpParser.commonParser).includes(this.#parser.regexp)) {
688+
if (Object.values(RegExpParser.common).includes(this.#parser.regexp)) {
689689
if (
690-
this.#parser.regexp === RegExpParser.commonParser.numberInteger
690+
this.#parser.regexp === RegExpParser.common.numberInteger
691691
&& this.#mapper === /** @type {(v: any) => BigInt} */(BigInt)
692692
) {
693693
return "P.numberBigInteger"
@@ -914,49 +914,49 @@ class Parsernostrum {
914914
// Prefedined parsers
915915

916916
/** Parser accepting any valid decimal, possibly signed number */
917-
static number = this.reg(RegExpParser.commonParser.number).map(Number)
917+
static number = this.reg(RegExpParser.common.number).map(Number)
918918

919919
/** Parser accepting any digits only number */
920-
static numberInteger = this.reg(RegExpParser.commonParser.numberInteger).map(Number)
920+
static numberInteger = this.reg(RegExpParser.common.numberInteger).map(Number)
921921

922922
/** Parser accepting any digits only number and returns a BigInt */
923923
static numberBigInteger = this.reg(this.numberInteger.getParser().parser.regexp).map(BigInt)
924924

925925
/** Parser accepting any digits only number */
926-
static numberNatural = this.reg(RegExpParser.commonParser.numberNatural).map(Number)
926+
static numberNatural = this.reg(RegExpParser.common.numberNatural).map(Number)
927927

928928
/** Parser accepting any valid decimal, possibly signed, possibly in the exponential form number */
929-
static numberExponential = this.reg(RegExpParser.commonParser.numberExponential).map(Number)
929+
static numberExponential = this.reg(RegExpParser.common.numberExponential).map(Number)
930930

931931
/** Parser accepting any valid decimal number between 0 and 1 */
932-
static numberUnit = this.reg(RegExpParser.commonParser.numberUnit).map(Number)
932+
static numberUnit = this.reg(RegExpParser.common.numberUnit).map(Number)
933933

934934
/** Parser accepting any integer between 0 and 255 */
935-
static numberByte = this.reg(RegExpParser.commonParser.numberByte).map(Number)
935+
static numberByte = this.reg(RegExpParser.common.numberByte).map(Number)
936936

937937
/** Parser accepting whitespace */
938-
static whitespace = this.reg(RegExpParser.commonParser.whitespace)
938+
static whitespace = this.reg(RegExpParser.common.whitespace)
939939

940940
/** Parser accepting whitespace */
941-
static whitespaceOpt = this.reg(RegExpParser.commonParser.whitespaceOpt)
941+
static whitespaceOpt = this.reg(RegExpParser.common.whitespaceOpt)
942942

943943
/** Parser accepting whitespace that spans on a single line */
944-
static whitespaceInline = this.reg(RegExpParser.commonParser.whitespaceInline)
944+
static whitespaceInline = this.reg(RegExpParser.common.whitespaceInline)
945945

946946
/** Parser accepting whitespace that spans on a single line */
947-
static whitespaceInlineOpt = this.reg(RegExpParser.commonParser.whitespaceInlineOpt)
947+
static whitespaceInlineOpt = this.reg(RegExpParser.common.whitespaceInlineOpt)
948948

949949
/** Parser accepting whitespace that contains a list a newline */
950-
static whitespaceMultiline = this.reg(RegExpParser.commonParser.whitespaceMultiline)
950+
static whitespaceMultiline = this.reg(RegExpParser.common.whitespaceMultiline)
951951

952952
/** Parser accepting a double quoted string and returns the content */
953-
static doubleQuotedString = this.reg(RegExpParser.commonParser.doubleQuotedString, 1)
953+
static doubleQuotedString = this.reg(RegExpParser.common.doubleQuotedString, 1)
954954

955955
/** Parser accepting a single quoted string and returns the content */
956-
static singleQuotedString = this.reg(RegExpParser.commonParser.singleQuotedString, 1)
956+
static singleQuotedString = this.reg(RegExpParser.common.singleQuotedString, 1)
957957

958958
/** Parser accepting a backtick quoted string and returns the content */
959-
static backtickQuotedString = this.reg(RegExpParser.commonParser.backtickQuotedString, 1)
959+
static backtickQuotedString = this.reg(RegExpParser.common.backtickQuotedString, 1)
960960

961961
/** @param {T} parser */
962962
constructor(parser, optimized = false) {

‎dist/parsernostrum.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "parsernostrum",
33
"type": "module",
4-
"version": "1.1.2",
4+
"version": "1.1.3",
55
"description": "A tiny LL parser combinator library for javascript",
66
"main": "src/Parsernostrum.js",
77
"types": "src/types.js",

‎src/Parsernostrum.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,49 +45,49 @@ export default class Parsernostrum {
4545
// Prefedined parsers
4646

4747
/** Parser accepting any valid decimal, possibly signed number */
48-
static number = this.reg(RegExpParser.commonParser.number).map(Number)
48+
static number = this.reg(RegExpParser.common.number).map(Number)
4949

5050
/** Parser accepting any digits only number */
51-
static numberInteger = this.reg(RegExpParser.commonParser.numberInteger).map(Number)
51+
static numberInteger = this.reg(RegExpParser.common.numberInteger).map(Number)
5252

5353
/** Parser accepting any digits only number and returns a BigInt */
5454
static numberBigInteger = this.reg(this.numberInteger.getParser().parser.regexp).map(BigInt)
5555

5656
/** Parser accepting any digits only number */
57-
static numberNatural = this.reg(RegExpParser.commonParser.numberNatural).map(Number)
57+
static numberNatural = this.reg(RegExpParser.common.numberNatural).map(Number)
5858

5959
/** Parser accepting any valid decimal, possibly signed, possibly in the exponential form number */
60-
static numberExponential = this.reg(RegExpParser.commonParser.numberExponential).map(Number)
60+
static numberExponential = this.reg(RegExpParser.common.numberExponential).map(Number)
6161

6262
/** Parser accepting any valid decimal number between 0 and 1 */
63-
static numberUnit = this.reg(RegExpParser.commonParser.numberUnit).map(Number)
63+
static numberUnit = this.reg(RegExpParser.common.numberUnit).map(Number)
6464

6565
/** Parser accepting any integer between 0 and 255 */
66-
static numberByte = this.reg(RegExpParser.commonParser.numberByte).map(Number)
66+
static numberByte = this.reg(RegExpParser.common.numberByte).map(Number)
6767

6868
/** Parser accepting whitespace */
69-
static whitespace = this.reg(RegExpParser.commonParser.whitespace)
69+
static whitespace = this.reg(RegExpParser.common.whitespace)
7070

7171
/** Parser accepting whitespace */
72-
static whitespaceOpt = this.reg(RegExpParser.commonParser.whitespaceOpt)
72+
static whitespaceOpt = this.reg(RegExpParser.common.whitespaceOpt)
7373

7474
/** Parser accepting whitespace that spans on a single line */
75-
static whitespaceInline = this.reg(RegExpParser.commonParser.whitespaceInline)
75+
static whitespaceInline = this.reg(RegExpParser.common.whitespaceInline)
7676

7777
/** Parser accepting whitespace that spans on a single line */
78-
static whitespaceInlineOpt = this.reg(RegExpParser.commonParser.whitespaceInlineOpt)
78+
static whitespaceInlineOpt = this.reg(RegExpParser.common.whitespaceInlineOpt)
7979

8080
/** Parser accepting whitespace that contains a list a newline */
81-
static whitespaceMultiline = this.reg(RegExpParser.commonParser.whitespaceMultiline)
81+
static whitespaceMultiline = this.reg(RegExpParser.common.whitespaceMultiline)
8282

8383
/** Parser accepting a double quoted string and returns the content */
84-
static doubleQuotedString = this.reg(RegExpParser.commonParser.doubleQuotedString, 1)
84+
static doubleQuotedString = this.reg(RegExpParser.common.doubleQuotedString, 1)
8585

8686
/** Parser accepting a single quoted string and returns the content */
87-
static singleQuotedString = this.reg(RegExpParser.commonParser.singleQuotedString, 1)
87+
static singleQuotedString = this.reg(RegExpParser.common.singleQuotedString, 1)
8888

8989
/** Parser accepting a backtick quoted string and returns the content */
90-
static backtickQuotedString = this.reg(RegExpParser.commonParser.backtickQuotedString, 1)
90+
static backtickQuotedString = this.reg(RegExpParser.common.backtickQuotedString, 1)
9191

9292
/** @param {T} parser */
9393
constructor(parser, optimized = false) {

‎src/parser/MapParser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ export default class MapParser extends Parser {
5454
}
5555
let result = this.#parser.toString(context, indent, childrenPath)
5656
if (this.#parser instanceof RegExpParser) {
57-
if (Object.values(RegExpParser.commonParser).includes(this.#parser.regexp)) {
57+
if (Object.values(RegExpParser.common).includes(this.#parser.regexp)) {
5858
if (
59-
this.#parser.regexp === RegExpParser.commonParser.numberInteger
59+
this.#parser.regexp === RegExpParser.common.numberInteger
6060
&& this.#mapper === /** @type {(v: any) => BigInt} */(BigInt)
6161
) {
6262
return "P.numberBigInteger"

‎src/parser/RegExpParser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default class RegExpParser extends Parser {
1515

1616
static #createEscapeable = character => String.raw`[^${character}\\]*(?:\\.[^${character}\\]*)*`
1717
static #numberRegex = /[-\+]?(?:\d*\.)?\d+/
18-
static commonParser = {
18+
static common = {
1919
number: new RegExp(this.#numberRegex.source + String.raw`(?!\.)`),
2020
numberInteger: /[\-\+]?\d+(?!\.\d)/,
2121
numberNatural: /\d+/,
@@ -69,7 +69,7 @@ export default class RegExpParser extends Parser {
6969
doToString(context, indent, path) {
7070
let result = "/" + this.#regexp.source + "/"
7171
const shortname = Object
72-
.entries(RegExpParser.commonParser)
72+
.entries(RegExpParser.common)
7373
.find(([k, v]) => v.source === this.#regexp.source)?.[0]
7474
if (shortname) {
7575
result = "P." + shortname

0 commit comments

Comments
 (0)