fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-07-06 01:52:04 +00:00
Code Issues Projects Releases Wiki Activity

Add initial std Symbol; Fix some type inference issues

Browse Source
This commit is contained in:
dcodeIO
2018-06-21 19:42:18 +02:00
parent 1626e50b0f
commit c74eed2bd8
15 changed files with 4257 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/compiler.ts
View File

@ -520,10 +520,9 @@ export class Compiler extends DiagnosticEmitter {
// infer from initializer if not annotated
} else if (declaration.initializer) { // infer type using void/NONE for literal inference
initExpr = this.compileExpression( // reports
initExpr = this.compileExpressionRetainType( // reports
declaration.initializer,
Type.void,
ConversionKind.NONE,
WrapMode.WRAP
);
if (this.currentType == Type.void) {
@ -1964,10 +1963,9 @@ export class Compiler extends DiagnosticEmitter {
);
}
} else if (declaration.initializer) { // infer type using void/NONE for proper literal inference
initExpr = this.compileExpression( // reports
initExpr = this.compileExpressionRetainType( // reports
declaration.initializer,
Type.void,
ConversionKind.NONE,
WrapMode.NONE
);
if (this.currentType == Type.void) {
@ -4577,6 +4575,7 @@ export class Compiler extends DiagnosticEmitter {
}
// compile the value and do the assignment
assert(targetType != Type.void);
var valueExpr = this.compileExpression(valueExpression, targetType, ConversionKind.IMPLICIT, WrapMode.NONE);
return this.compileAssignmentWithValue(
expression,
@ -4597,6 +4596,7 @@ export class Compiler extends DiagnosticEmitter {
switch (target.kind) {
case ElementKind.LOCAL: {
let type = (<Local>target).type;
assert(type != Type.void);
this.currentType = tee ? type : Type.void;
if ((<Local>target).is(CommonFlags.CONST)) {
this.error(
@ -6304,11 +6304,25 @@ export class Compiler extends DiagnosticEmitter {
return this.module.createUnreachable();
}
var classPrototype = <ClassPrototype>target;
var classInstance = classPrototype.resolveUsingTypeArguments( // reports
expression.typeArguments,
currentFunction.flow.contextualTypeArguments,
expression
);
var classInstance: Class | null = null;
var typeArguments = expression.typeArguments;
var classReference: Class | null;
if (
!typeArguments &&
(classReference = contextualType.classReference) !== null &&
classReference.is(CommonFlags.GENERIC)
) {
classInstance = classPrototype.resolve(
classReference.typeArguments,
currentFunction.flow.contextualTypeArguments
);
} else {
classInstance = classPrototype.resolveUsingTypeArguments( // reports
typeArguments,
currentFunction.flow.contextualTypeArguments,
expression
);
}
if (!classInstance) return module.createUnreachable();
var expr: ExpressionRef;
@ -7020,9 +7034,7 @@ export class Compiler extends DiagnosticEmitter {
: contextualType.is(TypeFlags.FLOAT)
? Type.i64
: contextualType,
contextualType == Type.void
? ConversionKind.NONE
: ConversionKind.IMPLICIT,
ConversionKind.NONE,
WrapMode.NONE
);
@ -7041,6 +7053,13 @@ export class Compiler extends DiagnosticEmitter {
expression.range
);
return module.createUnreachable();
} else {
expr = this.convertExpression(
expr,
this.currentType, this.currentType.intType,
ConversionKind.IMPLICIT, WrapMode.NONE,
expression.operand
);
}
switch (this.currentType.kind) {