fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-17 08:51:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix some missing sources not correctly being reported

Browse Source
This commit is contained in:
dcode
2019-05-27 21:39:40 +02:00
parent ccd1198aa7
commit fe70f1d863
19 changed files with 436 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cli/asc.js
View File

@ -277,6 +277,7 @@ exports.main = function main(argv, options, callback) {
function parseBacklog() {
var sourcePath, sourceText;
while ((sourcePath = parser.nextFile()) != null) {
sourceText = null;
// Load library file if explicitly requested
if (sourcePath.startsWith(exports.libraryPrefix)) {
@ -325,12 +326,12 @@ exports.main = function main(argv, options, callback) {
} else {
for (let i = 0, k = customLibDirs.length; i < k; ++i) {
const dir = customLibDirs[i];
sourceText = readFile(plainName + ".ts", customLibDirs[i]);
sourceText = readFile(plainName + ".ts", dir);
if (sourceText !== null) {
sourcePath = exports.libraryPrefix + plainName + ".ts";
break;
} else {
sourceText = readFile(indexName + ".ts", customLibDirs[i]);
sourceText = readFile(indexName + ".ts", dir);
if (sourceText !== null) {
sourcePath = exports.libraryPrefix + indexName + ".ts";
break;
@ -356,17 +357,21 @@ exports.main = function main(argv, options, callback) {
// Include runtime template before entry files so its setup runs first
{
let templateName = String(args.runtime);
let templateText = exports.libraryFiles["rt/index-" + templateName];
if (templateText == null) {
templateText = readFile(templateName + ".ts", baseDir);
if (templateText == null) {
return callback(Error("Runtime template '" + templateName + "' not found."));
let runtimeName = String(args.runtime);
let runtimePath = "rt/index-" + runtimeName;
let runtimeText = exports.libraryFiles[runtimePath];
if (runtimeText == null) {
runtimePath = runtimeName;
runtimeText = readFile(runtimePath + ".ts", baseDir);
if (runtimeText == null) {
return callback(Error("Runtime '" + runtimeName + "' not found."));
}
} else {
runtimePath = "~lib/" + runtimePath;
}
stats.parseCount++;
stats.parseTime += measure(() => {
parser = assemblyscript.parseFile(templateText, templateName, true, parser);
parser = assemblyscript.parseFile(runtimeText, runtimePath, true, parser);
});
}