Skip to content

Commit a32114b

Browse files
committed
use pyrsercomb library
1 parent 71478c6 commit a32114b

File tree

13 files changed

+28
-527
lines changed

13 files changed

+28
-527
lines changed

pyconlang/lexicon/parser.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22
from pathlib import Path
33
from typing import Literal, cast
44

5+
from pyrsercomb import (
6+
default,
7+
eof,
8+
eol,
9+
lift2,
10+
lift3,
11+
lift6,
12+
lift7,
13+
regex,
14+
string,
15+
token,
16+
whitespace,
17+
)
18+
519
from ..domain import Lexeme, PartOfSpeech, Scoped
620
from ..parser import (
721
affix,
@@ -16,19 +30,6 @@
1630
scoped_prefix,
1731
scoped_suffix,
1832
)
19-
from ..pyrsec import (
20-
default,
21-
eof,
22-
eol,
23-
lift2,
24-
lift3,
25-
lift6,
26-
lift7,
27-
regex,
28-
string,
29-
token,
30-
whitespace,
31-
)
3233
from .domain import (
3334
AffixDefinition,
3435
Entry,

pyconlang/lexurgy/parser.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from ..pyrsec import default, lift4, regex, string, token
1+
from pyrsercomb import default, lift4, regex, string, token
2+
23
from .domain import TraceLine
34

45
word = regex(r"[^\s:]+")

pyconlang/parser.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from collections.abc import Iterable
22
from typing import TypeVar
33

4+
from pyrsercomb import Parser, default, eof, fix, lift2, lift3, regex, string, token
5+
46
from .domain import (
57
AnyPrefix,
68
AnySuffix,
@@ -27,7 +29,6 @@
2729
Tags,
2830
Word,
2931
)
30-
from .pyrsec import Parser, default, eof, fix, lift2, lift3, regex, string, token
3132

3233
T = TypeVar("T")
3334

pyconlang/pyrsec/__init__.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

pyconlang/pyrsec/core.py

Lines changed: 0 additions & 198 deletions
This file was deleted.

pyconlang/pyrsec/forward.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)