fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-05-13 07:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix an issue with asc not finding bundled library files in the browser; Minor cleanup

Browse Source
This commit is contained in:
dcodeIO 2018-03-21 23:27:53 +01:00
parent d4c46b036e
commit 00e6d613a9
12 changed files with 138 additions and 100 deletions

36
bin/asc.js

@ -251,6 +251,7 @@ exports.main = function main(argv, options, callback) {
for (let i = 0, k = libDirs.length; i < k; ++i) {
if (exports.libraryFiles.hasOwnProperty(sourcePath)) {
sourceText = exports.libraryFiles[sourcePath];
sourcePath += ".ts";
} else {
sourceText = readFile(path.join(
libDirs[i],
@ -266,32 +267,33 @@ exports.main = function main(argv, options, callback) {
// Otherwise try nextFile.ts, nextFile/index.ts, (lib)/nextFile.ts
} else {
sourceText = readFile(path.join(baseDir, sourcePath + ".ts"));
if (sourceText === null) {
if (sourceText !== null) {
sourcePath += ".ts";
} else {
sourceText = readFile(path.join(baseDir, sourcePath, "index.ts"));
if (sourceText === null) {
for (let i = 0, k = libDirs.length; i < k; ++i) {
const dir = libDirs[i];
const key = exports.libraryPrefix + sourcePath;
if (exports.libraryFiles.hasOwnProperty(key)) {
sourceText = exports.libraryFiles[key];
} else {
if (sourceText !== null) {
sourcePath += "/index.ts";
} else {
const key = exports.libraryPrefix + sourcePath;
if (exports.libraryFiles.hasOwnProperty(key)) {
sourceText = exports.libraryFiles[key];
sourcePath = key + ".ts";
} else {
for (let i = 0, k = libDirs.length; i < k; ++i) {
const dir = libDirs[i];
sourceText = readFile(path.join(dir, sourcePath + ".ts"));
if (sourceText !== null) {
sourcePath = exports.libraryPrefix + sourcePath + ".ts";
break;
}
}
if (sourceText === null) {
return callback(
Error("Import file '" + sourcePath + ".ts' not found.")
);
}
}
if (sourceText === null) {
return callback(
Error("Import file '" + sourcePath + ".ts' not found.")
);
}
} else {
sourcePath += "/index.ts";
}
} else {
sourcePath += ".ts";
}
}
stats.parseCount++;

2
dist/asc.js vendored

File diff suppressed because one or more lines are too long

2
dist/asc.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/assemblyscript.js vendored

File diff suppressed because one or more lines are too long

2
dist/assemblyscript.js.map vendored

File diff suppressed because one or more lines are too long

2
src/ast.ts

@ -109,7 +109,7 @@ export abstract class Node {
/** Common flags indicating specific traits. */
flags: CommonFlags = CommonFlags.NONE;
/** Tests if this node has a specific flag or flags. */
/** Tests if this node has the specified flag or flags. */
is(flag: CommonFlags): bool { return (this.flags & flag) == flag; }
/** Tests if this node has one of the specified flags. */
isAny(flag: CommonFlags): bool { return (this.flags & flag) != 0; }

30
src/builtins.ts

@ -192,7 +192,7 @@ export function compileCall(
compiler.compileExpressionRetainType(operands[0], Type.i32, false);
type = compiler.currentType;
compiler.currentType = Type.bool;
let classType = type.classType;
let classType = type.classReference;
if (classType) {
let stringPrototype = compiler.program.elementsLookup.get("String");
if (stringPrototype) {
@ -224,7 +224,7 @@ export function compileCall(
compiler.compileExpressionRetainType(operands[0], Type.i32, false);
type = compiler.currentType;
compiler.currentType = Type.bool;
let classType = type.classType;
let classType = type.classReference;
return classType != null && classType.prototype.fnIndexedGet != null
? module.createI32(1)
: module.createI32(0);
@ -407,7 +407,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -480,7 +480,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -553,7 +553,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -640,7 +640,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -726,7 +726,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -849,7 +849,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1001,7 +1001,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1155,7 +1155,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1230,7 +1230,7 @@ export function compileCall(
}
switch (compiler.currentType.kind) {
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1295,7 +1295,7 @@ export function compileCall(
}
switch (compiler.currentType.kind) {
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1411,7 +1411,7 @@ export function compileCall(
}
switch (compiler.currentType.kind) {
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1481,7 +1481,7 @@ export function compileCall(
break;
}
case TypeKind.USIZE: {
if (typeArguments[0].isReference) {
if (typeArguments[0].is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range
@ -1612,7 +1612,7 @@ export function compileCall(
}
switch (compiler.currentType.kind) {
case TypeKind.USIZE: {
if (compiler.currentType.isReference) {
if (compiler.currentType.is(TypeFlags.REFERENCE)) {
compiler.error(
DiagnosticCode.Operation_not_supported,
reportNode.range

37
src/compiler.ts

@ -2064,6 +2064,7 @@ export class Compiler extends DiagnosticEmitter {
// void to any
if (fromType.kind == TypeKind.VOID) {
assert(toType.kind != TypeKind.VOID); // convertExpression should not be called with void -> void
this.error(
DiagnosticCode.Type_0_is_not_assignable_to_type_1,
reportNode.range, fromType.toString(), toType.toString()
@ -4021,7 +4022,7 @@ export class Compiler extends DiagnosticEmitter {
// indirect call: index argument with signature
case ElementKind.LOCAL: {
if (signature = (<Local>element).type.functionType) {
if (signature = (<Local>element).type.signatureReference) {
indexArg = module.createGetLocal((<Local>element).index, NativeType.I32);
break;
} else {
@ -4033,7 +4034,7 @@ export class Compiler extends DiagnosticEmitter {
}
}
case ElementKind.GLOBAL: {
if (signature = (<Global>element).type.functionType) {
if (signature = (<Global>element).type.signatureReference) {
indexArg = module.createGetGlobal((<Global>element).internalName, (<Global>element).type.toNativeType());
break;
} else {
@ -4046,7 +4047,7 @@ export class Compiler extends DiagnosticEmitter {
}
case ElementKind.FIELD: {
let type = (<Field>element).type;
if (signature = type.functionType) {
if (signature = type.signatureReference) {
let targetExpr = this.compileExpression(assert(resolved.targetExpression), type);
indexArg = module.createLoad(
4,
@ -4425,7 +4426,7 @@ export class Compiler extends DiagnosticEmitter {
declaration
);
if (!instance) return this.module.createUnreachable();
this.currentType = Type.u32.asFunction(instance.signature); // TODO: get cached type?
this.currentType = instance.signature.type; // TODO: get cached type?
// NOTE that, in order to make this work in every case, the function must be represented by a
// value, so we add it and rely on the optimizer to figure out where it can be called directly.
var index = this.ensureFunctionTableEntry(instance); // reports
@ -4449,7 +4450,7 @@ export class Compiler extends DiagnosticEmitter {
switch (expression.kind) {
case NodeKind.NULL: {
let options = this.options;
if (!contextualType.classType) {
if (!contextualType.classReference) {
this.currentType = options.usizeType;
}
return options.isWasm64
@ -4558,7 +4559,7 @@ export class Compiler extends DiagnosticEmitter {
);
if (!(instance && this.compileFunction(instance))) return module.createUnreachable();
let index = this.ensureFunctionTableEntry(instance);
this.currentType = Type.u32.asFunction(instance.signature);
this.currentType = instance.signature.type;
return this.module.createI32(index);
}
}
@ -4579,7 +4580,7 @@ export class Compiler extends DiagnosticEmitter {
switch (expression.literalKind) {
case LiteralKind.ARRAY: {
assert(!implicitNegate);
let classType = contextualType.classType;
let classType = contextualType.classReference;
if (
classType &&
classType.prototype == this.program.elementsLookup.get("Array")
@ -5139,7 +5140,7 @@ export class Compiler extends DiagnosticEmitter {
switch (expression.operator) {
case Token.PLUS_PLUS: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5199,7 +5200,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case Token.MINUS_MINUS: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5323,7 +5324,7 @@ export class Compiler extends DiagnosticEmitter {
switch (expression.operator) {
case Token.PLUS: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5343,7 +5344,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case Token.MINUS: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5382,7 +5383,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case TypeKind.USIZE: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5419,7 +5420,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case Token.PLUS_PLUS: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5447,7 +5448,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case TypeKind.USIZE: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5483,7 +5484,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case Token.MINUS_MINUS: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5511,7 +5512,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case TypeKind.USIZE: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5560,7 +5561,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case Token.TILDE: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range
@ -5591,7 +5592,7 @@ export class Compiler extends DiagnosticEmitter {
break;
}
case TypeKind.USIZE: {
if (currentType.isReference) {
if (currentType.is(TypeFlags.REFERENCE)) {
this.error(
DiagnosticCode.Operation_not_supported,
expression.range

8
src/glue/wasm/i64.ts

@ -152,15 +152,15 @@ function i64_to_f64(value: I64): f64 {
import { CharCode } from "../../util";
@global
function i64_to_string(value: I64): string {
function i64_to_string(value: I64, unsigned: bool = false): string {
var chars = new Array<u16>();
if (value < 0) {
if (!unsigned && value < 0) {
chars.push(CharCode.MINUS);
value = -value;
}
do {
chars.push(CharCode._0 + (value % 10));
value /= 10;
chars.push(CharCode._0 + (<u64>value % 10));
value = <u64>value / 10;
} while (value);
return String.fromCharCodes(chars);
}

23
src/program.ts

@ -1715,27 +1715,27 @@ export class Program extends DiagnosticEmitter {
case ElementKind.GLOBAL:
case ElementKind.LOCAL:
case ElementKind.FIELD: {
if (!(targetType = (<VariableLikeElement>target).type).classType) {
if (!(targetType = (<VariableLikeElement>target).type).classReference) {
this.error(
DiagnosticCode.Property_0_does_not_exist_on_type_1,
propertyAccess.property.range, propertyName, targetType.toString()
);
return null;
}
target = <Class>targetType.classType;
target = <Class>targetType.classReference;
break;
}
case ElementKind.PROPERTY: {
let getter = assert((<Property>target).getterPrototype).resolve(); // reports
if (!getter) return null;
if (!(targetType = getter.signature.returnType).classType) {
if (!(targetType = getter.signature.returnType).classReference) {
this.error(
DiagnosticCode.Property_0_does_not_exist_on_type_1,
propertyAccess.property.range, propertyName, targetType.toString()
);
return null;
}
target = <Class>targetType.classType;
target = <Class>targetType.classReference;
break;
}
}
@ -1799,8 +1799,8 @@ export class Program extends DiagnosticEmitter {
case ElementKind.LOCAL:
case ElementKind.FIELD: {
let type = (<VariableLikeElement>target).type;
if (type.classType) {
let indexedGetName = (target = type.classType).prototype.fnIndexedGet;
if (type.classReference) {
let indexedGetName = (target = type.classReference).prototype.fnIndexedGet;
let indexedGet: Element | null;
if (
indexedGetName != null &&
@ -1808,7 +1808,7 @@ export class Program extends DiagnosticEmitter {
(indexedGet = target.members.get(indexedGetName)) &&
indexedGet.kind == ElementKind.FUNCTION_PROTOTYPE
) {
return resolvedElement.set(indexedGet).withTarget(type.classType, targetExpression);
return resolvedElement.set(indexedGet).withTarget(type.classReference, targetExpression);
}
}
break;
@ -1832,7 +1832,7 @@ export class Program extends DiagnosticEmitter {
case NodeKind.ASSERTION: {
let type = this.resolveType((<AssertionExpression>expression).toType); // reports
if (type) {
let classType = type.classType;
let classType = type.classReference;
if (classType) {
if (!resolvedElement) resolvedElement = new ResolvedElement();
return resolvedElement.set(classType);
@ -1897,12 +1897,12 @@ export class Program extends DiagnosticEmitter {
);
if (instance) {
let returnType = instance.signature.returnType;
let classType = returnType.classType;
let classType = returnType.classReference;
if (classType) {
if (!resolvedElement) resolvedElement = new ResolvedElement();
return resolvedElement.set(classType);
} else {
let signature = returnType.functionType;
let signature = returnType.signatureReference;
if (signature) {
let functionTarget = signature.cachedFunctionTarget;
if (!functionTarget) {
@ -2864,7 +2864,7 @@ export class ClassPrototype extends Element {
if (declaration.extendsType) {
let baseClassType = this.program.resolveType(declaration.extendsType, null); // reports
if (!baseClassType) return null;
if (!(baseClass = baseClassType.classType)) {
if (!(baseClass = baseClassType.classReference)) {
this.program.error(
DiagnosticCode.A_class_may_only_extend_another_class,
declaration.extendsType.range
@ -3198,7 +3198,6 @@ export class Flow {
/** Tests if this flow has the specified flag or flags. */
is(flag: FlowFlags): bool { return (this.flags & flag) == flag; }
/** Sets the specified flag or flags. */
set(flag: FlowFlags): void { this.flags |= flag; }

55
src/types.ts

@ -94,10 +94,10 @@ export class Type {
size: u32;
/** Size in bytes. Ceiled to 8-bits. */
byteSize: i32;
/** Underlying class type, if a class type. */
classType: Class | null;
/** Underlying function type, if a function type. */
functionType: Signature | null;
/** Underlying class reference, if a class type. */
classReference: Class | null;
/** Underlying function reference, if a function type. */
signatureReference: Signature | null;
/** Respective nullable type, if non-nullable. */
nullableType: Type | null = null;
/** Respective non-nullable type, if nullable. */
@ -109,7 +109,8 @@ export class Type {
this.flags = flags;
this.size = size;
this.byteSize = <i32>ceil<f64>(<f64>size / 8);
this.classType = null;
this.classReference = null;
this.signatureReference = null;
this.nonNullableType = this;
}
@ -128,37 +129,30 @@ export class Type {
/** Tests if this type has any of the specified flags. */
isAny(flags: TypeFlags): bool { return (this.flags & flags) != 0; }
/** Tests if this type is a class type. */
get isClass(): bool { return this.classType != null; }
/** Tests if this type is a function type. */
get isFunction(): bool { return this.functionType != null; }
/** Tests if this type is a reference type. */
get isReference(): bool { return this.classType != null || this.functionType != null; }
/** Composes a class type from this type and a class. */
asClass(classType: Class): Type {
assert(this.kind == TypeKind.USIZE && !this.classType);
assert(this.kind == TypeKind.USIZE && !this.classReference);
var ret = new Type(this.kind, this.flags & ~TypeFlags.VALUE | TypeFlags.REFERENCE, this.size);
ret.classType = classType;
ret.classReference = classType;
return ret;
}
/** Composes a function type from this type and a function. */
asFunction(functionType: Signature): Type {
assert(this.kind == TypeKind.U32 && !this.functionType);
asFunction(signature: Signature): Type {
assert(this.kind == TypeKind.U32 && !this.signatureReference);
var ret = new Type(this.kind, this.flags & ~TypeFlags.VALUE | TypeFlags.REFERENCE, this.size);
ret.functionType = functionType;
ret.signatureReference = signature;
return ret;
}
/** Composes the respective nullable type of this type. */
asNullable(): Type {
assert(this.isReference);
assert(this.is(TypeFlags.REFERENCE));
if (!this.nullableType) {
assert(!this.is(TypeFlags.NULLABLE));
this.nullableType = new Type(this.kind, this.flags | TypeFlags.NULLABLE, this.size);
this.nullableType.classType = this.classType; // either a class reference
this.nullableType.functionType = this.functionType; // or a function reference
this.nullableType.classReference = this.classReference; // either a class reference
this.nullableType.signatureReference = this.signatureReference; // or a function reference
}
return this.nullableType;
}
@ -169,19 +163,19 @@ export class Type {
var targetClass: Class | null;
var currentFunction: Signature | null;
var targetFunction: Signature | null;
if (this.isReference) {
if (target.isReference) {
if (currentClass = this.classType) {
if (targetClass = target.classType) {
if (this.is(TypeFlags.REFERENCE)) {
if (target.is(TypeFlags.REFERENCE)) {
if (currentClass = this.classReference) {
if (targetClass = target.classReference) {
return currentClass.isAssignableTo(targetClass);
}
} else if (currentFunction = this.functionType) {
if (targetFunction = target.functionType) {
} else if (currentFunction = this.signatureReference) {
if (targetFunction = target.signatureReference) {
return currentFunction.isAssignableTo(targetFunction);
}
}
}
} else if (!target.isReference) {
} else if (!target.is(TypeFlags.REFERENCE)) {
if (this.is(TypeFlags.INTEGER)) {
if (target.is(TypeFlags.INTEGER)) {
if (!signednessIsImportant || this.is(TypeFlags.SIGNED) == target.is(TypeFlags.SIGNED)) {
@ -222,14 +216,14 @@ export class Type {
case TypeKind.U8: return "u8";
case TypeKind.U16: return "u16";
case TypeKind.U32: {
let functionType = this.functionType;
let functionType = this.signatureReference;
return kindOnly || !functionType
? "u32"
: functionType.toString(true);
}
case TypeKind.U64: return "u64";
case TypeKind.USIZE: {
let classType = this.classType;
let classType = this.classReference;
return kindOnly || !classType
? "usize"
: classType.toString();
@ -480,6 +474,8 @@ export class Signature {
hasRest: bool;
/** Cached {@link FunctionTarget}. */
cachedFunctionTarget: FunctionTarget | null = null;
/** Respective function type. */
type: Type;
/** Constructs a new signature. */
constructor(
@ -493,6 +489,7 @@ export class Signature {
this.returnType = returnType ? returnType : Type.void;
this.thisType = thisType;
this.hasRest = false;
this.type = Type.u32.asFunction(this);
}
/** Gets the known or, alternatively, generic parameter name at the specified index. */

39
tests/browser-asc.js Normal file

@ -0,0 +1,39 @@
const asc = require("../dist/asc.js");
const stdout = asc.createMemoryStream();
const stderr = asc.createMemoryStream();
const files = {
"/module.ts": `import "allocator/arena";`
};
asc.main([
"./module.ts",
"--textFile"
], {
stdout: stdout,
stderr: stderr,
readFile: (name) => {
console.log("readFile: " + name);
if (files.hasOwnProperty(name)) {
return files[name];
}
return null;
},
writeFile: (name, data) => {
console.log("writeFile: " + name);
},
listFiles: (dirname) => {
console.log("listFiles: " + dirname);
return [];
}
}, err => {
if (err) {
console.log(">>> THROWN >>>");
console.log(err);
}
console.log(">>> STDOUT >>>");
process.stdout.write(stdout.toString());
console.log(">>> STDERR >>>");
process.stdout.write(stderr.toString());
});