Skip to content

[CHORE] Merge the PolymodEnumDeclEx into EnumDecl. #378

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
Open

[CHORE] Merge the PolymodEnumDeclEx into EnumDecl. #378

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 @@ -303,6 +303,7 @@ typedef EnumDecl =
{
> ModuleType,
var fields:Array<EnumFieldDecl>;
@:optional var pkg:Array<String>;
}

typedef EnumFieldDecl =
Expand Down
4 changes: 2 additions & 2 deletions polymod/hscript/_internal/PolymodEnum.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ class PolymodEnum
{
private static final scriptInterp = new PolymodInterpEx(null, null);

private var _e:PolymodEnumDeclEx;
private var _e:EnumDecl;

private var _value:String;

private var _args:Array<Dynamic>;

public function new(e:PolymodEnumDeclEx, value:String, args:Array<Dynamic>)
public function new(e:EnumDecl, value:String, args:Array<Dynamic>)
{
this._e = e;

Expand Down
10 changes: 0 additions & 10 deletions polymod/hscript/_internal/PolymodEnumDeclEx.hx
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions polymod/hscript/_internal/PolymodInterpEx.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ class PolymodInterpEx extends Interp
return _scriptClassDescriptors.get(name);
}

private static var _scriptEnumDescriptors:Map<String, PolymodEnumDeclEx> = new Map<String, PolymodEnumDeclEx>();
private static var _scriptEnumDescriptors:Map<String, EnumDecl> = new Map<String, EnumDecl>();

private static function registerScriptEnum(e:PolymodEnumDeclEx)
private static function registerScriptEnum(e:EnumDecl)
{
var name = e.name;
if (e.pkg != null)
Expand Down Expand Up @@ -2372,7 +2372,7 @@ class PolymodInterpEx extends Interp
});
}

var enumDecl:PolymodEnumDeclEx =
var enumDecl:EnumDecl =
{
pkg: pkg,
name: e.name,
Expand Down