Skip to content

fixes for last compile errors #518

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
Perryvw merged 1 commit into from
Apr 11, 2019
Merged

fixes for last compile errors #518

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
32 changes: 20 additions & 12 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ export class LuaTransformer {

if (statement.exportClause) {
if (statement.exportClause.elements.some(e =>
(e.name && e.name.originalKeywordKind === ts.SyntaxKind.DefaultKeyword)
|| (e.propertyName && e.propertyName.originalKeywordKind === ts.SyntaxKind.DefaultKeyword))
(e.name !== undefined && e.name.originalKeywordKind === ts.SyntaxKind.DefaultKeyword)
|| (e.propertyName !== undefined
&& e.propertyName.originalKeywordKind === ts.SyntaxKind.DefaultKeyword))
) {
throw TSTLErrors.UnsupportedDefaultExport(statement);
}
Expand Down Expand Up @@ -4790,17 +4791,20 @@ export class LuaTransformer {
}

for (const [functionSymbolId, functionDefinition] of scope.functionDefinitions) {
if (functionDefinition.definition === undefined) {
// TODO
throw new Error("Expected functionDefinition.definition to be set, but it isn't.");
}
const { line, column } = tstl.getOriginalPos(functionDefinition.definition);
const definitionPos = ts.getPositionOfLineAndCharacter(
this.currentSourceFile,
line,
column);
if (functionSymbolId !== symbolId // Don't recurse into self
&& declaration.pos < definitionPos // Ignore functions before symbol declaration
&& functionDefinition.referencedSymbols.has(symbolId)
&& this.shouldHoist(functionSymbolId, scope))
{
return true;
if (line !== undefined && column !== undefined) {
const definitionPos = ts.getPositionOfLineAndCharacter(this.currentSourceFile, line, column);
if (functionSymbolId !== symbolId // Don't recurse into self
&& declaration.pos < definitionPos // Ignore functions before symbol declaration
&& functionDefinition.referencedSymbols.has(symbolId)
&& this.shouldHoist(functionSymbolId, scope))
{
return true;
}
}
}
}
Expand Down Expand Up @@ -4833,6 +4837,10 @@ export class LuaTransformer {
const hoistedFunctions: Array<tstl.VariableDeclarationStatement | tstl.AssignmentStatement> = [];
for (const [functionSymbolId, functionDefinition] of scope.functionDefinitions) {
if (this.shouldHoist(functionSymbolId, scope)) {
if (functionDefinition.definition === undefined) {
// TODO
throw new Error("Expected functionDefinition.definition to be set, but it isn't.");
}
const i = result.indexOf(functionDefinition.definition);
result.splice(i, 1);
hoistedFunctions.push(functionDefinition.definition);
Expand Down