feat: basic parsing for expressions

1 files changed, 40 insertions, 9 deletions

diff --git a/src/index.ts b/src/index.ts
index 95a5411..75bc1af 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -6,19 +6,36 @@ import {
   integer,
   many1,
   mapTo,
+  matchChar,
   optional,
   or,
   pair,
+  Parser,
   symbol,
+  tuple3,
 } from './parser'
 
 export const start = mapTo(symbol('^'), constant({ tag: 'Start' } as Expr))
 export const end = mapTo(symbol('$'), constant({ tag: 'End' } as Expr))
-export const anyItem = mapTo(symbol(','), constant({ tag: 'AnyItem' } as Expr))
+export const anyItem = mapTo(symbol('.'), constant({ tag: 'AnyItem' } as Expr))
 export const nextItem = mapTo(
   symbol(','),
   constant({ tag: 'NextItem' } as Expr)
 )
+export const anyString = mapTo(
+  symbol('\\s'),
+  constant({ tag: 'AnyString' } as Expr)
+)
+export const anyNumber = mapTo(
+  symbol('\\n'),
+  constant({ tag: 'AnyNumber' } as Expr)
+)
+export const anyBool = mapTo(
+  symbol('\\b'),
+  constant({ tag: 'AnyBool' } as Expr)
+)
+export const truthy = mapTo(symbol('\\T'), constant({ tag: 'Truthy' } as Expr))
+export const falsey = mapTo(symbol('\\F'), constant({ tag: 'Falsey' } as Expr))
 // export const optional = mapTo(symbol('?'), constant({ tag: 'Optional' } as Expr))
 // export const zeroOrMore = mapTo(symbol('*'), constant({ tag: 'ZeroOrMore' } as Expr))
 // export const oneOrMore = mapTo(symbol('+'), constant({ tag: 'OneOrMore' } as Expr))
@@ -32,18 +49,32 @@ type Expr =
   | { tag: 'NextItem' }
   | { tag: 'AnyItem' }
   | { tag: 'Or' }
-  | { tag: 'String' }
-  | { tag: 'Number' }
-  | { tag: 'Bool' }
+  | { tag: 'AnyString' }
+  | { tag: 'AnyNumber' }
+  | { tag: 'AnyBool' }
   | { tag: 'Truthy' }
   | { tag: 'Falsey' }
+  | { tag: 'Group'; exprs: Expr[] }
 
-export const expressionP = or([
-  symbol('fuck'),
-  mapTo(many1(digit), (j) => j.join('')),
-])
+export const expressionP: Parser<Expr> = (input: string) =>
+  pipe(
+    input,
+    or([
+      mapTo(
+        delimited(symbol('('), many1(expressionP), symbol(')')),
+        (exprs) => ({ tag: 'Group', exprs })
+      ),
+      nextItem,
+      anyItem,
+      anyString,
+      anyNumber,
+      anyBool,
+      truthy,
+      falsey,
+    ])
+  )
 
-export const parser = pair(pair(optional(start), expressionP), optional(end))
+export const parser = tuple3(optional(start), many1(expressionP), optional(end))
 
 /*