Skip to content

Merge branch 'master' into ts-to-lua-ast #329

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

Merged
tomblind merged 4 commits into from
Jan 9, 2019
Merged

Merge branch 'master' into ts-to-lua-ast #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92de529
fixed compiler crash when unable to determine signature of function… …
tomblind Jan 6, 2019
7909433
Validation crash fix (#326)
tomblind Jan 9, 2019
91b02ce
changed static methods and lambda-properties to take a context parame…
tomblind Jan 9, 2019
bbe47bf
Merge remote-tracking branch 'origin/master' into ts-to-lua-ast-merge…
tomblind Jan 9, 2019
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
24 changes: 17 additions & 7 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2427,13 +2427,23 @@ export class LuaTransformer {
}
}

const fromTypeReference = fromType as ts.TypeReference;
const toTypeReference = toType as ts.TypeReference;
if (fromTypeReference.typeArguments && toTypeReference.typeArguments) {
// Recurse into tuples/arrays
toTypeReference.typeArguments.forEach((t, i) => {
this.validateFunctionAssignment(node, fromTypeReference.typeArguments[i], t, toName);
});
const fromTypeNode = this.checker.typeToTypeNode(fromType);
const toTypeNode = this.checker.typeToTypeNode(toType);

if ((ts.isArrayTypeNode(toTypeNode) || ts.isTupleTypeNode(toTypeNode))
&& (ts.isArrayTypeNode(fromTypeNode) || ts.isTupleTypeNode(fromTypeNode))) {
// Recurse into arrays/tuples
const fromTypeReference = fromType as ts.TypeReference;
const toTypeReference = toType as ts.TypeReference;
const count = Math.min(fromTypeReference.typeArguments.length, toTypeReference.typeArguments.length);
for (let i = 0; i < count; ++i) {
this.validateFunctionAssignment(
node,
fromTypeReference.typeArguments[i],
toTypeReference.typeArguments[i],
toName
);
}
}

if ((toType.flags & ts.TypeFlags.Object) !== 0 && ((toType as ts.ObjectType).objectFlags & ts.ObjectFlags.ClassOrInterface) !== 0 &&
Expand Down
17 changes: 9 additions & 8 deletions src/TSHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,9 @@ export class TSHelper {
if (i >= 0) {
const parentSignature = checker.getResolvedSignature(signatureDeclaration.parent);
const parentSignatureDeclaration = parentSignature.getDeclaration();
declType = checker.getTypeAtLocation(parentSignatureDeclaration.parameters[i]);
if (parentSignatureDeclaration) {
declType = checker.getTypeAtLocation(parentSignatureDeclaration.parameters[i]);
}
}
} else if (ts.isReturnStatement(signatureDeclaration.parent)) {
declType = this.getContainingFunctionReturnType(signatureDeclaration.parent, checker);
Expand All @@ -409,15 +411,14 @@ export class TSHelper {
// Explicit 'this'
return thisParameter.type && thisParameter.type.kind === ts.SyntaxKind.VoidKeyword ? ContextType.Void : ContextType.NonVoid;
}
if ((ts.isMethodDeclaration(signatureDeclaration) || ts.isMethodSignature(signatureDeclaration)) &&
!(ts.getCombinedModifierFlags(signatureDeclaration) & ts.ModifierFlags.Static)) {
// Non-static method
if (ts.isMethodDeclaration(signatureDeclaration) || ts.isMethodSignature(signatureDeclaration)) {
// Method
return ContextType.NonVoid;
}
if ((ts.isPropertySignature(signatureDeclaration.parent) || ts.isPropertyDeclaration(signatureDeclaration.parent) ||
ts.isPropertyAssignment(signatureDeclaration.parent)) &&
!(ts.getCombinedModifierFlags(signatureDeclaration.parent) & ts.ModifierFlags.Static)) {
// Non-static lambda property
if (ts.isPropertySignature(signatureDeclaration.parent)
|| ts.isPropertyDeclaration(signatureDeclaration.parent)
|| ts.isPropertyAssignment(signatureDeclaration.parent)) {
// Lambda property
return ContextType.NonVoid;
}
if (ts.isBinaryExpression(signatureDeclaration.parent)) {
Expand Down
8 changes: 4 additions & 4 deletions test/translation/lua/namespaceMerge.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ end
end
function MergedClass.constructor(self)
end
function MergedClass.staticMethodA()
function MergedClass.staticMethodA(self)
end
function MergedClass.staticMethodB()
self.staticMethodA();
function MergedClass.staticMethodB(self)
self:staticMethodA();
end
function MergedClass.methodA(self)
end
Expand All @@ -29,5 +29,5 @@ end
local mergedClass = MergedClass.new(true);
mergedClass:methodB();
mergedClass:propertyFunc();
MergedClass.staticMethodB();
MergedClass:staticMethodB();
MergedClass.namespaceFunc();
Loading