From f724285d1d3cea85128069bcdf04e4c6af9c7a39 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sun, 10 Dec 2023 17:33:01 +0530 Subject: adds associativity for a=0 --- package.json | 2 +- src/index.ts | 43 ++++++++++++++++--------------------------- src/tests.ts | 42 ++++++++++++++++++++++++++++++++++++++++-- src/util.ts | 31 +++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 30 deletions(-) create mode 100644 src/util.ts diff --git a/package.json b/package.json index a7d7598..91f7ae3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "brainfuck-ts-types", + "name": "ts-theorem-provinator", "version": "0.0.0", "description": "__", "main": "index.js", diff --git a/src/index.ts b/src/index.ts index bd93300..5164412 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,41 +1,30 @@ -export type Op = string | { op: string; a: Op; b: Op }; +import { Op, Rewrite, ChainRewrites, Flip } from './util'; -export type Rewrite = { - type: 'rewrite'; - left: left; - right: right; -}; -export type RewriteKind = Rewrite; - -export type Flip = Rewrite; - -export type ApplyRewrite = - O extends R['left'] ? R['right'] - : O extends string ? O - : O extends { a: Op, b: Op, op: string } ? ( - ApplyRewrite extends O['a'] - ? Omit & { b: ApplyRewrite } - : Omit & { a: ApplyRewrite } - ) - : never; - -export type Add = { op: '+'; a: a; b: b }; +export type Add = { op: '+'; a: A; b: B }; export type Identity = Rewrite, A>; export type Commutativity = Rewrite, Add>; -// type _x = ApplyRewrite, Identity<'0'>>; - -// type Assoc = +export interface Assoc0 { + type: 'rewrite', + left: Add, B>; + right: ChainRewrites<[ + Commutativity<'0', A>, + Identity, + Flip>>, + Commutativity, '0'>, + ], this['left']>; +}; /* - Assoc: (a + b) + c = a + (b + c) For a = 0, (0 + b) + c -= b + c -= 0 + (b + c) += (b + 0) + c -- comm += b + c -- id += (b + c) + 0 -- flip id += 0 + (b + c) -- comm For a = succ(), diff --git a/src/tests.ts b/src/tests.ts index 8c379e8..b4fc214 100644 --- a/src/tests.ts +++ b/src/tests.ts @@ -1,6 +1,7 @@ -import { Add, ApplyRewrite, Commutativity, Flip, Identity } from './index'; +import { Add, Assoc0, Commutativity, Identity } from './index'; +import { ApplyRewrite, ChainRewrites, Flip } from './util'; -type Eq = ([a] extends [b] ? ([b] extends [a] ? true : false) : false) & { a: a; b: b }; +type Eq = ([a] extends [b] ? ([b] extends [a] ? true : false & { a: a; b: b }) : false & { a: a; b: b }); type assert = T; export type _testCases = { @@ -22,6 +23,7 @@ export type _testCases = { Add<'A', Add<'B', 'C'>> >>, ], + Commutativity: [ assert, Commutativity<'A', 'B'>>, @@ -36,4 +38,40 @@ export type _testCases = { Add<'A', Add<'C', 'B'>> >>, ], + + ChainRewrites: [ + assert, + Identity<'B'>, + ], + Add, 'C'> + >, + Add<'B', 'C'> + >>, + assert, + Identity<'B'>, + Flip>>, + Commutativity, '0'>, + ], + Add, 'C'> + >, + Add<'0', Add<'B', 'C'>> + >>, + ], + + Assoc0: [ + assert, 'C'>, Assoc0<'B', 'C'>>, + Add<'0', Add<'B', 'C'>> + >>, + assert>, 'C'>, Assoc0, 'C'>>, + Add<'0', Add, 'C'>> + >>, + ], }; diff --git a/src/util.ts b/src/util.ts new file mode 100644 index 0000000..5556f70 --- /dev/null +++ b/src/util.ts @@ -0,0 +1,31 @@ +export type Op = string | { op: string; a: Op; b: Op }; + +export type Rewrite = { + type: 'rewrite'; + left: left; + right: right; +}; + +export type Flip> = Rewrite; + +export type ApplyRewrite> = + O extends R['left'] ? R['right'] + : O extends string ? O + : O extends { a: Op, b: Op, op: string } ? ( + ApplyRewrite extends O['a'] + ? Omit & { b: ApplyRewrite } + : Omit & { a: ApplyRewrite } + ) + : never; + +// interface Kind { +// _: V; +// return: unknown; +// } +// type Ap = (K & { _: V })['return']; + +export type ChainRewrites[], O extends Op> = + Rws extends [] ? O + : Rws extends [infer R extends Rewrite, ...infer Rs extends Rewrite[]] + ? ChainRewrites> + : never; -- cgit v1.3.1