Skip to content

Use AST Tree from compiler for tokenization #76

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

Draft
PhilippeChab wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use AST Tree from compiler for tokenization #76

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"rootDir": "src",
"strict": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true
"esModuleInterop": true,
"composite": true,
"declaration": true
},
"include": ["src"],
"exclude": ["node_modules"]
Expand Down
24 changes: 10 additions & 14 deletions server/scripts/GenerateLibDefinitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const generateDefinitions = async () => {
console.log("Generating nwscript.nss definitions ...");
const lib = readFileSync(normalize(join(__dirname, "./nwscript.nss"))).toString();

const definitions = tokenizer.tokenizeContent(lib, TokenizedScope.global);
const definitions = await tokenizer.tokenizeContent(lib, TokenizedScope.global);
writeFileSync(normalize(join(__dirname, "../resources/standardLibDefinitions.json")), JSON.stringify(definitions, null, 4));
console.log("Done.");

Expand All @@ -20,27 +20,23 @@ const generateDefinitions = async () => {
let directoryPath = normalize(join(__dirname, "base_scripts"));
let files = readdirSync(directoryPath);

files.forEach((filename) => {
for (const filename of files) {
const fileSource = join(normalize(join(__dirname, "base_scripts", filename)));
const fileDestination = join(normalize(join(__dirname, "../resources/base_scripts", filename.replace(".nss", ".json"))));
const lib = readFileSync(fileSource).toString();

// Skip main files
if (!lib.includes("main")) {
const definitions = tokenizer.tokenizeContent(lib, TokenizedScope.global);
if (
definitions.children.length === 0 &&
definitions.complexTokens.length === 0 &&
definitions.structComplexTokens.length === 0
) {
return;
const definitions = await tokenizer.tokenizeContent(lib, TokenizedScope.global);
if (definitions.children.length === 0 && definitions.complexTokens.length === 0 && definitions.structComplexTokens.length === 0) {
continue;
}

console.log(`Generating ${filename} ...`);
filesCount++;
writeFileSync(fileDestination, JSON.stringify(definitions, null, 4));
}
});
}
console.log(`Generated ${filesCount} files.`);
console.log("Done.");

Expand All @@ -49,18 +45,18 @@ const generateDefinitions = async () => {
directoryPath = normalize(join(__dirname, "ovr"));
files = readdirSync(directoryPath);

files.forEach((filename) => {
for (const filename of files) {
const fileSource = join(normalize(join(__dirname, "ovr", filename)));
const fileDestination = join(normalize(join(__dirname, "../resources/ovr", filename.replace(".nss", ".json"))));
const lib = readFileSync(fileSource).toString();
const definitions = tokenizer.tokenizeContent(lib, TokenizedScope.global);
const definitions = await tokenizer.tokenizeContent(lib, TokenizedScope.global);

console.log(`Generating ${filename} ...`);
filesCount++;
writeFileSync(fileDestination, JSON.stringify(definitions, null, 4));
});
}
console.log(`Generated ${filesCount} files.`);
console.log("Done.");
};

generateDefinitions();
void generateDefinitions();
12 changes: 6 additions & 6 deletions server/src/Documents/DocumentsCollection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default class DocumentsCollection extends Dictionnary<string, Document> {
const directoryPath = normalize(join(__dirname, "..", "resources", static_resources_folder));
const files = readdirSync(directoryPath);
files.forEach((filename) => {
const tokens = JSON.parse(readFileSync(join(__dirname, "..", "resources", static_resources_folder, filename)).toString()) as any as GlobalScopeTokenizationResult;
const tokens = JSON.parse(readFileSync(join(__dirname, "..", "resources", static_resources_folder, filename)).toString()) as GlobalScopeTokenizationResult;
this.addDocument(this.initializeDocument(`${STATIC_PREFIX}/${filename.replace(".json", FILES_EXTENSION)}`, true, tokens));
});
});
Expand All @@ -52,7 +52,7 @@ export default class DocumentsCollection extends Dictionnary<string, Document> {
if (this.get(this.getKey(uri, false))) return;

const fileContent = readFileSync(filePath).toString();
this.createDocuments(uri, fileContent, tokenizer, workespaceFilesSystem);
void this.createDocuments(uri, fileContent, tokenizer, workespaceFilesSystem);
});
}

Expand All @@ -72,16 +72,16 @@ export default class DocumentsCollection extends Dictionnary<string, Document> {
this.addDocument(this.initializeDocument(uri, false, globalScope));
}

public createDocuments(uri: string, content: string, tokenizer: Tokenizer, workespaceFilesSystem: WorkspaceFilesSystem) {
const globalScope = tokenizer.tokenizeContent(content, TokenizedScope.global);
public async createDocuments(uri: string, content: string, tokenizer: Tokenizer, workespaceFilesSystem: WorkspaceFilesSystem) {
const globalScope = await tokenizer.tokenizeContent(content, TokenizedScope.global);

this.addDocument(this.initializeDocument(uri, false, globalScope));
this.createChildrenDocument(globalScope.children, tokenizer, workespaceFilesSystem);
}

public updateDocument(document: TextDocument, tokenizer: Tokenizer, workespaceFilesSystem: WorkspaceFilesSystem) {
public async updateDocument(document: TextDocument, tokenizer: Tokenizer, workespaceFilesSystem: WorkspaceFilesSystem) {
const currentChildren = this.getFromUri(document.uri)?.children;
const globalScope = tokenizer.tokenizeContent(document.getText(), TokenizedScope.global);
const globalScope = await tokenizer.tokenizeContent(document.getText(), TokenizedScope.global);
const newChildren = globalScope.children.filter((child) => !currentChildren!.includes(child));

this.overwriteDocument(this.initializeDocument(document.uri, false, globalScope));
Expand Down
4 changes: 2 additions & 2 deletions server/src/Documents/DocumentsIndexer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const generateTokens = async (filesPath: string[]) => {
for (let i = 0; i < filesPath.length; i++) {
const filePath = filesPath[i];
const fileContent = readFileSync(filePath).toString();
const globalScope = tokenizer.tokenizeContent(fileContent, TokenizedScope.global);
const globalScope = await tokenizer.tokenizeContent(fileContent, TokenizedScope.global);

process?.send!(JSON.stringify({ filePath, globalScope }));
}
Expand All @@ -22,5 +22,5 @@ const generateTokens = async (filesPath: string[]) => {
};

process.on("message", (filesPath: string) => {
generateTokens(filesPath.split(","));
void generateTokens(filesPath.split(","));
});
Loading