Skip to content

Fix errors on the Comp constructor taking the entire class as pos #76

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
Speedphoenix wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

Fix errors on the Comp constructor taking the entire class as pos #76

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
7 changes: 5 additions & 2 deletions domkit/MetaComponent.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class MetaComponent extends Component<Dynamic,Dynamic> {
var parser : CssValue.ValueParser;
var classType : ClassType;
var baseClass : ClassType;
var constructorPos : Position;
var constructorPath : Array<String>;
var constructorArgs : Array<{ type : ComplexType, name : String, opt : Bool }>;
var parserDependencies : Map<String, Field> = new Map();
Expand All @@ -40,6 +41,7 @@ class MetaComponent extends Component<Dynamic,Dynamic> {
}
typePath = makeTypePath(classType).join(".");

constructorPos = classType.pos;
var c = classType;
var name = getCompName(c);
if( name == null ) throw "assert";
Expand Down Expand Up @@ -130,6 +132,7 @@ class MetaComponent extends Component<Dynamic,Dynamic> {
}

if( f == null ) return;
constructorPos = f.pos;

switch( f.kind ) {
case FFun(f):
Expand Down Expand Up @@ -611,7 +614,7 @@ class MetaComponent extends Component<Dynamic,Dynamic> {
var newExpr;
var cargs = getConstructorArgs();
if( cargs != null ) {
newExpr = haxe.macro.MacroStringTools.toFieldExpr(constructorPath, classType.pos);
newExpr = haxe.macro.MacroStringTools.toFieldExpr(constructorPath, constructorPos);
if( cargs.length == 0 )
newExpr = macro function(_,parent) return ($newExpr)(parent);
else {
Expand All @@ -621,7 +624,7 @@ class MetaComponent extends Component<Dynamic,Dynamic> {
eargs.push(macro parent);
newExpr = macro function(args,parent) return ($newExpr)($a{eargs});
}
setPosRec(newExpr, classType.pos);
setPosRec(newExpr, constructorPos);
} else
newExpr = macro function(args,parent) throw $v{cname+" cannot be constructed"};

Expand Down