Rework code validation to be bound to a context and not context-independent. It means that the generated code is validated based on different phases during the compilation. This is done by moving validation from `ScriptCode` constructor to a different callable function. It removes duplicate detection for function calls once a call is fully compiled, but still checks for duplicates inside each function body that has inline code. This allows for having duplicates in final scripts (thus relaxing the duplicate detection), e.g., when multiple calls to the same function is made. It fixes non-duplicates (when using common syntax) being misrepresented as duplicate lines. It improves the output of errors, such as printing valid lines, to give more context. This improvement also fixes empty line validation not showing the right empty lines in the error output. Empty line validation shows tabs and whitespaces more clearly. Finally, it adds more tests including tests for existing logic, such as singleton factories.
41 lines
1.5 KiB
TypeScript
41 lines
1.5 KiB
TypeScript
import type { FunctionData } from '@/application/collections/';
|
|
import { sequenceEqual } from '@/application/Common/Array';
|
|
import { ISharedFunctionCollection } from '@/application/Parser/Script/Compiler/Function/ISharedFunctionCollection';
|
|
import { ISharedFunctionsParser } from '@/application/Parser/Script/Compiler/Function/ISharedFunctionsParser';
|
|
import { ILanguageSyntax } from '@/application/Parser/Script/Validation/Syntax/ILanguageSyntax';
|
|
import { SharedFunctionCollectionStub } from './SharedFunctionCollectionStub';
|
|
|
|
export class SharedFunctionsParserStub implements ISharedFunctionsParser {
|
|
public callHistory = new Array<{
|
|
functions: readonly FunctionData[],
|
|
syntax: ILanguageSyntax,
|
|
}>();
|
|
|
|
private setupResults = new Array<{
|
|
functions: readonly FunctionData[],
|
|
result: ISharedFunctionCollection,
|
|
}>();
|
|
|
|
public setup(functions: readonly FunctionData[], result: ISharedFunctionCollection) {
|
|
this.setupResults.push({ functions, result });
|
|
}
|
|
|
|
public parseFunctions(
|
|
functions: readonly FunctionData[],
|
|
syntax: ILanguageSyntax,
|
|
): ISharedFunctionCollection {
|
|
this.callHistory.push({
|
|
functions: Array.from(functions),
|
|
syntax,
|
|
});
|
|
const result = this.findResult(functions);
|
|
return result || new SharedFunctionCollectionStub();
|
|
}
|
|
|
|
private findResult(functions: readonly FunctionData[]): ISharedFunctionCollection {
|
|
return this.setupResults
|
|
.find((result) => sequenceEqual(result.functions, functions))
|
|
?.result;
|
|
}
|
|
}
|