llparse 0.1.8__tar.gz → 0.1.9__tar.gz

{llparse-0.1.8 → llparse-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llparse
-Version: 0.1.8
+Version: 0.1.9
 Summary: A Parody of llparse written for writing C Parsers with Python
 Author-email: Vizonex <VizonexBusiness@gmail.com>
 Requires-Python: >=3.9

{llparse-0.1.8 → llparse-0.1.9}/llparse/C_compiler.py

@@ -182,7 +182,7 @@ class CCompiler:
             else:
                 # TODO (Vizonex) Merge lines 139 & 140 together in a future update
                 callback = (
-                    f"(({info.prefix}__span_cb)" + ctx.spanCbField(span.index) + f")"
+                    f"(({info.prefix}__span_cb)" + ctx.spanCbField(span.index) + ")"
                 )
 
             args = [ctx.stateArg(), posField, f"(const char*) {ctx.endPosArg()}"]

{llparse-0.1.8 → llparse-0.1.9}/llparse/__init__.py

@@ -1,2 +1,4 @@
 from .dot import Dot
 from .llparse import LLParse
+
+__all__ = ("Dot", "LLParse")

{llparse-0.1.8 → llparse-0.1.9}/llparse/compilator.py

@@ -273,12 +273,13 @@ class Update(Field):
         out.append(f"{self.field(ctx)} = {self.ref.value};")
         out.append("return 0;")
 
+
 class Operator(Field):
     def __init__(self, ref: _frontend.code.Operator):
         self.ref = ref
-    
+
     def doBuild(self, ctx: "Compilation", out: list[str]):
-        out.append(f'return {self.field(ctx)} {self.ref.op} {self.ref.value};')
+        out.append(f"return {self.field(ctx)} {self.ref.op} {self.ref.value};")
 
 
 @dataclass
@@ -508,7 +509,9 @@ class Pause(Error):
 
         assert self.ref.otherwise
         otherwise = ctx.unwrapNode(self.ref.otherwise.node)
-        out.append(f"{ctx.currentField()} = (void*) (intptr_t) {otherwise.cachedDecel or ('s_n_' + otherwise.ref.id.name)};")
+        out.append(
+            f"{ctx.currentField()} = (void*) (intptr_t) {otherwise.cachedDecel or ('s_n_' + otherwise.ref.id.name)};"
+        )
         out.append(f"return {STATE_ERROR};")
 
 
@@ -519,7 +522,7 @@ class Sequence(Node):
 
     def doBuild(self, out: list[str]):
         ctx = self.compilation
-        # TODO: llparse_match_t could be easily changed around to 
+        # TODO: llparse_match_t could be easily changed around to
         # Something that can't be overlapped with when compiled with other parsers...
         out.append("llparse_match_t match_seq;")
         out.append("")
@@ -691,11 +694,13 @@ class SpanEnd(Node):
 # 0x800000 I24
 # 0x1000000 U24
 
+
 class Int(Node):
     def __init__(self, ref: _frontend.node.Int):
         super().__init__(ref)
         self.ref = ref
         self.offset = ref.byteOffset
+
     # I'm going to deviate from arthurschreiber's work a bit with indutny's suggestions.
     # we should really be using bitwise operators like rshift and lshift
     @property
@@ -705,11 +710,11 @@ class Int(Node):
     def readInt8(self, out: list[str]) -> None:
         ctx, index = self.pair
         out.append(f"{index} = ((*{ctx.posArg()}) & 0x80);")
-    
+
     def readUInt8(self, out: list[str]) -> None:
         ctx, index = self.pair
         out.append(f"{index} = (*{ctx.posArg()});")
-    
+
     # LITTLE ENDIAN
 
     def readInt16LE(self, out: list[str]) -> None:
@@ -717,7 +722,7 @@ class Int(Node):
         if self.offset == 0:
             out.append(f"{index} = (*{ctx.posArg()});")
         else:
-            # Since BE Belongs to performing << aka left shifts we do >> right shifts 
+            # Since BE Belongs to performing << aka left shifts we do >> right shifts
             out.append(f"{index} = ({index} >> 8) | ((*{ctx.posArg()}) & 0x80);")
 
     def readUInt16LE(self, out: list[str]) -> None:
@@ -742,7 +747,7 @@ class Int(Node):
             out.append(f"{index} = (*{ctx.posArg()});")
         else:
             out.append(f"{index} = ({index} >> 8) | (*{ctx.posArg()});")
- 
+
     def readInt32LE(self, out: list[str]) -> None:
         ctx, index = self.pair
         if self.offset == 0:
@@ -758,17 +763,17 @@ class Int(Node):
             out.append(f"{index} = (*{ctx.posArg()});")
         else:
             out.append(f"{index} = ({index} >> 8) | (*{ctx.posArg()});")
-    
-    # BIG ENDIAN 
-    
+
+    # BIG ENDIAN
+
     def readInt16BE(self, out: list[str]) -> None:
         ctx, index = self.pair
         if self.offset == 0:
             out.append(f"{index} = (*{ctx.posArg()});")
         else:
-            # Since LE Belongs to >> we do "<<" instead 
+            # Since LE Belongs to >> we do "<<" instead
             out.append(f"{index} = ({index} << 8) | ((*{ctx.posArg()}) & 0x80);")
-    
+
     def readUInt16BE(self, out: list[str]) -> None:
         ctx, index = self.pair
         if self.offset == 0:
@@ -791,7 +796,7 @@ class Int(Node):
             out.append(f"{index} = (*{ctx.posArg()});")
         else:
             out.append(f"{index} = ({index} << 8) | (*{ctx.posArg()});")
- 
+
     def readInt32BE(self, out: list[str]) -> None:
         ctx, index = self.pair
         if self.offset == 0:
@@ -807,15 +812,16 @@ class Int(Node):
             out.append(f"{index} = (*{ctx.posArg()});")
         else:
             out.append(f"{index} = ({index} << 8) | (*{ctx.posArg()});")
- 
-        
-    def doBuild(self, out:list[str]):
+
+    def doBuild(self, out: list[str]):
         self.prologue(out)
         # I'm still supporting 3.9 but I plan to drop it's support in favor of match case soon...
         bits = self.ref.bits
-        
-        if self.compilation.getFieldType(self.ref.field) == 'ptr':
-            raise ValueError(f'property {self.ref.field} should not use pointers but it was given \"ptr\"')
+
+        if self.compilation.getFieldType(self.ref.field) == "ptr":
+            raise ValueError(
+                f'property {self.ref.field} should not use pointers but it was given "ptr"'
+            )
 
         if bits == 1:
             self.readInt8(out) if self.ref.signed else self.readUInt8(out)
@@ -835,10 +841,8 @@ class Int(Node):
             else:
                 self.readInt32BE(out) if self.ref.signed else self.readUInt32BE(out)
         # TODO: uint64 & int64
-        
-        self.tailTo(out, self.ref.otherwise.node, self.ref.otherwise.noAdvance, None)
-
 
+        self.tailTo(out, self.ref.otherwise.node, self.ref.otherwise.noAdvance, None)
 
 
 MAX_CHAR = 0xFF
@@ -1193,12 +1197,11 @@ class Compilation:
             raise LookupError(f'Field "{field}" not found')
 
     # Helpers are different since in python we have duck typing - Vizonex
-    def unwrapCode(
-        self, code: IWrap[_frontend.code.Code], allow_continue: bool = False
-    ):
-        if self.CodeContainer.get(code):
+    def unwrapCode(self, code: IWrap[_frontend.code.Code]):
+        if __code := self.CodeContainer.get(code):
             # Give some indication that the element has already been built...
-            return self.CodeContainer[code]
+            # return self.CodeContainer[code]
+            return __code
 
         ref = code.ref
 
@@ -1251,7 +1254,7 @@ class Compilation:
             r = Error(ref)
         elif isinstance(ref, _frontend.node.Invoke):
             r = Invoke(ref)
-        
+
         elif isinstance(ref, _frontend.node.SpanStart):
             r = SpanStart(ref)
 

{llparse-0.1.8 → llparse-0.1.9}/llparse/cython_builder.py

@@ -4,7 +4,7 @@ from contextlib import contextmanager
 from typing import Optional
 
 from .frontend import IFrontendResult
-from .pyfront.front import Match
+from .pyfront.code import Match
 from .pyfront.nodes import Invoke
 
 # Inspired by Cython's Writer

{llparse-0.1.8 → llparse-0.1.9}/llparse/enumerator.py

@@ -1,10 +1,11 @@
-from .pyfront.front import IWrap
+from .pyfront.code import IWrap
 from .pyfront.nodes import Node
 
 
 class Enumerator:
+    # TODO: Remove from staticmethod and make one seperate function
     @staticmethod
-    def getAllNodes(root: IWrap[Node]):
+    def getAllNodes(root: IWrap[Node]) -> list[IWrap[Node]]:
         nodes: set[IWrap[Node]] = set()
         queue: list[IWrap[Node]] = [root]
 

{llparse-0.1.8 → llparse-0.1.9}/llparse/frontend.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Literal, Optional, Union, TypeVar
+from typing import Literal, Optional, TypeVar, Union
 
 from .enumerator import Enumerator
 from .pybuilder import LoopChecker
@@ -7,12 +7,12 @@ from .pybuilder import builder as source
 
 # from pyfront.namespace import code, node , transform
 from .pyfront import namespace as _frontend
-from .pyfront.front import Identifier, IWrap, SpanField
+from .pyfront.code import Identifier, IWrap, SpanField
 from .pyfront.implementation import IImplementation
 from .pyfront.nodes import ITableEdge
 from .pyfront.peephole import Peephole
 from .spanalloc import SpanAllocator
-from .trie import Trie, TrieEmpty, TrieNode, TrieSequence, TrieSingle, ITrieSingleChild
+from .trie import ITrieSingleChild, Trie, TrieEmpty, TrieNode, TrieSequence, TrieSingle
 
 DEFAULT_MIN_TABLE_SIZE = 32
 DEFAULT_MAX_TABLE_WIDTH = 4
@@ -22,8 +22,8 @@ from logging import getLogger
 log = getLogger("llparse.frontend")
 
 
-CodeT = TypeVar('CodeT', bound=source.code.Code)
-NodeT = TypeVar('NodeT', bound=source.node.Node)
+CodeT = TypeVar("CodeT", bound=source.code.Code)
+NodeT = TypeVar("NodeT", bound=source.node.Node)
 
 WrappedNode = IWrap[_frontend.node.Node]
 WrappedCode = IWrap[_frontend.code.Code]
@@ -196,7 +196,7 @@ class Frontend:
                 _frontend.node.Sequence,
                 _frontend.node.Single,
                 _frontend.node.TableLookup,
-                _frontend.node.SpanStart
+                _frontend.node.SpanStart,
             ),
         ):
             self.resumptionTargets.add(node)
@@ -263,8 +263,8 @@ class Frontend:
 
             assert isinstance(node, (source.code.Match, source.node.Int))
             _match = node
-        
-            assert otherwise, (f'Node "{node.name}" has no ".otherwise()"')
+
+            assert otherwise, f'Node "{node.name}" has no ".otherwise()"'
 
             if isinstance(node, source.node.Match):
                 for child in result:
@@ -277,9 +277,10 @@ class Frontend:
                     # TODO Vizonex : This might break , be sure to make a workaround function here...
                     child.ref.setTransform(transform)
 
-            
             else:
-                result[-1].ref.setOtherwise(self.translate(otherwise.node), otherwise.noAdvance)
+                result[-1].ref.setOtherwise(
+                    self.translate(otherwise.node), otherwise.noAdvance
+                )
             assert len(result) >= 1
             return result[0]
 
@@ -310,16 +311,30 @@ class Frontend:
                 assert len(list(node)) == 0
 
             return single
-        
+
     def translateInt(self, node: source.node.Int) -> list[IWrap[_frontend.node.Int]]:
-        inner = _frontend.node.Int(self.Id.id(node.name), node.field, node.bits, node.signed, node.little_endian, 0)
+        inner = _frontend.node.Int(
+            self.Id.id(node.name),
+            node.field,
+            node.bits,
+            node.signed,
+            node.little_endian,
+            0,
+        )
         result = [self.implementation.node.Int(inner)]
         # front is to avoid overlapping with python's functions (aka next)
         front = self.Map[node] = result[0]
-        
+
         for offset in range(1, node.bits):
             unique_name = self.Id.id(f"{node.name}_byte{offset + 1}")
-            inner = _frontend.node.Int(unique_name, node.field, node.bits, node.signed, node.little_endian, offset)
+            inner = _frontend.node.Int(
+                unique_name,
+                node.field,
+                node.bits,
+                node.signed,
+                node.little_endian,
+                offset,
+            )
             outer = self.implementation.node.Int(inner)
             result.append(outer)
             # Integers will advance since they are unpacking values...
@@ -327,7 +342,6 @@ class Frontend:
             front = result[-1]
         return result
 
-
     def maybeTableLookup(
         self, node: source.code.Match, trie: TrieSingle, children: MatchChildren
     ):
@@ -466,9 +480,7 @@ class Frontend:
     def translateSpanCode(self, code: source.code._Span):
         return self.translateCode(code)
 
-    def translateCode(
-        self, code: CodeT
-    ):
+    def translateCode(self, code: CodeT):
         """Translates Builder Classes to Frontend Classes..."""
 
         prefixed = self.codeId.id(code.name).name
@@ -479,13 +491,13 @@ class Frontend:
             res = codeImpl.IsEqual(
                 _frontend.code.IsEqual(prefixed, code.field, code.value)
             )
-        # custom thing I added in 0.1.6 I encourage the typescript 
+        # custom thing I added in 0.1.6 I encourage the typescript
         # maintainers and developers of llparse to look into this :)
         elif isinstance(code, source.code.Operator):
-            res = codeImpl.Operator(_frontend.code.Operator(
-                prefixed, code.field, code.value, code.op
-            ))
-        
+            res = codeImpl.Operator(
+                _frontend.code.Operator(prefixed, code.field, code.value, code.op)
+            )
+
         elif isinstance(code, source.code.Load):
             res = codeImpl.Load(_frontend.code.Load(prefixed, code.field))
 

{llparse-0.1.8 → llparse-0.1.9}/llparse/llparse.py

@@ -67,21 +67,19 @@ class Compiler:
         properties: list[source.Property],
         header_name: Optional[str] = None,
         Impl: Optional[IImplementation] = IImplementation(),
-        override_llparse_name: bool = False
+        override_llparse_name: bool = False,
     ):
         """Creates the C and header file..."""
         info = self.to_frontend(root, properties, Impl)
         hb = HeaderBuilder(self.prefix, self.headerGuard, properties, info.spans)
-        cdata =  CCompiler(header_name, self.debug).compile(info)
+        cdata = CCompiler(header_name, self.debug).compile(info)
         if override_llparse_name:
             # sometimes users want to combine parsers together when compiling with C
             # to make up for conflicts with other parsers example: llhttp
             # there should be a fair way of compiling everything.
-            cdata = cdata.replace('llparse', self.prefix)
+            cdata = cdata.replace("llparse", self.prefix)
 
-        return CompilerResult(
-           cdata , hb.build()
-        )
+        return CompilerResult(cdata, hb.build())
 
 
 class LLParse(source.Builder):
@@ -113,7 +111,7 @@ class LLParse(source.Builder):
         debug: Optional[str] = None,
         maxTableElemWidth: Optional[int] = None,
         minTableSize: Optional[int] = None,
-    ):
+    ) -> Compiler:
         return Compiler(
             self.prefix,
             headerGuard,
@@ -130,8 +128,8 @@ class LLParse(source.Builder):
         maxTableElemWidth: Optional[int] = None,
         minTableSize: Optional[int] = None,
         header_name: Optional[str] = None,
-        override_llparse_name:bool = False
-    ):
+        override_llparse_name: bool = False,
+    ) -> CompilerResult:
         """Builds Graph and then compiles the data into C code , returns with the header and C file inside of a Dataclass"""
 
         compiler = Compiler(
@@ -142,8 +140,12 @@ class LLParse(source.Builder):
             minTableSize if minTableSize else DEFAULT_MIN_TABLE_SIZE,
         )
 
-        return compiler.compile(root, self.properties(), header_name=header_name, override_llparse_name=override_llparse_name)
-    
+        return compiler.compile(
+            root,
+            self.properties(),
+            header_name=header_name,
+            override_llparse_name=override_llparse_name,
+        )
 
     def to_frontend(
         self,
@@ -152,7 +154,7 @@ class LLParse(source.Builder):
         debug: Optional[str] = None,
         maxTableElemWidth: Optional[int] = None,
         minTableSize: Optional[int] = None,
-    ):
+    ) -> Compiler:
         """Used as an external hack to get access to the frontend of llparse and extract
         it's contents to compile the libraries you make other things like cython, This is not in llparse
         specifically (Yet...)"""

llparse-0.1.9/llparse/pybuilder/__init__.py

@@ -0,0 +1,7 @@
+from ..pybuilder.builder import *
+from ..pybuilder.loopchecker import *
+from ..pybuilder.main_code import (  # I'll add more soon I feel a little lazy at the moment.
+    Int,
+    Match,
+    Node,
+)

{llparse-0.1.8 → llparse-0.1.9}/llparse/pybuilder/builder.py

@@ -1,10 +1,9 @@
 from typing import Literal, Optional, Union
+
 from ..pybuilder import main_code as code
 
 # typehinting node and code (TODO: Vizonex) Lets seperate the modules soon...
 node = code
-# from pydot import graph_from_dot_data
-
 
 i8 = "i8"
 i16 = "i16"

{llparse-0.1.8 → llparse-0.1.9}/llparse/pybuilder/loopchecker.py

@@ -118,15 +118,14 @@ class Reachability:
     def build(self, root: Node) -> list[Node]:
         res: set[Node] = set()
         queue = [root]
-        while len(queue) != 0:
+        while queue:
             node = queue.pop()
             if node in res:
                 continue
             res.add(node)
             for edge in node:
                 queue.append(edge.node)
-            otherwise = node.getOtherwiseEdge()
-            if otherwise:
+            if otherwise := node.getOtherwiseEdge():
                 queue.append(otherwise.node)
 
         # Reverse the order so that we always

{llparse-0.1.8 → llparse-0.1.9}/llparse/pybuilder/main_code.py

@@ -196,7 +196,6 @@ class Node:
             return res
         else:
             # Concate DO NOT ADD TO RES!!!!
-
             return res + [self.otherwiseEdge]
 
     def __iter__(self):
@@ -601,20 +600,3 @@ class Reachability:
                 queue.append(otherwise.node)
 
         return list(res)
-
-
-# On_User_Key = Match("On_User_Key")
-
-# On_User_Value = Match("On_User_Value")
-
-# data_extraction = Node("On_Data_Extraction").skipTo(On_User_Key)
-
-# node = Match("On_Level_Comment").skipTo(data_extraction)
-
-
-# On_User_Key.match(["0","1","2","3","4","5","6","7","8","9"],On_User_Key)\
-#     .peek("~",On_User_Value)\
-#     .otherwise(Error(1,"[BAD KEY] Some retard decided to hijack your server! Oh SHIT!"))
-
-
-# print([d.node.name for d in node.getAllEdges()])

llparse-0.1.9/llparse/pyfront/__init__.py

@@ -0,0 +1,3 @@
+from . import code as code
+from . import nodes as node
+

llparse-0.1.8/llparse/pyfront/front.py → llparse-0.1.9/llparse/pyfront/code.py

@@ -89,7 +89,11 @@ class IsEqual(FieldValue):
 class Operator(FieldValue):
     def __init__(self, name: str, field: str, value: int, op: str):
         super().__init__(
-            "match", f"is_{field}_{name}_{toCacheKey(value)}", f'{name}_{toCacheKey(value)}', field, value
+            "match",
+            f"is_{field}_{name}_{toCacheKey(value)}",
+            f"{name}_{toCacheKey(value)}",
+            field,
+            value,
         )
         self.op = op
 

{llparse-0.1.8 → llparse-0.1.9}/llparse/pyfront/implementation.py

@@ -1,7 +1,7 @@
-from ..pyfront import front as code
+from . import code as code
 from ..pyfront import nodes as node
 from ..pyfront import transform
-from ..pyfront.front import IWrap
+from .code import IWrap
 
 
 class INodeImplementation:
@@ -37,7 +37,7 @@ class INodeImplementation:
 
     def TableLookup(self, n: node.TableLookup):
         return IWrap(n)
-    
+
     def Int(self, n: node.Int):
         return IWrap(n)
 
@@ -93,7 +93,7 @@ class ICodeImplementation:
 
     def Value(self, c: code.Value):
         return IWrap(c)
-    
+
     def Operator(self, c: code.Operator):
         return IWrap(c)
 

llparse-0.1.9/llparse/pyfront/namespace.py

@@ -0,0 +1,9 @@
+from ..pyfront import transform as transform
+from ..pyfront import nodes as node
+from ..pyfront import code as code
+
+__all__ = (
+    "node",
+    "code",
+    "transform"
+)

{llparse-0.1.8 → llparse-0.1.9}/llparse/pyfront/nodes.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
-from typing import Any, Optional, Callable
+from typing import Callable, Optional
 
-from ..pyfront.front import Code, IWrap, Span, SpanField
+from .code import Code, IWrap, Span, SpanField
 from ..pyfront.transform import Transform
 
 
@@ -38,9 +38,6 @@ class IUniqueName:
     name: str
     originalName: str
 
-    # def __hash__(self):
-    #     return hash(self.name)
-
 
 @dataclass
 class IOtherwiseEdge:
@@ -153,12 +150,13 @@ class Pause(Error):
         super().__init__(id, code, reason)
 
 
-# Not in llparse node-js (yet) But I wanted to implement 
-# this into my version since I am making a very important 
+# Not in llparse node-js (yet) But I wanted to implement
+# this into my version since I am making a very important
 # http2 frame parser
 
 # SEE: https://github.com/nodejs/llparse-frontend/pull/1
 
+
 @dataclass
 class Int(Node):
     field: str
@@ -171,8 +169,6 @@ class Int(Node):
         return hash(self.id)
 
 
-
-
 @dataclass
 class ISeqEdge:
     node: IWrap[Node]
@@ -264,4 +260,3 @@ class TableLookup(Match):
         for e in self.privEdges:
             yield Slot(e.node, lambda value: setattr(e, "node", value))
         yield from super().buildSlots()
-

llparse-0.1.9/llparse/pyfront/peephole.py

@@ -0,0 +1,47 @@
+from .code import IWrap
+from ..pyfront.nodes import Empty, Node
+
+WrapNode = IWrap[Node]
+WrapList = list[WrapNode]
+
+
+# TODO (Vizonex) Make peephole into 2 seperate functions instead of a class to
+# Optimize everything down further...
+class Peephole:
+    def optimize(self, root: WrapNode, nodes: WrapList) -> WrapNode:
+        changed = set(nodes)
+
+        while changed:
+            previous = changed.copy()
+            changed.clear()
+
+            for node in previous:
+                # Combined 2 functions from node-js llparse to
+                # just needing 1 this refactoring change allows for more speed. and less costly calls..
+                altered = False
+
+                for slot in node.ref.getSlots():
+                    if (
+                        not isinstance(slot.node.ref, Empty)
+                        or not slot.node.ref.otherwise
+                    ):
+                        continue
+
+                    otherwise = slot.node.ref.otherwise
+
+                    # Node skips so we cannot optimize
+                    if not otherwise.noAdvance:
+                        continue
+
+                    slot.node.ref = otherwise.node.ref
+                    altered = True
+
+                if altered:
+                    changed.add(node)
+
+        while isinstance(root.ref, Empty):
+            if not root.ref.otherwise or not root.ref.otherwise.noAdvance:
+                break
+            root = root.ref.otherwise.node
+
+        return root

{llparse-0.1.8 → llparse-0.1.9}/llparse/spanalloc.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from dataclasses import dataclass, field
 from typing import Union
 
@@ -8,7 +7,7 @@ from .pybuilder.main_code import Node, Reachability, Span, SpanEnd, SpanStart
 SpanSet = set[Span]
 
 
-def _id(node: Union[SpanStart, SpanEnd]):
+def _id(node: Union[SpanStart, SpanEnd]) -> Span: 
     return node.span
 
 
@@ -29,6 +28,12 @@ class ISpanAllocatorResult:
 
 
 class SpanAllocator:
+    __slots__ = (
+        "_mx",
+        "_colors",
+        "_overlapMap"
+    )
+
     def __init__(self) -> None:
         return
 
@@ -70,8 +75,8 @@ class SpanAllocator:
                     if span not in spans:
                         raise Error(f'unmatched span end for "{span.callback.name}"')
 
-    def computeActive(self, nodes: list[Node]):
-        activeMap: dict[Node, SpanSet] = dict()
+    def computeActive(self, nodes: list[Node]) -> ISpanActiveInfo:
+        activeMap: dict[Node, SpanSet] = {}
         for node in nodes:
             activeMap[node] = set()
 
@@ -110,18 +115,18 @@ class SpanAllocator:
 
         return ISpanActiveInfo(active=activeMap, spans=list(spans))
 
-    def computeOverlap(self, info: ISpanActiveInfo):
+    def computeOverlap(self, info: ISpanActiveInfo) -> dict[Span, set[Span]]:
         active = info.active
 
         overlap: dict[Span, set[Span]] = {span: set() for span in info.spans}
-        for _, spans in active.items():
+        for spans in active.values():
             for one in spans:
                 for other in spans:
                     if other != one:
                         overlap[one].add(other)
         return overlap
 
-    def _allocate(self, span: Span):
+    def _allocate(self, span: Span) -> int:
         if span in self._colors:
             return self._colors[span]
 
@@ -139,7 +144,7 @@ class SpanAllocator:
         self._colors[span] = i
         return i
 
-    def color(self, spans: list[Span], overlapDict: SpanOverlap):
+    def color(self, spans: list[Span], overlapDict: SpanOverlap) -> ISpanAllocatorResult:
         # Used _max instead of max because max() is an api called function needed in a bit...
         self._mx = -1
         self._colors: dict[Span, int] = {}
@@ -148,10 +153,10 @@ class SpanAllocator:
 
         colors = {span: self._allocate(span) for span in spans}
 
-        concurrency = list()
-        for _ in range(self._mx + 1):
-            # NOTE : concurrency[i] = [] doesn't work but this does :P
-            concurrency.append([])
+        concurrency:list[list[Span]] = [[] for _ in range(self._mx + 1)]
+        # for _ in range(self._mx + 1):
+        #     # NOTE : concurrency[i] = [] doesn't work but this does :P
+        #     concurrency.append([])
 
         for s in sorted(spans, key=lambda s: s.callback.name):
             concurrency[self._allocate(s)].append(s)

{llparse-0.1.8 → llparse-0.1.9}/llparse/trie.py

@@ -74,11 +74,10 @@ class Trie:
         first = edges[0].key
         last = edges[-1].key
         # print("level", edges, first)
-        if len(edges) == 1 and (len(edges[0].key) == 0):
+        if len(edges) == 1 and (not len(edges[0].key)):
             return TrieEmpty(edges[0].node, edges[0].value)
 
         i = 0
-        # print(first)
         for i in range(len(first)):
             if first[i] != last[i]:
                 break
@@ -91,20 +90,22 @@ class Trie:
 
         return self.single(edges, path)
 
-    def Slice(self, edges: list[IEdge], off: int):
+    def slice(self, edges: list[IEdge], off: int):
         _slice = [
             IEdge(edge.key[off:], edge.node, edge.noAdvance, edge.value)
             for edge in edges
         ]
         return sorted(_slice, key=lambda k: k.key)
 
-    def sequence(self, edges: list[IEdge], prefix: bytes, path: list[bytes]):
-        sliced = self.Slice(edges, len(prefix))
+    def sequence(
+        self, edges: list[IEdge], prefix: bytes, path: list[bytes]
+    ) -> TrieSequence:
+        sliced = self.slice(edges, len(prefix))
         assert not any([edge.noAdvance for edge in edges])
         child = self.level(sliced, path + [prefix])
         return TrieSequence(prefix, child)
 
-    def single(self, edges: list[IEdge], path: list[bytes]):
+    def single(self, edges: list[IEdge], path: list[bytes]) -> TrieSingle:
         if not len(edges[0].key):
             assert not path, f'Empty root entry at "{self.name}"'
             assert not (len(edges) == 1 or len(edges[1].key) != 0), (
@@ -112,7 +113,7 @@ class Trie:
                 + (b", ".join(path).decode("utf-8"))
                 + "]"
             )
-        
+
         keys: dict[int, list[IEdge]] = {}
         otherwise = None
         for edge in edges:
@@ -132,7 +133,7 @@ class Trie:
         for key, subEdges in keys.items():
             # TODO LOG FUNCTION's ARGUMENTS TO DETERMINE WEATHER OR NOT IT'S the Problem...
             # I think this maybe the problem now that I think about it...
-            sliced = self.Slice(subEdges, 1)
+            sliced = self.slice(subEdges, 1)
 
             subPath = path + [chr(key).encode("utf-8")]
 
@@ -146,7 +147,7 @@ class Trie:
                     + "]"
                 )
                 raise TypeError(err)
-    
+
             children.append(
                 ITrieSingleChild(key, noAdvance, self.level(sliced, subPath))
             )

{llparse-0.1.8 → llparse-0.1.9}/llparse.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llparse
-Version: 0.1.8
+Version: 0.1.9
 Summary: A Parody of llparse written for writing C Parsers with Python
 Author-email: Vizonex <VizonexBusiness@gmail.com>
 Requires-Python: >=3.9

{llparse-0.1.8 → llparse-0.1.9}/llparse.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ llparse/header.py
 llparse/llparse.py
 llparse/settings.py
 llparse/spanalloc.py
-llparse/test.py
 llparse/trie.py
 llparse.egg-info/PKG-INFO
 llparse.egg-info/SOURCES.txt
@@ -26,8 +25,8 @@ llparse/pybuilder/builder.py
 llparse/pybuilder/loopchecker.py
 llparse/pybuilder/main_code.py
 llparse/pybuilder/parsemap.py
-llparse/pyfront/containers.py
-llparse/pyfront/front.py
+llparse/pyfront/__init__.py
+llparse/pyfront/code.py
 llparse/pyfront/implementation.py
 llparse/pyfront/namespace.py
 llparse/pyfront/nodes.py

{llparse-0.1.8 → llparse-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llparse"
-version = "0.1.8"
+version = "0.1.9"
 description = "A Parody of llparse written for writing C Parsers with Python"
 readme = "README.md"
 authors = [

llparse-0.1.8/llparse/pybuilder/__init__.py

@@ -1,8 +0,0 @@
-from ..pybuilder.builder import *
-from ..pybuilder.loopchecker import *
-from ..pybuilder.main_code import (
-# I'll add more soon I feel a little lazy at the moment.
-    Node,
-    Match,
-    Int
-)

llparse-0.1.8/llparse/pyfront/containers.py

@@ -1,33 +0,0 @@
-from typing import Generic, TypeVar
-
-from implementation import IImplementation
-from pyfront.front import IWrap, T
-
-R = TypeVar("R")
-
-
-class ContainerWrap(Generic[T]):
-    def __init__(self, ref: T) -> None:
-        self.ref = ref
-        self.map: dict[str, IWrap[T]] = {}
-
-    def get(self, R: type[R], key: str) -> IWrap[R]:
-        """Changes and Alters the refrence to the orginal object..."""
-
-        # UnPack Object to Do Conversion From Since We aren't Using Typescript...
-        return IWrap(R(**self.map.get[key].__dict__))
-
-
-# TODO Vizonex Figure out how containers
-# should be implemented in python Spcae...
-# Since Interfaces and other thinsg in it
-# are tricky to just simply determine
-class Container:
-    def __init__(self) -> None:
-        self.map: dict[str, IImplementation] = {}
-
-    def build(self):
-        return IImplementation()
-
-    def buildCode(self):
-        return

llparse-0.1.8/llparse/pyfront/namespace.py

@@ -1,3 +0,0 @@
-from ..pyfront import front as code
-from ..pyfront import nodes as node
-from ..pyfront import transform as transform

llparse-0.1.8/llparse/pyfront/peephole.py

@@ -1,45 +0,0 @@
-from ..pyfront.front import IWrap
-from ..pyfront.nodes import Empty, Node
-
-WrapNode = IWrap[Node]
-WrapList = list[WrapNode]
-
-
-# TODO (Vizonex) Make peephole into 2 seperate functions instead of a class to
-# Optimize everything down further...
-class Peephole:
-    def optimize(self, root: WrapNode, nodes: WrapList):
-        changed = set(nodes)
-
-        while changed:
-            previous = changed
-            changed = set()
-
-            for node in previous:
-                if self.optimizeNode(node):
-                    changed.add(node)
-
-        while isinstance(root.ref, Empty):
-            if not root.ref.otherwise or not root.ref.otherwise.noAdvance:
-                break
-            root = root.ref.otherwise.node
-
-        return root
-
-    def optimizeNode(self, node: WrapNode):
-        changed = False
-        for slot in node.ref.getSlots():
-            # TODO Find an Actual way to check that a Node maybe empty...
-            if not isinstance(slot.node.ref, Empty) or not slot.node.ref.otherwise:
-                continue
-
-            otherwise = slot.node.ref.otherwise
-
-            # Node skips so we cannot optimize
-            if not otherwise.noAdvance:
-                continue
-
-            slot.node.ref = otherwise.node.ref
-
-            changed = True
-        return changed

llparse-0.1.8/llparse/test.py

@@ -1,233 +0,0 @@
-from .C_compiler import Compilation, ICompilerOptions
-from .frontend import Frontend
-from .llparse import LLParse
-from .pybuilder import Builder
-
-# TODO: Remove and make pytest for it.
-
-
-def smaller_test():
-    # from compilator import Compilation, ICompilerOptions
-    p = Builder()
-    simple = p.node("simple")
-    complete = p.invoke(
-        p.code.match("On_Complete"), {0: simple}, p.error(1, "On_Complete FAILED!")
-    )
-
-    simple.peek("\n", complete).skipTo(simple)
-
-    front = Frontend("http_parser")
-    f = front.compile(simple, properties=p.properties)
-    comp = Compilation(
-        "http_parser", f.properties, f.resumptionTargets, ICompilerOptions(None, None)
-    )
-    # for r in comp.resumptionTargets:
-    #     print(r)
-    out = []
-    root = comp.unwrapNode(f.root)
-    root.build(comp)
-    comp.reserveSpans(f.spans)
-    comp.buildGlobals(out)
-    comp.buildResumptionStates(out)
-    print(comp.stateDict)
-    # print("\n".join(out))
-
-
-def test1():
-    # I will be using indutny's mini http parser to demonstrate as it's
-    # medium sized and uses all major tricks , bells and whistles...
-
-    p = Builder()
-    method = p.node("method")
-    beforeUrl = p.node("before_url")
-    urlSpan = p.span(p.code.span("on_url"))
-    url = p.node("url")
-    http = p.node("http")
-
-    # print(sliced)(method)
-
-    # // Add custom uint8_t property to the state
-    p.property("i8", "method")
-
-    # Store method inside a custom property
-    onMethod = p.invoke(p.code.store("method"), beforeUrl)
-
-    # Invoke custom C function
-    complete = p.invoke(
-        p.code.match("on_complete"),
-        {
-            #  Restart
-            0: method
-        },
-        p.error(4, "`on_complete` error"),
-    )
-
-    method.select(
-        {
-            "HEAD": 0,
-            "GET": 1,
-            "POST": 2,
-            "PUT": 3,
-            "DELETE": 4,
-            "OPTIONS": 5,
-            "CONNECT": 6,
-            "TRACE": 7,
-            "PATCH": 8,
-        },
-        onMethod,
-    ).otherwise(p.error(5, "Expected method"))
-
-    beforeUrl.match(" ", beforeUrl).otherwise(urlSpan.start(url))
-
-    url.peek(" ", urlSpan.end(http)).skipTo(url)
-
-    http.match(" HTTP/1.1\r\n\r\n", complete).otherwise(
-        p.error(6, "Expected HTTP/1.1 and two newlines")
-    )
-
-    front = Frontend("http_parser")
-    f = front.compile(
-        method,
-        properties=p.properties,
-    )
-    # r = f.root.ref.id.name
-    # NOTE Check that root was addded , this can be a problem laster down the line if it isn't a resumption target...
-    assert f.root in f.resumptionTargets
-    comp = Compilation(
-        "http_parser", p.properties(), f.resumptionTargets, ICompilerOptions()
-    )
-    root = comp.unwrapNode(f.root)
-    root.build(comp)
-
-    assert "s_n_http_parser__n_method" in comp.resumptionTargets
-    out = []
-    comp.reserveSpans(f.spans)
-    comp.buildGlobals(out)
-    out.append("")
-    out.append("/*--RESUMPTION STATES--*/")
-    comp.buildResumptionStates(out)
-    out.append("/*--INTERNAL STATES--*/")
-    comp.buildInternalStates(out)
-    # for k , v in comp.stateDict.items():
-    #     print(k)
-    print("\n".join(out))
-
-
-def test2():
-    from llparse import LLParse
-
-    p = LLParse("http_parser")
-    method = p.node("method")
-    beforeUrl = p.node("before_url")
-    urlSpan = p.span(p.code.span("on_url"))
-    url = p.node("url")
-    http = p.node("http")
-
-    # Add custom uint8_t property to the state
-    p.property("i8", "method")
-
-    # Store method inside a custom property
-    onMethod = p.invoke(p.code.store("method"), beforeUrl)
-
-    # Invoke custom C function
-    complete = p.invoke(
-        p.code.match("on_complete"),
-        {
-            #  Restart
-            0: method
-        },
-        p.error(4, "`on_complete` error"),
-    )
-
-    method.select(
-        {
-            "HEAD": 0,
-            "GET": 1,
-            "POST": 2,
-            "PUT": 3,
-            "DELETE": 4,
-            "OPTIONS": 5,
-            "CONNECT": 6,
-            "TRACE": 7,
-            "PATCH": 8,
-        },
-        onMethod,
-    ).otherwise(p.error(5, "Expected method"))
-
-    beforeUrl.match(" ", beforeUrl).otherwise(urlSpan.start(url))
-
-    url.peek(" ", urlSpan.end(http)).skipTo(url)
-
-    http.match(" HTTP/1.1\r\n\r\n", complete).otherwise(
-        p.error(6, "Expected HTTP/1.1 and two newlines")
-    )
-
-    c = p.build(method)
-    print(c.c)
-    open("http_parser.c", "w").write(c.c)
-    open("http_parser.h", "w").write(c.header)
-    # # sp_alloc = SpanAllocator().allocate(method)
-
-    # TODO Validate Moving parts as they should be compiled correctly...
-
-
-def test3():
-    """Moving Part Validations..."""
-    # A~Sample~Of~Dual Spans...
-    p = LLParse("dual_spans")
-
-    span_a = p.span(p.code.span("on_a"))
-    span_b = p.span(p.code.span("on_b"))
-
-    a = p.node("a_node")
-    b = p.node("b_node")
-
-    start = p.node("start")
-    start.otherwise(span_a.start(a))
-
-    a.peek("~", span_a.end().skipTo(span_b.start(b))).skipTo(a)
-    b.peek("~", span_b.end().skipTo(span_a.start(a))).skipTo(b)
-
-    compiled = p.build(start)
-    print(compiled.c)
-
-
-def test4():
-    """Same Dual Spans but with flags..."""
-    # A~Sample~Of~Dual Spans...
-
-    p = LLParse("dual_spans")
-
-    # Flag
-    p.property("i8", "flag")
-
-    span_a = p.span(p.code.span("on_a"))
-    span_b = p.span(p.code.span("on_b"))
-
-    a = p.node("a_node")
-    b = p.node("b_node")
-
-    # Invoke Updates to Flag
-    # 1 is a , 2 is b
-
-    update_a = p.invoke(p.code.update("flag", 1), span_a.start(a))
-    update_b = p.invoke(p.code.update("flag", 2), span_b.start(b))
-    start = p.node("start")
-    start.otherwise(update_a)
-
-    a.peek("~", span_a.end().skipTo(update_a)).skipTo(a)
-    b.peek("~", span_b.end().skipTo(update_b)).skipTo(b)
-
-    compiled = p.build(start)
-    print(compiled.c)
-
-
-# TODO  Try to Throw more complicated and advanced things at pyllparse to try and solve
-# This will make the code sturdier and more mature as time goes on
-# Make a Test Bag on github for all of these tests to go into incase a single file gets too big
-
-# I encourage anyone to find valid compiled llparse sequences and then translate them over to
-# python to testrun , I will try to make a validator tool whenever I can get to it - Vizonex
-
-if __name__ == "__main__":
-    test2()