BuboBubo/ziffers-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added lru_cache and range support for operations

Browse Source
This commit is contained in:
Miika Alonen
2023-02-22 15:47:07 +02:00
parent acbfacee59
commit 77cf10c95c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ziffers/classes.py
View File

@ -737,6 +737,8 @@ class ListOperation(Sequence):
flattened_list.extend(item.evaluated_values) flattened_list.extend(item.evaluated_values)
else: else:
flattened_list.append(filter_operation(item)) flattened_list.append(filter_operation(item))
elif isinstance(item, Range):
flattened_list.extend(list(item.evaluate(options)))
elif isinstance(item, (Event, RandomInteger, Integer, Cyclic)): elif isinstance(item, (Event, RandomInteger, Integer, Cyclic)):
flattened_list.append(item) flattened_list.append(item)

3
ziffers/parser.py
View File

@ -1,5 +1,6 @@
""" Module for the parser """ """ Module for the parser """
from pathlib import Path from pathlib import Path
from functools import lru_cache
from lark import Lark from lark import Lark
from .classes import Ziffers from .classes import Ziffers
from .mapper import ZiffersTransformer from .mapper import ZiffersTransformer
@ -29,7 +30,7 @@ def parse_expression(expr: str) -> Ziffers:
""" """
return ziffers_parser.parse(expr) return ziffers_parser.parse(expr)
@lru_cache
def zparse(expr: str, **opts) -> Ziffers: def zparse(expr: str, **opts) -> Ziffers:
"""Parses ziffers expression with options """Parses ziffers expression with options