Skip to content

[ENHANCEMENT] Add extensions and optional fields parsing for typedefs. #289

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

Open
Starexify wants to merge 1 commit into
base: experimental
Choose a base branch
from
+30 −1
Open

[ENHANCEMENT] Add extensions and optional fields parsing for typedefs. #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions polymod/hscript/_internal/Expr.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ typedef EnumArgDecl =
typedef TypeDecl =
{
> ModuleType,
var extensions:Array<CType>;
var t:CType;
}

Expand Down
30 changes: 29 additions & 1 deletion polymod/hscript/_internal/Parser.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,16 +1184,31 @@ class Parser
{
case TBrClose: break;
case TId("var"), TId("final"):
var isOpt = maybe(TQuestion);
var name = getIdent();
ensure(TDoubleDot);
var type = parseType();
if (isOpt) type = CTOpt(type);
if (t.match(TId("final")))
{
if (meta == null) meta = [];
meta.push({name: ":final", params: []});
}
fields.push({name: name, t: parseType(), meta: meta});
fields.push({name: name, t: type, meta: meta});
meta = null;
ensure(TSemicolon);
case TQuestion:
var name = getIdent();
ensure(TDoubleDot);
fields.push({name: name, t: CTOpt(parseType()), meta: meta});
meta = null;
t = token();
switch (t)
{
case TComma:
case TBrClose: break;
default: unexpected(t);
}
case TId(name):
ensure(TDoubleDot);
fields.push({name: name, t: parseType(), meta: meta});
Expand Down Expand Up @@ -1432,13 +1447,26 @@ class Parser
var name = getIdent();
var params = parseParams();
ensureToken(TOp("="));

var extensions = [];
if (maybe(TBrOpen))
{
while (maybe(TOp(">")))
{
extensions.push(parseType());
maybe(TComma);
}
push(TBrOpen);
}

var t = parseType();
return DTypedef(
{
name: name,
meta: meta,
params: params,
isPrivate: isPrivate,
extensions: extensions,
t: t,
});
case "enum":
Expand Down