added name wrapper

This commit is contained in:
ari committed 2020-10-17 21:48:34 -04:00
1 parent 01ace1c57d
commit 71a37477ae
4 files changed
+35 -34

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@ from pdfmajor.lexer.exceptions import (
)
from pdfmajor.streambuffer import BufferStream
from pdfmajor.lexer.token import TokenName
from pdfmajor.lexer.token import PDFName, TokenName
from pdfmajor.lexer.regex import HEX, END_LITERAL
@@ -62,6 +62,6 @@ def parse_name(buffer: BufferStream) -> TokenName:
return TokenName(
initialpos,
buffer.tell(),
state.curtoken.decode(),
PDFName(state.curtoken.decode()),
)
raise LexerEOF
+6 -2
View File
@@ -1,5 +1,5 @@
from enum import Enum
from typing import Any, Generic, TypeVar, Union
from typing import Any, Generic, NamedTuple, TypeVar, Union
from decimal import Decimal
T = TypeVar("T")
@@ -53,7 +53,11 @@ class TokenKeyword(Token[bytes]):
pass
class TokenName(Token[str]):
class PDFName(NamedTuple):
value: str
class TokenName(Token[PDFName]):
"""Token representing literal name tokens
Detection of this type of token can be found in PDF 1.7 spec section 7.3.5
"""
+6 -10
View File
@@ -2,31 +2,25 @@
from pdfmajor.execptions import ParserError
from pdfmajor.lexer.token import TokenName, TokenPrimitive
from pdfmajor.lexer.token import PDFName, TokenName, TokenPrimitive
from typing import Dict, Generic, List, NamedTuple, Optional, TypeVar, Union
TToken = TypeVar("TToken", bound=TokenPrimitive)
class PDFName(NamedTuple):
value: str
class PDFPrimivite(Generic[TToken]):
def __init__(self, token: TToken) -> None:
self.token: TToken = token
@property
def value(self):
if isinstance(self.token, TokenName):
return PDFName(self.token.value)
return self.token.value
class PDFDictionary(Dict[PDFPrimivite[TokenName], "PDFObject"]):
class PDFDictionary(Dict[PDFName, "PDFObject"]):
def __init__(self, strict: bool = False) -> None:
super().__init__()
self.name: Optional[str] = None
self.name: Optional[PDFName] = None
self.strict = strict
def pass_item(self, item: "PDFObject"):
@@ -51,7 +45,9 @@ class PDFArray(List["PDFObject"]):
class PDFStream(object):
pass
@property
def value(self):
return self
PDFComplexType = Union[PDFDictionary, PDFArray, PDFStream]