builtin_match_signatures #1

Merged
simponic merged 4 commits from builtin_match_signatures into main 2024-02-28 14:59:29 -05:00
16 changed files with 5808 additions and 5453 deletions

106
src/interpreter/builtins.ts Normal file
View File

@ -0,0 +1,106 @@
import {
type DenotableFunctionSignature,
Environment,
type Denotable,
} from '.';
const addUnaryIntegerOperationsTo = (env: Environment) => {
const unaryIntegerOperationSignatures: DenotableFunctionSignature[] = [
{
arguments: ['int'],
return: 'int',
},
];
for (const { name, fn } of [
{ name: '~', fn: (a: number) => ~a },
{ name: '!', fn: (a: number) => (!a ? 1 : 0) },
]) {
env.set(name, {
type: 'function',
value: {
signatures: unaryIntegerOperationSignatures,
body: ({ value }: Denotable) => fn(value as number),
},
});
}
return env;
};
const addBinaryIntegerOperationsTo = (env: Environment) => {
const binaryIntegerOperationSignatures: DenotableFunctionSignature[] = [
{
arguments: ['int', 'int'],
return: 'int',
},
];
for (const { name, fn } of [
{ name: '%', fn: (a: number, b: number) => a % b },
{ name: '>>', fn: (a: number, b: number) => a >> b },
{ name: '<<', fn: (a: number, b: number) => a << b },
{ name: '|', fn: (a: number, b: number) => a | b },
{ name: '^', fn: (a: number, b: number) => a ^ b },
{ name: '&&', fn: (a: number, b: number) => (a && b ? 1 : 0) },
{ name: '<=', fn: (a: number, b: number) => (a <= b ? 1 : 0) },
{ name: '<', fn: (a: number, b: number) => (a < b ? 1 : 0) },
{ name: '>', fn: (a: number, b: number) => (a > b ? 1 : 0) },
{ name: '>=', fn: (a: number, b: number) => (a >= b ? 1 : 0) },
{ name: '||', fn: (a: number, b: number) => (a || b ? 1 : 0) },
]) {
env.set(name, {
type: 'function',
value: {
signatures: binaryIntegerOperationSignatures,
body: ({ value: a }: Denotable, { value: b }: Denotable) =>
fn(a as number, b as number),
},
});
}
return env;
};
const addBinaryArithmeticOperationsTo = (env: Environment) => {
const binaryArithmeticSignatures: DenotableFunctionSignature[] = [
{
arguments: ['int', 'int'],
return: 'int',
},
{
arguments: [
['int', 'real'],
['int', 'real'],
],
return: 'real',
},
];
for (const { name, fn } of [
{ name: '+', fn: (a: number, b: number) => a + b },
{ name: '-', fn: (a: number, b: number) => a - b },
{ name: '*', fn: (a: number, b: number) => a * b },
{ name: '/', fn: (a: number, b: number) => a / b },
{ name: '**', fn: (a: number, b: number) => a ** b },
]) {
env.set(name, {
type: 'function',
value: {
signatures: binaryArithmeticSignatures,
body: ({ value: a }: Denotable, { value: b }: Denotable) =>
fn(a as number, b as number),
},
});
}
return env;
};
export const putBuiltinsOnEnvironemtn = (env: Environment) => {
return [
addBinaryArithmeticOperationsTo,
addBinaryIntegerOperationsTo,
addUnaryIntegerOperationsTo,
].reduce((acc, builtinsAdder) => builtinsAdder(acc), env);
};

View File

@ -0,0 +1,93 @@
import type { Identifier } from '@/parser';
import { testingLogger } from '@t/logger';
export type UnionDenotableType =
| Array<DenotableType | DenotableFunctionSignature>
| DenotableType
| DenotableFunctionSignature
| Array<UnionDenotableType>;
export type DenotableFunctionSignature = {
arguments: Array<UnionDenotableType>;
return: DenotableType;
};
export type DenotableFunction = {
signatures: Array<DenotableFunctionSignature>;
body: Function;
};
export type DenotableType =
| 'null'
| 'int'
| 'real'
| 'string'
| 'bytearray'
| 'function'
| 'reference';
export type DenotableValue =
| null
| number
| string
| Uint8Array
| DenotableFunction
| Identifier;
export type Denotable = {
type: DenotableType;
value: DenotableValue;
};
export const denotableTypesEquivalent = (
a: UnionDenotableType,
b: UnionDenotableType,
): boolean => {
if (typeof a !== typeof b) return false;
if (Array.isArray(a) && Array.isArray(b)) {
if (a.length !== b.length) return false;
for (let i = 0; i < a.length; i++) {
if (!denotableTypesEquivalent(a[i], b[i])) return false;
}
return true;
}
if (
typeof a === 'object' &&
typeof b === 'object' &&
'arguments' in a &&
'arguments' in b
) {
if (a.arguments.length !== b.arguments.length) return false;
if (!denotableTypesEquivalent(a.return, b.return)) return false;
for (let i = 0; i < a.arguments.length; i++) {
if (!denotableTypesEquivalent(a.arguments[i], b.arguments[i])) {
return false;
}
}
return true;
}
if (a === b) return true;
return false;
};
export const matchSignature = (
args: Array<UnionDenotableType>,
signatures: Array<DenotableFunctionSignature>,
): DenotableFunctionSignature | undefined => {
return signatures.find(signature => {
if (args.length !== signature.arguments.length) return false;
return args.every((arg, i) => {
const argSignature = signature.arguments[i];
if (Array.isArray(argSignature)) {
return argSignature.some(a => denotableTypesEquivalent(a, arg));
}
return denotableTypesEquivalent(arg, signature.arguments[i]);
});
});
};

View File

@ -0,0 +1,83 @@
import { UnknownSymbolError, InvalidType, type TracingLogger } from '@/utils';
import { matchSignature, type Denotable } from '.';
export class Environment {
private scope: Map<string, Denotable>;
private parent: Environment | null;
private logger: TracingLogger;
constructor(logger: TracingLogger, parent: Environment | null = null) {
this.logger = logger;
this.parent = parent;
this.scope = new Map();
}
public set(name: string, value: Denotable) {
this.scope.set(name, value);
}
public get(name: string): Denotable {
if (this.scope.has(name)) {
this.logger.debug(`Found Name=(${name}) in current scope`);
return this.scope.get(name)!;
}
if (this.parent) {
this.logger.debug(`Looking for Name=(${name}) in parent scope`);
return this.parent.get(name);
}
throw new UnknownSymbolError(`Undefined variable: ${name}`);
}
public has(name: string): boolean {
if (this.scope.has(name)) {
this.logger.debug(`Found Name=(${name}) in current scope`);
return true;
}
if (this.parent) {
this.logger.debug(`Found Name=(${name}) in current scope`);
return this.parent.has(name);
}
this.logger.debug(`Name=(${name}) not found in any scope`);
return false;
}
public createChild(): Environment {
return new Environment(this.logger.createChild('Env'), this);
}
public apply(name: string, args: Denotable[]): Denotable {
const fn = this.get(name);
if (typeof fn.value !== 'object' || !fn.value || !('body' in fn.value)) {
throw new InvalidType(name + ' is not a valid function');
}
const argTypes = args.map(arg => {
const { type, value } = arg;
const isFunction =
type === 'function' &&
typeof value === 'object' &&
value &&
'signatures' in value;
if (isFunction) {
return value.signatures;
}
return type;
});
const appliedSignature = matchSignature(argTypes, fn.value.signatures);
if (!appliedSignature) {
throw new InvalidType(`No matching signature for ${name}`);
}
this.logger.debug(
`Applying Function=(${name}) with Args=(${JSON.stringify(args)}) with Signature=(${JSON.stringify(appliedSignature)})`,
);
const value = fn.value.body.apply(this, args);
return { type: appliedSignature.return, value };
}
}

View File

@ -1 +1,3 @@
export const evaluate = async (ast: Program) => {}; export * from './denotable';
export * from './environment';
export * from './interpreter';

View File

@ -0,0 +1,124 @@
import {
type ContinuationExpression,
type PrimitiveOperationExpression,
type Program,
type Value,
} from '@/parser';
import { Environment, type Denotable } from '.';
import {
BadArgumentError,
InvalidStateError,
NotImplementedError,
type TracingLogger,
} from '@/utils';
import { putBuiltinsOnEnvironemtn } from './builtins';
const evaluateValue = (
value: Value,
env: Environment,
logger: TracingLogger,
): Denotable => {
if (typeof value === 'string') {
return { type: 'string', value };
}
if ('real' in value) {
return { type: 'real', value: value.real };
}
if ('int' in value) {
return { type: 'int', value: value.int };
}
if ('name' in value) {
logger.debug(`Evaluating variable: ${value.name}`);
return env.get(value.name);
}
throw new InvalidStateError(`Invalid value: ${value}`);
};
const evaluatePrimitiveOperation = (
{ primitiveOperation }: PrimitiveOperationExpression,
env: Environment,
logger: TracingLogger,
) => {
const { opr, operands, resultBindings, continuations } = primitiveOperation;
if (operands.length !== 2) {
throw new BadArgumentError('Primitive operations must have 2 operands');
}
const operandValues = operands.map(operand =>
evaluateValue(operand, env, logger.createChild('evaluteValue')),
);
const result = env.apply(opr, operandValues);
const continuationEnvironment = env.createChild();
for (const { name } of resultBindings) {
continuationEnvironment.set(name, result);
}
// return the result of the last continuation
return continuations.reduce((_, continuation, i) => {
const childLogger = logger.createChild(`continuation[${i}]`);
return evaluteContinuationExpression(
continuation,
continuationEnvironment,
childLogger,
);
}, result);
};
const evaluteContinuationExpression = (
expr: ContinuationExpression,
env: Environment,
logger: TracingLogger,
): Denotable => {
if ('primitiveOperation' in expr) {
logger.debug('Evaluating primitive operation');
return evaluatePrimitiveOperation(
expr,
env,
logger.createChild('evaluatePrimitiveOperation'),
);
}
if ('record' in expr) {
throw new NotImplementedError('Continuation records are not supported yet');
}
if ('select' in expr) {
throw new NotImplementedError('Continuation select is not supported yet');
}
if ('offset' in expr) {
throw new NotImplementedError('Continuation offset is not supported yet');
}
if ('application' in expr) {
throw new NotImplementedError(
'Continuation application is not supported yet',
);
}
if ('switch' in expr) {
throw new NotImplementedError('Continuation switch is not supported yet');
}
if ('fix' in expr) {
throw new NotImplementedError('Continuation fix is not supported yet');
}
throw new InvalidStateError(`Invalid continuation expression: ${expr}`);
};
export const evaluate = async (
ast: Program,
logger: TracingLogger,
): Promise<Denotable> => {
const globalEnvironment = putBuiltinsOnEnvironemtn(
new Environment(logger.createChild('RootEnv')),
);
return ast.reduce((_, continuation, i) => {
const exprLogger = logger.createChild(`statement[${i}]`);
return evaluteContinuationExpression(
continuation as ContinuationExpression,
globalEnvironment,
exprLogger,
);
}, null);
};

View File

@ -285,6 +285,7 @@ ComparisonOperation
/ "!" / "!"
/ ">" / ">"
/ "<" / "<"
/ "||"
Integer = digits:("-"? [0-9]+) !"." { return { int: parseInt(digits.join(''), 10) }; } Integer = digits:("-"? [0-9]+) !"." { return { int: parseInt(digits.join(''), 10) }; }

File diff suppressed because it is too large Load Diff

View File

@ -1 +1,9 @@
export class NotImplementedException extends Error {} export class NotImplementedError extends Error {}
export class UnknownSymbolError extends Error {}
export class InvalidStateError extends Error {}
export class BadArgumentError extends Error {}
export class InvalidType extends Error {}

35
test/interpreter.spec.ts Normal file
View File

@ -0,0 +1,35 @@
import { expect, test } from 'bun:test';
import { TestPrograms } from './programs';
import { peggyParse } from '@/parser';
import { evaluate } from '@/interpreter';
import { testingLogger } from './logger';
test('Add (1 real) and (3 int) => (4 real)', async () => {
const ast = peggyParse(await TestPrograms.AddOneThree);
const result = await evaluate(ast, testingLogger);
expect(result).toEqual({ type: 'real', value: 4 });
});
test('Add (1 real) and (3 int) -> result => (real 1 - result) = -3 done with correct lexical scope', async () => {
const ast = peggyParse(await TestPrograms.PrimopScope);
const result = await evaluate(ast, testingLogger);
expect(result).toEqual({ type: 'real', value: -3 });
});
/*
test('String equality', async () => {
const ast = peggyParse(await TestPrograms.StringEquality);
const result = await evaluate(ast, testingLogger);
expect(result).toEqual({ type: 'int', value: 1 });
});
test('String inequality', async () => {
const ast = peggyParse(await TestPrograms.StringInEquality);
const result = await evaluate(ast, testingLogger);
expect(result).toEqual({ type: 'int', value: 0 });
});
*/

View File

@ -2,6 +2,44 @@ import { expect, test } from 'bun:test';
import { TestPrograms } from './programs'; import { TestPrograms } from './programs';
import { peggyParse } from '@/parser'; import { peggyParse } from '@/parser';
test('Primitive Operations', async () => { test('primitive operation', async () => {
const ast = peggyParse(await TestPrograms.AddOneThree); const [operation] = peggyParse(await TestPrograms.AddOneThree);
const { primitiveOperation } = operation;
expect(primitiveOperation).toEqual({
opr: '+',
operands: [{ real: 1 }, { int: 3 }],
resultBindings: [{ name: 'result' }],
continuations: [],
});
});
test('primitive operation with continuation', async () => {
const [operation] = peggyParse(await TestPrograms.PrimopScope);
const { primitiveOperation } = operation;
const continuation = {
primitiveOperation: {
opr: '-',
operands: [{ real: 1 }, { name: 'result' }],
resultBindings: [{ name: 'result' }],
continuations: [
{
primitiveOperation: {
opr: '+',
operands: [{ name: 'result' }, { real: 0 }],
resultBindings: [],
continuations: [],
},
},
],
},
};
expect(primitiveOperation).toEqual({
opr: '+',
operands: [{ real: 1 }, { int: 3 }],
resultBindings: [{ name: 'result' }],
continuations: [continuation],
});
}); });

View File

@ -1,2 +1 @@
PRIMOP(+, [INT 1, INT 2], [u], PRIMOP(+, [REAL 1.0, INT 3], [result], [])
[APP(LABEL identity, [VAR u])])

View File

@ -4,4 +4,13 @@ export namespace TestPrograms {
export const AddOneThree = Bun.file( export const AddOneThree = Bun.file(
join(import.meta.dir + '/add-1-3.cps'), join(import.meta.dir + '/add-1-3.cps'),
).text(); ).text();
export const PrimopScope = Bun.file(
join(import.meta.dir + '/primop-scope.cps'),
).text();
export const StringEquality = Bun.file(
join(import.meta.dir + '/string-equal.cps'),
).text();
export const StringInEquality = Bun.file(
join(import.meta.dir + '/string-unequal.cps'),
).text();
} }

View File

@ -0,0 +1,5 @@
PRIMOP(+, [REAL 1.0, INT 3], [result], [
PRIMOP(-, [REAL 1.0, VAR result], [result], [
PRIMOP(+, [VAR result, REAL 0], [], [])
])
])

View File

@ -0,0 +1 @@
PRIMOP(==, ["asdf", "asdf"], [result], [])

View File

@ -0,0 +1 @@
PRIMOP(==, ["asdfasdf", "asdf"], [result], [])

View File

@ -0,0 +1,160 @@
import { expect, test } from 'bun:test';
import { TestPrograms } from './programs';
import { peggyParse } from '@/parser';
import {
evaluate,
type DenotableFunctionSignature,
denotableTypesEquivalent,
matchSignature,
} from '@/interpreter';
import { testingLogger } from './logger';
test('simple denotable types are equivalent', () => {
expect(denotableTypesEquivalent('int', 'int')).toBe(true);
expect(denotableTypesEquivalent('int', 'real')).toBe(false);
expect(denotableTypesEquivalent('int', 'null')).toBe(false);
expect(denotableTypesEquivalent('null', 'null')).toBe(true);
});
test('union data types are equivalent', () => {
expect(denotableTypesEquivalent(['int', 'real'], ['int', 'real'])).toBe(true);
expect(denotableTypesEquivalent('int', ['int', 'real'])).toBe(false);
});
test('function data types are equivalent', () => {
expect(
denotableTypesEquivalent(
[
{
arguments: ['int', 'real'],
return: 'int',
},
],
[
{
arguments: ['int', 'real'],
return: 'int',
},
],
),
).toBe(true);
expect(
denotableTypesEquivalent(
[
{
arguments: ['int', 'real'],
return: 'real',
},
],
[
{
arguments: ['int', 'real'],
return: 'int',
},
],
),
).toBe(false);
});
test('matches simple signatures', async () => {
const simpleSignature: DenotableFunctionSignature[] = [
{
arguments: ['int'],
return: 'int',
},
];
expect(matchSignature(['int'], simpleSignature)).toEqual(simpleSignature[0]);
});
test('finds first match', async () => {
const simpleSignature: DenotableFunctionSignature[] = [
{
arguments: ['int', 'int'],
return: 'int',
},
{
arguments: [['int', 'real'], 'int'],
return: 'real',
},
];
expect(matchSignature(['int', 'int'], simpleSignature)).toEqual(
simpleSignature[0],
);
expect(matchSignature(['real', 'int'], simpleSignature)).toEqual(
simpleSignature[1],
);
});
test('finds first match with a function signature', async () => {
const testSignature: DenotableFunctionSignature = {
arguments: ['int', 'real'],
return: 'int',
};
const simpleSignature: DenotableFunctionSignature[] = [
{
arguments: ['int', 'int'],
return: 'int',
},
{
arguments: [[testSignature, 'real'], 'int'],
return: 'function',
},
];
expect(matchSignature(['int', 'int'], simpleSignature)).toEqual(
simpleSignature[0],
);
expect(matchSignature(['real', 'int'], simpleSignature)).toEqual(
simpleSignature[1],
);
expect(matchSignature([testSignature, 'int'], simpleSignature)).toEqual(
simpleSignature[1],
);
});
test('finds first match with a function with many signatures', async () => {
const testSignature: DenotableFunctionSignature[] = [
{
arguments: ['int', 'real'],
return: 'int',
},
{
arguments: ['int', 'int'],
return: 'int',
},
];
const simpleSignature: DenotableFunctionSignature[] = [
{
arguments: ['int', 'int'],
return: 'int',
},
{
arguments: [[testSignature, 'real'], 'int'],
return: 'function',
},
];
expect(matchSignature(['int', 'int'], simpleSignature)).toEqual(
simpleSignature[0],
);
expect(matchSignature(['real', 'int'], simpleSignature)).toEqual(
simpleSignature[1],
);
expect(matchSignature([testSignature, 'int'], simpleSignature)).toEqual(
simpleSignature[1],
);
expect(
matchSignature([[testSignature[0]], 'int'], simpleSignature),
).toBeUndefined();
});