Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for parsing async iterable<T> type #85

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Add support for parsing async iterable<T> type #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a066f3
Add support for parsing `async iterable<T>` type
lucacasonato Mar 25, 2024
402e876
fix
lucacasonato Mar 26, 2024
b3c8e3a
lint + test
lucacasonato Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion test-expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@ interface BigNumbers {
const bigint biiig = 42;
};

typedef async iterable<DOMString[]> asynciterables;
typedef async iterable<DOMString[]>? asynciterableses;
interface Concat {
Promise<DOMString> concat(async iterable<DOMString> iter);
};

<<<
IDL SYNTAX ERROR LINE: 3 - skipped: "serializer"

Expand Down Expand Up @@ -434,6 +440,11 @@ IDL SYNTAX ERROR LINE: 189 - skipped: "readonly setlike<DOMString>"
[Interface: [name: BigNumbers] [members:
[Member: [Const: [ConstType: [PrimitiveType: bigint]][name: biiig] = [value: 42]]]
]]
[Typedef: [TypeWithExtendedAttributes: [SingleType: [NonAnyType: [TypeWithExtendedAttributes: [SingleType: [NonAnyType: DOMString[TypeSuffix: [array] ]]]]]]] [name: asynciterables]]
[Typedef: [TypeWithExtendedAttributes: [SingleType: [NonAnyType: [TypeWithExtendedAttributes: [SingleType: [NonAnyType: DOMString[TypeSuffix: [array] ]]]][null]]]] [name: asynciterableses]]
[Interface: [name: Concat] [members:
[Member: [Operation: [Type: [SingleType: [NonAnyType: [Promise] [Type: [SingleType: [NonAnyType: DOMString]]]]]] [OperationRest: [name: [OperationName: concat]] [ArgumentList: [Argument: [type: async iterable<DOMString> ] [name: [ArgumentName: iter]]]]]]]
]]
]
MARKED UP:
<c dictionary><k>dictionary</k> <n>CSSFontFaceLoadEventInit</n> : <tn>EventInit</tn> { <c dict-member><t><k>sequence</k>&lt;<t><tn>CSSFontFaceRule</tn></t>&gt;</t> <n>fontfaces</n> = [ ];</c> };</c>
Expand Down Expand Up @@ -635,7 +646,13 @@ typedef short shorttype = error this is;</c>
<c const><k>const</k> <t><p><k>bigint</k></p></t> <n>biiig</n> = 42;</c>
};</c>

Complexity: 151
<c typedef><k>typedef</k> <t><k>async</k> <k>iterable</k>&lt;<t><s><k>DOMString</k></s>[]</t>&gt;</t> <n>asynciterables</n>;</c>
<c typedef><k>typedef</k> <t><k>async</k> <k>iterable</k>&lt;<t><s><k>DOMString</k></s>[]</t>&gt;?</t> <n>asynciterableses</n>;</c>
<c interface><k>interface</k> <n>Concat</n> {
<c method><t><k>Promise</k>&lt;<t><s><k>DOMString</k></s></t>&gt;</t> <n>concat</n>(<c argument><t><k>async</k> <k>iterable</k>&lt;<t><s><k>DOMString</k></s></t>&gt;</t> <n>iter</n></c>);</c>
};</c>

Complexity: 155
dictionary: CSSFontFaceLoadEventInit
dict-member: fontfaces (fontfaces)
interface: Simple
Expand Down Expand Up @@ -793,6 +810,10 @@ interface: Underscores
method: includes(value) (includes)
interface: BigNumbers
const: biiig (biiig)
typedef: asynciterables
typedef: asynciterableses
interface: Concat
method: concat(iter) (concat)
FIND:
callMe/round
Foo/method(x, y, inf, ...fooArg)/y
Expand Down
6 changes: 6 additions & 0 deletions test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,12 @@ def test_difference(input, output):
interface BigNumbers {
const bigint biiig = 42;
};

typedef async iterable<DOMString[]> asynciterables;
typedef async iterable<DOMString[]>? asynciterableses;
interface Concat {
Promise<DOMString> concat(async iterable<DOMString> iter);
};
"""
# idl = idl.replace(' ', ' ')
print("IDL >>>\n" + idl + "\n<<<")
Expand Down
29 changes: 28 additions & 1 deletion widlparser/productions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,8 @@ class NonAnyType(ComplexProduction):
Syntax:
PrimitiveType [TypeSuffix] | "ByteString" [TypeSuffix] | "DOMString" [TypeSuffix]
| "USVString" TypeSuffix | Identifier [TypeSuffix] | "sequence" "<" TypeWithExtendedAttributes ">" [Null]
| "object" [TypeSuffix] | "Error" TypeSuffix | "Promise" "<" Type ">" [Null] | BufferRelatedType [Null]
| "async" "iterable" "<" TypeWithExtendedAttributes ">" [Null] | "object" [TypeSuffix] | "Error" TypeSuffix
| "Promise" "<" Type ">" [Null] | BufferRelatedType [Null]
| "FrozenArray" "<" TypeWithExtendedAttributes ">" [Null] | "ObservableArray" "<" TypeWithExtendedAttributes ">" [Null]
| "record" "<" StringType "," TypeWithExtendedAttributes ">"
"""
Expand All @@ -945,6 +946,7 @@ class NonAnyType(ComplexProduction):
type: (PrimitiveType | TypeIdentifier | TypeWithExtendedAttributes | Type | Symbol)
type_name: (str | None)
sequence: (Symbol | None)
async_iterable: (tuple[Symbol, Symbol] | None)
promise: (Symbol | None)
record: (Symbol | None)
_open_type: (Symbol | None)
Expand All @@ -968,6 +970,13 @@ def peek(cls, tokens: Tokenizer) -> bool:
if (Symbol.peek(tokens, '>')):
Symbol.peek(tokens, '?')
return tokens.pop_position(True)
elif (token and token.is_symbol('async')):
if (Symbol.peek(tokens, 'iterable')):
if (Symbol.peek(tokens, '<')):
if (TypeWithExtendedAttributes.peek(tokens)):
if (Symbol.peek(tokens, '>')):
Symbol.peek(tokens, '?')
return tokens.pop_position(True)
elif (token and token.is_symbol('Promise')):
if (Symbol.peek(tokens, '<')):
if (Type.peek(tokens)):
Expand All @@ -990,6 +999,7 @@ def peek(cls, tokens: Tokenizer) -> bool:
def __init__(self, tokens: Tokenizer, parent: ComplexProduction) -> None:
super().__init__(tokens, parent)
self.sequence = None
self.async_iterable = None
self.promise = None
self.record = None
self._open_type = None
Expand All @@ -1013,6 +1023,12 @@ def __init__(self, tokens: Tokenizer, parent: ComplexProduction) -> None:
self.type = TypeWithExtendedAttributes(tokens, self)
self._close_type = Symbol(tokens, '>', False)
self.null = Symbol(tokens, '?', False) if (Symbol.peek(tokens, '?')) else None
elif (token.is_symbol('async')):
self.async_iterable = (Symbol(tokens), Symbol(tokens))
self._open_type = Symbol(tokens, '<')
self.type = TypeWithExtendedAttributes(tokens, self)
self._close_type = Symbol(tokens, '>', False)
self.null = Symbol(tokens, '?', False) if (Symbol.peek(tokens, '?')) else None
elif (token.is_symbol('Promise')):
self.promise = Symbol(tokens, 'Promise')
self._open_type = Symbol(tokens, '<')
Expand Down Expand Up @@ -1043,6 +1059,9 @@ def _str(self) -> str:
if (self.sequence):
output = str(self.sequence) + str(self._open_type) + str(self.type) + str(self._close_type)
return output + (str(self.null) if (self.null) else '')
if (self.async_iterable):
output = str(self.async_iterable[0]) + str(self.async_iterable[1]) + str(self._open_type) + str(self.type) + str(self._close_type)
return output + (str(self.null) if (self.null) else '')
if (self.promise):
output = str(self.promise) + str(self._open_type) + str(self.type) + str(self._close_type)
return output + (str(self.null) if (self.null) else '')
Expand All @@ -1062,6 +1081,14 @@ def _define_markup(self, generator: MarkupGenerator) -> Production:
generator.add_text(self._close_type)
generator.add_text(self.null)
return self
if (self.async_iterable):
self.async_iterable[0].define_markup(generator)
self.async_iterable[1].define_markup(generator)
generator.add_text(self._open_type)
generator.add_type(self.type)
generator.add_text(self._close_type)
generator.add_text(self.null)
return self
if (self.promise):
self.promise.define_markup(generator)
generator.add_text(self._open_type)
Expand Down