Compare commits
No commits in common. "main" and "0.15.0" have entirely different histories.
37
README.md
37
README.md
@ -11,11 +11,12 @@ tricu is the word for "tree" in Lojban: `(x1) is a tree of species/cultivar (x2)
|
||||
## Features
|
||||
|
||||
- Tree Calculus operator: `t`
|
||||
- Immutable definitions: `x = t t`
|
||||
- Lambda abstraction: `id = (a : a)`
|
||||
- Assignments: `x = t t`
|
||||
- Immutable definitions
|
||||
- Lambda abstraction syntax: `id = (\a : a)`
|
||||
- List, Number, and String literals: `[(2) ("Hello")]`
|
||||
- Function application: `not (not false)`
|
||||
- Higher order/first-class functions: `map (a : append a "!") [("Hello")]`
|
||||
- Higher order/first-class functions: `map (\a : append a "!") [("Hello")]`
|
||||
- Intensionality blurs the distinction between functions and data (see REPL examples)
|
||||
- Simple module system for code organization
|
||||
|
||||
@ -23,15 +24,15 @@ tricu is the word for "tree" in Lojban: `(x1) is a tree of species/cultivar (x2)
|
||||
|
||||
```
|
||||
tricu < -- Anything after `--` on a single line is a comment
|
||||
tricu < id = (a : a) -- Lambda abstraction is eliminated to tree calculus terms
|
||||
tricu < head (map (i : append i " world!") [("Hello, ")])
|
||||
tricu < id = (\a : a) -- Lambda abstraction is eliminated to tree calculus terms
|
||||
tricu < head (map (\i : append i " world!") [("Hello, ")])
|
||||
tricu > "Hello, world!"
|
||||
tricu < id (head (map (i : append i " world!") [("Hello, ")]))
|
||||
tricu < id (head (map (\i : append i " world!") [("Hello, ")]))
|
||||
tricu > "Hello, world!"
|
||||
|
||||
tricu < -- Intensionality! We can inspect the structure of a function or data.
|
||||
tricu < triage = (a b c : t (t a b) c)
|
||||
tricu < test = triage "Leaf" (z : "Stem") (a b : "Fork")
|
||||
tricu < triage = (\a b c : t (t a b) c)
|
||||
tricu < test = triage "Leaf" (\z : "Stem") (\a b : "Fork")
|
||||
tricu < test (t t)
|
||||
tricu > "Stem"
|
||||
tricu < -- We can even convert a term back to source code (/demos/toSource.tri)
|
||||
@ -40,21 +41,13 @@ tricu > "(t (t (t t) (t t t)) (t t (t t t)))"
|
||||
tricu < -- or calculate its size (/demos/size.tri)
|
||||
tricu < size not?
|
||||
tricu > 12
|
||||
|
||||
tricu < -- REPL Commands:
|
||||
tricu < !definitions -- Lists all available definitions
|
||||
tricu < !output -- Change output format (Tree, FSL, AST, etc.)
|
||||
tricu < !import -- Import definitions from a file
|
||||
tricu < !exit -- Exit the REPL
|
||||
tricu < !clear -- ANSI screen clear
|
||||
tricu < !save -- Save all REPL definitions to a file that you can !import
|
||||
tricu < !reset -- Clear all REPL definitions
|
||||
tricu < !version -- Print tricu version
|
||||
```
|
||||
|
||||
## Installation and Use
|
||||
|
||||
You can easily build and run this project using [Nix](https://nixos.org/download/).
|
||||
[Releases are available for Linux.](https://git.eversole.co/James/tricu/releases)
|
||||
|
||||
Or you can easily build and run this project using [Nix](https://nixos.org/download/).
|
||||
|
||||
- Quick Start (REPL):
|
||||
- `nix run git+https://git.eversole.co/James/tricu`
|
||||
@ -91,12 +84,6 @@ tricu decode [OPTIONS]
|
||||
Defaults to stdin.
|
||||
```
|
||||
|
||||
## Collaborating
|
||||
|
||||
I am happy to accept issue reports, pull requests, or questions about tricu [via email](mailto:james@eversole.co).
|
||||
|
||||
If you want to collaborate but don't want to email back-and-forth, please reach out via email once to let me know and I will provision a git.eversole.co account for you.
|
||||
|
||||
## Acknowledgements
|
||||
|
||||
Tree Calculus was discovered by [Barry Jay](https://github.com/barry-jay-personal/blog).
|
||||
|
||||
@ -11,17 +11,20 @@ demo_true = t t
|
||||
not_TC? = t (t (t t) (t t t)) (t t (t t t))
|
||||
|
||||
-- /demos/toSource.tri contains an explanation of `triage`
|
||||
demo_triage = a b c : t (t a b) c
|
||||
demo_matchBool = a b : demo_triage b (_ : a) (_ _ : a)
|
||||
|
||||
demo_triage = \a b c : t (t a b) c
|
||||
demo_matchBool = (\ot of : demo_triage
|
||||
of
|
||||
(\_ : ot)
|
||||
(\_ _ : ot)
|
||||
)
|
||||
-- Lambda representation of the Boolean `not` function
|
||||
not_Lambda? = demo_matchBool demo_false demo_true
|
||||
|
||||
-- As tricu eliminates Lambda terms to SKI combinators, the tree form of many
|
||||
-- Since tricu eliminates Lambda terms to SKI combinators, the tree form of many
|
||||
-- functions defined via Lambda terms are larger than the most efficient TC
|
||||
-- representation possible. Between different languages that evaluate to tree
|
||||
-- calculus terms, the exact implementation of Lambda elimination may differ
|
||||
-- and lead to different trees even if they share extensional behavior.
|
||||
-- representation. Between different languages that evaluate to tree calculus
|
||||
-- terms, the exact implementation of Lambda elimination may differ and lead
|
||||
-- to different tree representations even if they share extensional behavior.
|
||||
|
||||
-- Let's see if these are the same:
|
||||
lambdaEqualsTC = equal? not_TC? not_Lambda?
|
||||
|
||||
@ -18,47 +18,47 @@ main = exampleTwo
|
||||
-- / / \
|
||||
-- 4 5 6
|
||||
|
||||
label = node : head node
|
||||
label = \node : head node
|
||||
|
||||
left = node : (if (emptyList? node)
|
||||
[]
|
||||
(if (emptyList? (tail node))
|
||||
[]
|
||||
left = (\node : if (emptyList? node)
|
||||
[]
|
||||
(if (emptyList? (tail node))
|
||||
[]
|
||||
(head (tail node))))
|
||||
|
||||
right = node : (if (emptyList? node)
|
||||
[]
|
||||
(if (emptyList? (tail node))
|
||||
[]
|
||||
(if (emptyList? (tail (tail node)))
|
||||
[]
|
||||
right = (\node : if (emptyList? node)
|
||||
[]
|
||||
(if (emptyList? (tail node))
|
||||
[]
|
||||
(if (emptyList? (tail (tail node)))
|
||||
[]
|
||||
(head (tail (tail node))))))
|
||||
|
||||
processLevel = y (self queue : if (emptyList? queue)
|
||||
[]
|
||||
(pair (map label queue) (self (filter
|
||||
(node : not? (emptyList? node))
|
||||
processLevel = y (\self queue : if (emptyList? queue)
|
||||
[]
|
||||
(pair (map label queue) (self (filter
|
||||
(\node : not? (emptyList? node))
|
||||
(append (map left queue) (map right queue))))))
|
||||
|
||||
levelOrderTraversal_ = a : processLevel (t a t)
|
||||
levelOrderTraversal_ = \a : processLevel (t a t)
|
||||
|
||||
toLineString = y (self levels : if (emptyList? levels)
|
||||
""
|
||||
(append
|
||||
(append (map (x : append x " ") (head levels)) "")
|
||||
toLineString = y (\self levels : if (emptyList? levels)
|
||||
""
|
||||
(append
|
||||
(append (map (\x : append x " ") (head levels)) "")
|
||||
(if (emptyList? (tail levels)) "" (append (t (t 10 t) t) (self (tail levels))))))
|
||||
|
||||
levelOrderToString = s : toLineString (levelOrderTraversal_ s)
|
||||
levelOrderToString = \s : toLineString (levelOrderTraversal_ s)
|
||||
|
||||
flatten = foldl (acc x : append acc x) ""
|
||||
flatten = foldl (\acc x : append acc x) ""
|
||||
|
||||
levelOrderTraversal = s : append (t 10 t) (flatten (levelOrderToString s))
|
||||
levelOrderTraversal = \s : append (t 10 t) (flatten (levelOrderToString s))
|
||||
|
||||
exampleOne = levelOrderTraversal [("1")
|
||||
[("2") [("4") t t] t]
|
||||
exampleOne = levelOrderTraversal [("1")
|
||||
[("2") [("4") t t] t]
|
||||
[("3") [("5") t t] [("6") t t]]]
|
||||
|
||||
exampleTwo = levelOrderTraversal [("1")
|
||||
[("2") [("4") [("8") t t] [("9") t t]]
|
||||
[("6") [("10") t t] [("12") t t]]]
|
||||
exampleTwo = levelOrderTraversal [("1")
|
||||
[("2") [("4") [("8") t t] [("9") t t]]
|
||||
[("6") [("10") t t] [("12") t t]]]
|
||||
[("3") [("5") [("11") t t] t] [("7") t t]]]
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
!import "../lib/patterns.tri" !Local
|
||||
|
||||
-- We can do conditional pattern matching by providing a list of lists, where
|
||||
-- each sublist contains a boolean expression and a function to return if said
|
||||
-- boolean expression evaluates to true.
|
||||
|
||||
value = 42
|
||||
main = match value [[(equal? "Hello") (_ : ", world!")] [(equal? 42) (_ : "The answer.")]]
|
||||
|
||||
-- < main
|
||||
-- > "The answer."
|
||||
|
||||
matchExample = (x : match x
|
||||
[[(equal? 1) (_ : "one")]
|
||||
[(equal? 2) (_ : "two")]
|
||||
[(equal? 3) (_ : "three")]
|
||||
[(equal? 4) (_ : "four")]
|
||||
[(equal? 5) (_ : "five")]
|
||||
[(equal? 6) (_ : "six")]
|
||||
[(equal? 7) (_ : "seven")]
|
||||
[(equal? 8) (_ : "eight")]
|
||||
[(equal? 9) (_ : "nine")]
|
||||
[(equal? 10) (_ : "ten")]
|
||||
[ otherwise (_ : "I ran out of fingers!")]])
|
||||
|
||||
-- < matchExample 3
|
||||
-- > "three"
|
||||
-- < matchExample 5
|
||||
-- > "five"
|
||||
-- < matchExample 9
|
||||
-- > "nine"
|
||||
-- < matchExample 11
|
||||
-- > "I ran out of fingers!"
|
||||
-- < matchExample "three"
|
||||
-- > "I ran out of fingers!"
|
||||
-- < matchExample [("hello") ("world")]
|
||||
-- > "I ran out of fingers!"
|
||||
@ -3,9 +3,11 @@
|
||||
|
||||
main = size size
|
||||
|
||||
size = x : y (self x : compose succ (triage
|
||||
id
|
||||
self
|
||||
(x y : compose (self x) (self y))
|
||||
x)
|
||||
) x 0
|
||||
size = (\x :
|
||||
(y (\self x :
|
||||
compose succ
|
||||
(triage
|
||||
(\x : x)
|
||||
self
|
||||
(\x y : compose (self x) (self y))
|
||||
x)) x 0))
|
||||
|
||||
@ -18,25 +18,25 @@ main = toSource not?
|
||||
sourceLeaf = t (head "t")
|
||||
|
||||
-- Stem case
|
||||
sourceStem = convert : (a rest :
|
||||
sourceStem = (\convert : (\a rest :
|
||||
t (head "(") -- Start with a left parenthesis "(".
|
||||
(t (head "t") -- Add a "t"
|
||||
(t (head " ") -- Add a space.
|
||||
(convert a -- Recursively convert the argument.
|
||||
(t (head ")") rest))))) -- Close with ")" and append the rest.
|
||||
(t (head ")") rest)))))) -- Close with ")" and append the rest.
|
||||
|
||||
-- Fork case
|
||||
sourceFork = convert : (a b rest :
|
||||
sourceFork = (\convert : (\a b rest :
|
||||
t (head "(") -- Start with a left parenthesis "(".
|
||||
(t (head "t") -- Add a "t"
|
||||
(t (head " ") -- Add a space.
|
||||
(convert a -- Recursively convert the first arg.
|
||||
(t (head " ") -- Add another space.
|
||||
(convert b -- Recursively convert the second arg.
|
||||
(t (head ")") rest))))))) -- Close with ")" and append the rest.
|
||||
(t (head ")") rest)))))))) -- Close with ")" and append the rest.
|
||||
|
||||
-- Wrapper around triage
|
||||
toSource_ = y (self arg :
|
||||
toSource_ = y (\self arg :
|
||||
triage
|
||||
sourceLeaf -- `triage` "a" case, Leaf
|
||||
(sourceStem self) -- `triage` "b" case, Stem
|
||||
@ -44,7 +44,7 @@ toSource_ = y (self arg :
|
||||
arg) -- The term to be inspected
|
||||
|
||||
-- toSource takes a single TC term and returns a String
|
||||
toSource = v : toSource_ v ""
|
||||
toSource = \v : toSource_ v ""
|
||||
|
||||
exampleOne = toSource true -- OUT: "(t t)"
|
||||
exampleTwo = toSource not? -- OUT: "(t (t (t t) (t t t)) (t t (t t t)))"
|
||||
|
||||
64
lib/base.tri
64
lib/base.tri
@ -1,74 +1,74 @@
|
||||
false = t
|
||||
_ = t
|
||||
true = t t
|
||||
id = a : a
|
||||
const = a b : a
|
||||
id = \a : a
|
||||
const = \a b : a
|
||||
pair = t
|
||||
if = cond then else : t (t else (t t then)) t cond
|
||||
if = \cond then else : t (t else (t t then)) t cond
|
||||
|
||||
y = ((mut wait fun : wait mut (x : fun (wait mut x)))
|
||||
(x : x x)
|
||||
(a0 a1 a2 : t (t a0) (t t a2) a1))
|
||||
y = ((\mut wait fun : wait mut (\x : fun (wait mut x)))
|
||||
(\x : x x)
|
||||
(\a0 a1 a2 : t (t a0) (t t a2) a1))
|
||||
|
||||
compose = f g x : f (g x)
|
||||
compose = \f g x : f (g x)
|
||||
|
||||
triage = leaf stem fork : t (t leaf stem) fork
|
||||
test = triage "Leaf" (_ : "Stem") (_ _ : "Fork")
|
||||
triage = \leaf stem fork : t (t leaf stem) fork
|
||||
test = triage "Leaf" (\_ : "Stem") (\_ _ : "Fork")
|
||||
|
||||
matchBool = (ot of : triage
|
||||
matchBool = (\ot of : triage
|
||||
of
|
||||
(_ : ot)
|
||||
(_ _ : ot)
|
||||
(\_ : ot)
|
||||
(\_ _ : ot)
|
||||
)
|
||||
|
||||
lAnd = (triage
|
||||
(_ : false)
|
||||
(_ x : x)
|
||||
(_ _ x : x))
|
||||
(\_ : false)
|
||||
(\_ x : x)
|
||||
(\_ _ x : x))
|
||||
|
||||
lOr = (triage
|
||||
(x : x)
|
||||
(_ _ : true)
|
||||
(_ _ _ : true))
|
||||
(\x : x)
|
||||
(\_ _ : true)
|
||||
(\_ _ _ : true))
|
||||
|
||||
matchPair = a : triage _ _ a
|
||||
matchPair = \a : triage _ _ a
|
||||
|
||||
not? = matchBool false true
|
||||
and? = matchBool id (_ : false)
|
||||
and? = matchBool id (\_ : false)
|
||||
|
||||
or? = (x z :
|
||||
or? = (\x z :
|
||||
matchBool
|
||||
(matchBool true true z)
|
||||
(matchBool true false z)
|
||||
x)
|
||||
|
||||
xor? = (x z :
|
||||
xor? = (\x z :
|
||||
matchBool
|
||||
(matchBool false true z)
|
||||
(matchBool true false z)
|
||||
x)
|
||||
|
||||
equal? = y (self : triage
|
||||
equal? = y (\self : triage
|
||||
(triage
|
||||
true
|
||||
(_ : false)
|
||||
(_ _ : false))
|
||||
(ax :
|
||||
(\_ : false)
|
||||
(\_ _ : false))
|
||||
(\ax :
|
||||
triage
|
||||
false
|
||||
(self ax)
|
||||
(_ _ : false))
|
||||
(ax ay :
|
||||
(\_ _ : false))
|
||||
(\ax ay :
|
||||
triage
|
||||
false
|
||||
(_ : false)
|
||||
(bx by : lAnd (self ax bx) (self ay by))))
|
||||
(\_ : false)
|
||||
(\bx by : lAnd (self ax bx) (self ay by))))
|
||||
|
||||
succ = y (self :
|
||||
succ = y (\self :
|
||||
triage
|
||||
1
|
||||
t
|
||||
(triage
|
||||
(t (t t))
|
||||
(_ tail : t t (self tail))
|
||||
(\_ tail : t t (self tail))
|
||||
t))
|
||||
|
||||
83
lib/list.tri
83
lib/list.tri
@ -1,70 +1,77 @@
|
||||
!import "base.tri" !Local
|
||||
|
||||
_ = t
|
||||
matchList = \a b : triage a _ b
|
||||
|
||||
matchList = a b : triage a _ b
|
||||
emptyList? = matchList true (\_ _ : false)
|
||||
head = matchList t (\head _ : head)
|
||||
tail = matchList t (\_ tail : tail)
|
||||
|
||||
emptyList? = matchList true (_ _ : false)
|
||||
head = matchList t (head _ : head)
|
||||
tail = matchList t (_ tail : tail)
|
||||
append = y (\self : matchList
|
||||
(\k : k)
|
||||
(\h r k : pair h (self r k)))
|
||||
|
||||
append = y (self : matchList
|
||||
(k : k)
|
||||
(h r k : pair h (self r k)))
|
||||
|
||||
lExist? = y (self x : matchList
|
||||
lExist? = y (\self x : matchList
|
||||
false
|
||||
(h z : or? (equal? x h) (self x z)))
|
||||
(\h z : or? (equal? x h) (self x z)))
|
||||
|
||||
map_ = y (self :
|
||||
map_ = y (\self :
|
||||
matchList
|
||||
(_ : t)
|
||||
(head tail f : pair (f head) (self tail f)))
|
||||
map = f l : map_ l f
|
||||
(\_ : t)
|
||||
(\head tail f : pair (f head) (self tail f)))
|
||||
map = \f l : map_ l f
|
||||
|
||||
filter_ = y (self : matchList
|
||||
(_ : t)
|
||||
(head tail f : matchBool (t head) id (f head) (self tail f)))
|
||||
filter = f l : filter_ l f
|
||||
filter_ = y (\self : matchList
|
||||
(\_ : t)
|
||||
(\head tail f : matchBool (t head) id (f head) (self tail f)))
|
||||
filter = \f l : filter_ l f
|
||||
|
||||
foldl_ = y (self f l x : matchList (acc : acc) (head tail acc : self f tail (f acc head)) l x)
|
||||
foldl = f x l : foldl_ f l x
|
||||
foldl_ = y (\self f l x : matchList (\acc : acc) (\head tail acc : self f tail (f acc head)) l x)
|
||||
foldl = \f x l : foldl_ f l x
|
||||
|
||||
foldr_ = y (self x f l : matchList x (head tail : f (self x f tail) head) l)
|
||||
foldr = f x l : foldr_ x f l
|
||||
foldr_ = y (\self x f l : matchList x (\head tail : f (self x f tail) head) l)
|
||||
foldr = \f x l : foldr_ x f l
|
||||
|
||||
length = y (self : matchList
|
||||
length = y (\self : matchList
|
||||
0
|
||||
(_ tail : succ (self tail)))
|
||||
(\_ tail : succ (self tail)))
|
||||
|
||||
reverse = y (self : matchList
|
||||
reverse = y (\self : matchList
|
||||
t
|
||||
(head tail : append (self tail) (pair head t)))
|
||||
(\head tail : append (self tail) (pair head t)))
|
||||
|
||||
snoc = y (self x : matchList
|
||||
snoc = y (\self x : matchList
|
||||
(pair x t)
|
||||
(h z : pair h (self x z)))
|
||||
(\h z : pair h (self x z)))
|
||||
|
||||
count = y (self x : matchList
|
||||
count = y (\self x : matchList
|
||||
0
|
||||
(h z : matchBool
|
||||
(\h z : matchBool
|
||||
(succ (self x z))
|
||||
(self x z)
|
||||
(equal? x h)))
|
||||
|
||||
last = y (self : matchList
|
||||
last = y (\self : matchList
|
||||
t
|
||||
(hd tl : matchBool
|
||||
(\hd tl : matchBool
|
||||
hd
|
||||
(self tl)
|
||||
(emptyList? tl)))
|
||||
|
||||
all? = y (self pred : matchList
|
||||
all? = y (\self pred : matchList
|
||||
true
|
||||
(h z : and? (pred h) (self pred z)))
|
||||
(\h z : and? (pred h) (self pred z)))
|
||||
|
||||
any? = y (self pred : matchList
|
||||
any? = y (\self pred : matchList
|
||||
false
|
||||
(h z : or? (pred h) (self pred z)))
|
||||
(\h z : or? (pred h) (self pred z)))
|
||||
|
||||
intersect = xs ys : filter (x : lExist? x ys) xs
|
||||
unique_ = y (\self seen : matchList
|
||||
t
|
||||
(\head rest : matchBool
|
||||
(self seen rest)
|
||||
(pair head (self (pair head seen) rest))
|
||||
(lExist? head seen)))
|
||||
unique = \xs : unique_ t xs
|
||||
|
||||
intersect = \xs ys : filter (\x : lExist? x ys) xs
|
||||
union = \xs ys : unique (append xs ys)
|
||||
|
||||
@ -1,24 +1,35 @@
|
||||
!import "base.tri" !Local
|
||||
!import "list.tri" List
|
||||
!import "list.tri" !Local
|
||||
|
||||
match_ = y (self value patterns :
|
||||
match_ = y (\self value patterns :
|
||||
triage
|
||||
t
|
||||
(_ : t)
|
||||
(pattern rest :
|
||||
(\_ : t)
|
||||
(\pattern rest :
|
||||
triage
|
||||
t
|
||||
(_ : t)
|
||||
(test result :
|
||||
(\_ : t)
|
||||
(\test result :
|
||||
if (test value)
|
||||
(result value)
|
||||
(self value rest))
|
||||
pattern)
|
||||
patterns)
|
||||
|
||||
match = (value patterns :
|
||||
match_ value (List.map (sublist :
|
||||
pair (List.head sublist) (List.head (List.tail sublist)))
|
||||
match = (\value patterns :
|
||||
match_ value (map (\sublist :
|
||||
pair (head sublist) (head (tail sublist)))
|
||||
patterns))
|
||||
|
||||
otherwise = const (t t)
|
||||
|
||||
-- matchExample = (\x : match x [[(equal? 1) (\_ : "one")]
|
||||
-- [(equal? 2) (\_ : "two")]
|
||||
-- [(equal? 3) (\_ : "three")]
|
||||
-- [(equal? 4) (\_ : "four")]
|
||||
-- [(equal? 5) (\_ : "five")]
|
||||
-- [(equal? 6) (\_ : "six")]
|
||||
-- [(equal? 7) (\_ : "seven")]
|
||||
-- [(equal? 8) (\_ : "eight")]
|
||||
-- [(equal? 9) (\_ : "nine")]
|
||||
-- [(equal? 10) (\_ : "ten")]
|
||||
-- [ otherwise (\_ : "I ran out of fingers!")]])
|
||||
|
||||
@ -75,9 +75,6 @@ elimLambda = go
|
||||
go (SLambda [f] (SLambda [g] (SLambda [x] body)))
|
||||
| body == SApp (SVar f) (SApp (SVar g) (SVar x)) = _B
|
||||
-- General elimination
|
||||
go (SLambda [v] (SList xs))
|
||||
= elimLambda (SLambda [v] (foldr wrapTLeaf TLeaf xs))
|
||||
where wrapTLeaf m r = SApp (SApp TLeaf m) r
|
||||
go (SLambda (v:vs) body)
|
||||
| null vs = toSKI v (elimLambda body)
|
||||
| otherwise = elimLambda (SLambda [v] (SLambda vs body))
|
||||
|
||||
44
src/Lexer.hs
44
src/Lexer.hs
@ -3,7 +3,6 @@ module Lexer where
|
||||
import Research
|
||||
|
||||
import Control.Monad (void)
|
||||
import Data.Functor (($>))
|
||||
import Data.Void
|
||||
import Text.Megaparsec
|
||||
import Text.Megaparsec.Char hiding (space)
|
||||
@ -41,6 +40,7 @@ tricuLexer = do
|
||||
, try stringLiteral
|
||||
, assign
|
||||
, colon
|
||||
, backslash
|
||||
, openParen
|
||||
, closeParen
|
||||
, openBracket
|
||||
@ -54,7 +54,7 @@ lexTricu input = case runParser tricuLexer "" input of
|
||||
|
||||
|
||||
keywordT :: Lexer LToken
|
||||
keywordT = string "t" *> notFollowedBy alphaNumChar $> LKeywordT
|
||||
keywordT = string "t" *> notFollowedBy alphaNumChar *> pure LKeywordT
|
||||
|
||||
identifier :: Lexer LToken
|
||||
identifier = do
|
||||
@ -63,7 +63,7 @@ identifier = do
|
||||
<|> digitChar <|> char '_' <|> char '-' <|> char '?'
|
||||
<|> char '$' <|> char '#' <|> char '@' <|> char '%'
|
||||
let name = first : rest
|
||||
if name == "t" || name == "!result"
|
||||
if (name == "t" || name == "!result")
|
||||
then fail "Keywords (`t`, `!result`) cannot be used as an identifier"
|
||||
else return (LIdentifier name)
|
||||
|
||||
@ -76,7 +76,7 @@ namespace = do
|
||||
return (LNamespace name)
|
||||
|
||||
dot :: Lexer LToken
|
||||
dot = char '.' $> LDot
|
||||
dot = char '.' *> pure LDot
|
||||
|
||||
lImport :: Lexer LToken
|
||||
lImport = do
|
||||
@ -88,25 +88,28 @@ lImport = do
|
||||
return (LImport path name)
|
||||
|
||||
assign :: Lexer LToken
|
||||
assign = char '=' $> LAssign
|
||||
assign = char '=' *> pure LAssign
|
||||
|
||||
colon :: Lexer LToken
|
||||
colon = char ':' $> LColon
|
||||
colon = char ':' *> pure LColon
|
||||
|
||||
backslash :: Lexer LToken
|
||||
backslash = char '\\' *> pure LBackslash
|
||||
|
||||
openParen :: Lexer LToken
|
||||
openParen = char '(' $> LOpenParen
|
||||
openParen = char '(' *> pure LOpenParen
|
||||
|
||||
closeParen :: Lexer LToken
|
||||
closeParen = char ')' $> LCloseParen
|
||||
closeParen = char ')' *> pure LCloseParen
|
||||
|
||||
openBracket :: Lexer LToken
|
||||
openBracket = char '[' $> LOpenBracket
|
||||
openBracket = char '[' *> pure LOpenBracket
|
||||
|
||||
closeBracket :: Lexer LToken
|
||||
closeBracket = char ']' $> LCloseBracket
|
||||
closeBracket = char ']' *> pure LCloseBracket
|
||||
|
||||
lnewline :: Lexer LToken
|
||||
lnewline = char '\n' $> LNewline
|
||||
lnewline = char '\n' *> pure LNewline
|
||||
|
||||
sc :: Lexer ()
|
||||
sc = space
|
||||
@ -122,22 +125,7 @@ integerLiteral = do
|
||||
stringLiteral :: Lexer LToken
|
||||
stringLiteral = do
|
||||
char '"'
|
||||
content <- manyTill Lexer.charLiteral (char '"')
|
||||
content <- many (noneOf ['"'])
|
||||
char '"' --"
|
||||
return (LStringLiteral content)
|
||||
|
||||
charLiteral :: Lexer Char
|
||||
charLiteral = escapedChar <|> normalChar
|
||||
where
|
||||
normalChar = noneOf ['"', '\\']
|
||||
escapedChar = do
|
||||
void $ char '\\'
|
||||
c <- oneOf ['n', 't', 'r', 'f', 'b', '\\', '"', '\'']
|
||||
return $ case c of
|
||||
'n' -> '\n'
|
||||
't' -> '\t'
|
||||
'r' -> '\r'
|
||||
'f' -> '\f'
|
||||
'b' -> '\b'
|
||||
'\\' -> '\\'
|
||||
'"' -> '"'
|
||||
'\'' -> '\''
|
||||
|
||||
@ -3,12 +3,12 @@ module Parser where
|
||||
import Lexer
|
||||
import Research
|
||||
|
||||
import Control.Monad (void)
|
||||
import Control.Monad (void)
|
||||
import Control.Monad.State
|
||||
import Data.List.NonEmpty (toList)
|
||||
import Data.Void (Void)
|
||||
import Data.List.NonEmpty (toList)
|
||||
import Data.Void (Void)
|
||||
import Text.Megaparsec
|
||||
import Text.Megaparsec.Error (ParseErrorBundle, errorBundlePretty)
|
||||
import Text.Megaparsec.Error (ParseErrorBundle, errorBundlePretty)
|
||||
import qualified Data.Set as Set
|
||||
|
||||
data PState = PState
|
||||
@ -130,6 +130,7 @@ parseFunctionM = do
|
||||
parseLambdaM :: ParserM TricuAST
|
||||
parseLambdaM = do
|
||||
let ident = (\case LIdentifier _ -> True; _ -> False)
|
||||
_ <- satisfyM (== LBackslash)
|
||||
params <- some (satisfyM ident)
|
||||
_ <- satisfyM (== LColon)
|
||||
scnParserM
|
||||
@ -144,11 +145,11 @@ parseLambdaExpressionM = choice
|
||||
|
||||
parseAtomicLambdaM :: ParserM TricuAST
|
||||
parseAtomicLambdaM = choice
|
||||
[ try parseLambdaM
|
||||
, parseVarM
|
||||
[ parseVarM
|
||||
, parseTreeLeafM
|
||||
, parseLiteralM
|
||||
, parseListLiteralM
|
||||
, try parseLambdaM
|
||||
, between (satisfyM (== LOpenParen)) (satisfyM (== LCloseParen)) parseLambdaExpressionM
|
||||
]
|
||||
|
||||
@ -204,8 +205,7 @@ parseTreeLeafOrParenthesizedM = choice
|
||||
|
||||
parseAtomicM :: ParserM TricuAST
|
||||
parseAtomicM = choice
|
||||
[ try parseLambdaM
|
||||
, parseVarM
|
||||
[ parseVarM
|
||||
, parseTreeLeafM
|
||||
, parseListLiteralM
|
||||
, parseGroupedM
|
||||
|
||||
176
src/REPL.hs
176
src/REPL.hs
@ -6,30 +6,26 @@ import Lexer
|
||||
import Parser
|
||||
import Research
|
||||
|
||||
import Control.Exception (IOException, SomeException, catch
|
||||
, displayException)
|
||||
import Control.Monad (forM_)
|
||||
import Control.Monad.Catch (handle, MonadCatch)
|
||||
import Control.Exception (SomeException, catch)
|
||||
import Control.Monad.IO.Class (liftIO)
|
||||
import Control.Monad.Catch (handle, MonadCatch)
|
||||
import Control.Monad.Trans.Class (lift)
|
||||
import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)
|
||||
import Data.Char (isSpace, isUpper)
|
||||
import Data.List (dropWhile, dropWhileEnd, isPrefixOf)
|
||||
import Data.Version (showVersion)
|
||||
import Paths_tricu (version)
|
||||
import Data.Char (isSpace)
|
||||
import Data.List ( dropWhile
|
||||
, dropWhileEnd
|
||||
, isPrefixOf)
|
||||
import System.Console.Haskeline
|
||||
|
||||
import qualified Data.Map as Map
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Text.IO as T
|
||||
|
||||
repl :: Env -> IO ()
|
||||
repl env = runInputT settings (withInterrupt (loop env Decode))
|
||||
repl env = runInputT settings (withInterrupt (loop env True))
|
||||
where
|
||||
settings :: Settings IO
|
||||
settings = Settings
|
||||
{ complete = completeWord Nothing " \t" completeCommands
|
||||
, historyFile = Just "~/.local/state/tricu/history"
|
||||
, historyFile = Just ".tricu_history"
|
||||
, autoAddHistory = True
|
||||
}
|
||||
|
||||
@ -37,35 +33,19 @@ repl env = runInputT settings (withInterrupt (loop env Decode))
|
||||
completeCommands str = return $ map simpleCompletion $
|
||||
filter (str `isPrefixOf`) commands
|
||||
where
|
||||
commands = [ "!exit"
|
||||
, "!output"
|
||||
, "!definitions"
|
||||
, "!import"
|
||||
, "!clear"
|
||||
, "!save"
|
||||
, "!reset"
|
||||
, "!version"
|
||||
]
|
||||
commands = ["!exit", "!decode", "!definitions", "!import"]
|
||||
|
||||
loop :: Env -> EvaluatedForm -> InputT IO ()
|
||||
loop env form = handle (interruptHandler env form) $ do
|
||||
loop :: Env -> Bool -> InputT IO ()
|
||||
loop env decode = handle (interruptHandler env decode) $ do
|
||||
minput <- getInputLine "tricu < "
|
||||
case minput of
|
||||
Nothing -> outputStrLn "Exiting tricu"
|
||||
Just s
|
||||
| strip s == "" -> loop env form
|
||||
| strip s == "" -> loop env decode
|
||||
| strip s == "!exit" -> outputStrLn "Exiting tricu"
|
||||
| strip s == "!clear" -> do
|
||||
liftIO $ putStr "\ESC[2J\ESC[H"
|
||||
loop env form
|
||||
| strip s == "!reset" -> do
|
||||
outputStrLn "Environment reset to initial state"
|
||||
loop Map.empty form
|
||||
| strip s == "!version" -> do
|
||||
outputStrLn $ "tricu version " ++ showVersion version
|
||||
loop env form
|
||||
| "!save" `isPrefixOf` strip s -> handleSave env form
|
||||
| strip s == "!output" -> handleOutput env form
|
||||
| strip s == "!decode" -> do
|
||||
outputStrLn $ "Decoding " ++ (if decode then "disabled" else "enabled")
|
||||
loop env (not decode)
|
||||
| strip s == "!definitions" -> do
|
||||
let defs = Map.keys $ Map.delete "!result" env
|
||||
if null defs
|
||||
@ -73,86 +53,57 @@ repl env = runInputT settings (withInterrupt (loop env Decode))
|
||||
else do
|
||||
outputStrLn "Available definitions:"
|
||||
mapM_ outputStrLn defs
|
||||
loop env form
|
||||
| "!import" `isPrefixOf` strip s -> handleImport env form
|
||||
| take 2 s == "--" -> loop env form
|
||||
loop env decode
|
||||
| "!import" `isPrefixOf` strip s -> handleImport env decode
|
||||
| take 2 s == "--" -> loop env decode
|
||||
| otherwise -> do
|
||||
newEnv <- liftIO $ processInput env s form `catch` errorHandler env
|
||||
loop newEnv form
|
||||
|
||||
handleOutput :: Env -> EvaluatedForm -> InputT IO ()
|
||||
handleOutput env currentForm = do
|
||||
let formats = [Decode, TreeCalculus, FSL, AST, Ternary, Ascii]
|
||||
outputStrLn "Available output formats:"
|
||||
mapM_ (\(i, f) -> outputStrLn $ show i ++ ". " ++ show f)
|
||||
(zip [1..] formats)
|
||||
newEnv <- liftIO $ processInput env s decode `catch` errorHandler env
|
||||
loop newEnv decode
|
||||
|
||||
handleImport :: Env -> Bool -> InputT IO ()
|
||||
handleImport env decode = do
|
||||
result <- runMaybeT $ do
|
||||
input <- MaybeT $ getInputLine "Select output format (1-6) < "
|
||||
case reads input of
|
||||
[(n, "")] | n >= 1 && n <= 6 ->
|
||||
return $ formats !! (n-1)
|
||||
_ -> MaybeT $ return Nothing
|
||||
|
||||
case result of
|
||||
Nothing -> do
|
||||
outputStrLn "Invalid selection. Keeping current output format."
|
||||
loop env currentForm
|
||||
Just newForm -> do
|
||||
outputStrLn $ "Output format changed to: " ++ show newForm
|
||||
loop env newForm
|
||||
|
||||
handleImport :: Env -> EvaluatedForm -> InputT IO ()
|
||||
handleImport env form = do
|
||||
res <- runMaybeT $ do
|
||||
let fset = setComplete completeFilename defaultSettings
|
||||
path <- MaybeT $ runInputT fset $
|
||||
let fileSettings = setComplete completeFilename defaultSettings
|
||||
path <- MaybeT $ runInputT fileSettings $
|
||||
getInputLineWithInitial "File path to load < " ("", "")
|
||||
|
||||
text <- MaybeT $ liftIO $ handle (\e -> do
|
||||
putStrLn $ "Error reading file: " ++ displayException (e :: IOException)
|
||||
return Nothing
|
||||
) $ Just <$> readFile (strip path)
|
||||
contents <- liftIO $ readFile (strip path)
|
||||
|
||||
case parseProgram (lexTricu text) of
|
||||
Left err -> do
|
||||
lift $ outputStrLn $ "Parse error: " ++ handleParseError err
|
||||
MaybeT $ return Nothing
|
||||
Right ast -> do
|
||||
ns <- MaybeT $ runInputT defaultSettings $
|
||||
getInputLineWithInitial "Namespace (or !Local for no namespace) < " ("", "")
|
||||
if | Left err <- parseProgram (lexTricu contents) -> do
|
||||
lift $ outputStrLn $ "Parse error: " ++ handleParseError err
|
||||
MaybeT $ return Nothing
|
||||
| Right ast <- parseProgram (lexTricu contents) -> do
|
||||
ns <- MaybeT $ runInputT defaultSettings $
|
||||
getInputLineWithInitial "Namespace (or !Local for no namespace) < " ("", "")
|
||||
|
||||
let name = strip ns
|
||||
if (name /= "!Local" && (null name || not (isUpper (head name)))) then do
|
||||
lift $ outputStrLn "Namespace must start with an uppercase letter"
|
||||
MaybeT $ return Nothing
|
||||
else do
|
||||
prog <- liftIO $ preprocessFile (strip path)
|
||||
let code = case name of
|
||||
"!Local" -> prog
|
||||
_ -> nsDefinitions name prog
|
||||
env' = evalTricu env code
|
||||
return env'
|
||||
case res of
|
||||
Nothing -> do
|
||||
outputStrLn "Import cancelled"
|
||||
loop env form
|
||||
Just env' ->
|
||||
loop (Map.delete "!result" env') form
|
||||
processedAst <- liftIO $ preprocessFile (strip path)
|
||||
let namespacedAst | strip ns == "!Local" = processedAst
|
||||
| otherwise = nsDefinitions (strip ns) processedAst
|
||||
loadedEnv = evalTricu env namespacedAst
|
||||
return loadedEnv
|
||||
|
||||
interruptHandler :: Env -> EvaluatedForm -> Interrupt -> InputT IO ()
|
||||
interruptHandler env form _ = do
|
||||
if | Nothing <- result -> do
|
||||
outputStrLn "Import cancelled."
|
||||
loop env decode
|
||||
| Just loadedEnv <- result ->
|
||||
loop (Map.delete "!result" loadedEnv) decode
|
||||
|
||||
interruptHandler :: Env -> Bool -> Interrupt -> InputT IO ()
|
||||
interruptHandler env decode _ = do
|
||||
outputStrLn "Interrupted with CTRL+C\n\
|
||||
\You can use the !exit command or CTRL+D to exit"
|
||||
loop env form
|
||||
loop env decode
|
||||
|
||||
processInput :: Env -> String -> EvaluatedForm -> IO Env
|
||||
processInput env input form = do
|
||||
processInput :: Env -> String -> Bool -> IO Env
|
||||
processInput env input decode = do
|
||||
let asts = parseTricu input
|
||||
newEnv = evalTricu env asts
|
||||
case Map.lookup "!result" newEnv of
|
||||
Just r -> do
|
||||
putStrLn $ "tricu > " ++ formatResult form r
|
||||
putStrLn $ "tricu > " ++
|
||||
if decode
|
||||
then decodeResult r
|
||||
else show r
|
||||
Nothing -> pure ()
|
||||
return newEnv
|
||||
|
||||
@ -163,28 +114,3 @@ repl env = runInputT settings (withInterrupt (loop env Decode))
|
||||
|
||||
strip :: String -> String
|
||||
strip = dropWhileEnd isSpace . dropWhile isSpace
|
||||
|
||||
handleSave :: Env -> EvaluatedForm -> InputT IO ()
|
||||
handleSave env form = do
|
||||
let fset = setComplete completeFilename defaultSettings
|
||||
path <- runInputT fset $
|
||||
getInputLineWithInitial "File to save < " ("", "")
|
||||
|
||||
case path of
|
||||
Nothing -> do
|
||||
outputStrLn "Save cancelled"
|
||||
loop env form
|
||||
Just p -> do
|
||||
let definitions = Map.toList $ Map.delete "!result" env
|
||||
filepath = strip p
|
||||
|
||||
outputStrLn "Starting save..."
|
||||
liftIO $ writeFile filepath ""
|
||||
outputStrLn "File created..."
|
||||
forM_ definitions $ \(name, value) -> do
|
||||
let content = name ++ " = " ++ formatResult TreeCalculus value ++ "\n"
|
||||
outputStrLn $ "Writing definition: " ++ name ++ " with length " ++ show (length content)
|
||||
liftIO $ appendFile filepath content
|
||||
outputStrLn $ "Saved " ++ show (length definitions) ++ " definitions to " ++ p
|
||||
|
||||
loop env form
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
module Research where
|
||||
|
||||
import Control.Monad.State
|
||||
import Data.List (intercalate)
|
||||
import Data.Map (Map)
|
||||
import Data.Text (Text, replace)
|
||||
@ -38,6 +39,7 @@ data LToken
|
||||
| LAssign
|
||||
| LColon
|
||||
| LDot
|
||||
| LBackslash
|
||||
| LOpenParen
|
||||
| LCloseParen
|
||||
| LOpenBracket
|
||||
@ -53,24 +55,15 @@ data EvaluatedForm = TreeCalculus | FSL | AST | Ternary | Ascii | Decode
|
||||
-- Environment containing previously evaluated TC terms
|
||||
type Env = Map.Map String T
|
||||
|
||||
-- Tree Calculus Reduction Rules
|
||||
{-
|
||||
The t operator is left associative.
|
||||
1. t t a b -> a
|
||||
2. t (t a) b c -> a c (b c)
|
||||
3a. t (t a b) c t -> a
|
||||
3b. t (t a b) c (t u) -> b u
|
||||
3c. t (t a b) c (t u v) -> c u v
|
||||
-}
|
||||
-- Tree Calculus Reduction
|
||||
apply :: T -> T -> T
|
||||
apply (Fork Leaf a) _ = a
|
||||
apply (Fork (Stem a) b) c = apply (apply a c) (apply b c)
|
||||
apply (Fork (Fork a b) c) Leaf = a
|
||||
apply (Fork (Fork a b) c) (Stem u) = apply b u
|
||||
apply (Fork (Fork a b) c) (Fork u v) = apply (apply c u) v
|
||||
-- Left associative `t`
|
||||
apply Leaf b = Stem b
|
||||
apply (Stem a) b = Fork a b
|
||||
apply Leaf b = Stem b
|
||||
apply (Stem a) b = Fork a b
|
||||
apply (Fork Leaf a) _ = a
|
||||
apply (Fork (Stem a1) a2) b = apply (apply a1 b) (apply a2 b)
|
||||
apply (Fork (Fork a1 a2) a3) Leaf = a1
|
||||
apply (Fork (Fork a1 a2) a3) (Stem u) = apply a2 u
|
||||
apply (Fork (Fork a1 a2) a3) (Fork u v) = apply (apply a3 u) v
|
||||
|
||||
-- Booleans
|
||||
_false :: T
|
||||
@ -84,7 +77,7 @@ _not = Fork (Fork _true (Fork Leaf _false)) Leaf
|
||||
|
||||
-- Marshalling
|
||||
ofString :: String -> T
|
||||
ofString str = ofList $ map (ofNumber . fromEnum) str
|
||||
ofString str = ofList (map ofNumber (map fromEnum str))
|
||||
|
||||
ofNumber :: Int -> T
|
||||
ofNumber 0 = Leaf
|
||||
@ -94,7 +87,8 @@ ofNumber n =
|
||||
(ofNumber (n `div` 2))
|
||||
|
||||
ofList :: [T] -> T
|
||||
ofList = foldr Fork Leaf
|
||||
ofList [] = Leaf
|
||||
ofList (x:xs) = Fork x (ofList xs)
|
||||
|
||||
toNumber :: T -> Either String Int
|
||||
toNumber Leaf = Right 0
|
||||
@ -132,7 +126,7 @@ toSimpleT s = T.unpack
|
||||
$ replace "Fork" "t"
|
||||
$ replace "Stem" "t"
|
||||
$ replace "Leaf" "t"
|
||||
$ T.pack s
|
||||
$ (T.pack s)
|
||||
|
||||
toTernaryString :: T -> String
|
||||
toTernaryString Leaf = "0"
|
||||
@ -159,18 +153,8 @@ toAscii tree = go tree "" True
|
||||
++ go right (prefix ++ (if isLast then " " else "| ")) True
|
||||
|
||||
decodeResult :: T -> String
|
||||
decodeResult Leaf = "t"
|
||||
decodeResult tc =
|
||||
case (toString tc, toList tc, toNumber tc) of
|
||||
(Right s, _, _) | all isCommonChar s -> "\"" ++ s ++ "\""
|
||||
(_, _, Right n) -> show n
|
||||
(_, Right xs@(_:_), _) -> "[" ++ intercalate ", " (map decodeResult xs) ++ "]"
|
||||
(_, Right [], _) -> "[]"
|
||||
_ -> formatResult TreeCalculus tc
|
||||
where
|
||||
isCommonChar c =
|
||||
let n = fromEnum c
|
||||
in (n >= 32 && n <= 126)
|
||||
|| n == 9
|
||||
|| n == 10
|
||||
|| n == 13
|
||||
decodeResult tc
|
||||
| Right num <- toNumber tc = show num
|
||||
| Right str <- toString tc = "\"" ++ str ++ "\""
|
||||
| Right list <- toList tc = "[" ++ intercalate ", " (map decodeResult list) ++ "]"
|
||||
| otherwise = formatResult TreeCalculus tc
|
||||
|
||||
114
test/Spec.hs
114
test/Spec.hs
@ -34,7 +34,6 @@ tests = testGroup "Tricu Tests"
|
||||
, fileEval
|
||||
, modules
|
||||
, demos
|
||||
, decoding
|
||||
]
|
||||
|
||||
lexer :: TestTree
|
||||
@ -51,22 +50,7 @@ lexer = testGroup "Lexer Tests"
|
||||
|
||||
, testCase "Lex escaped characters in strings" $ do
|
||||
let input = "\"hello\\nworld\""
|
||||
expect = Right [LStringLiteral "hello\nworld"]
|
||||
runParser tricuLexer "" input @?= expect
|
||||
|
||||
, testCase "Lex multiple escaped characters in strings" $ do
|
||||
let input = "\"tab:\\t newline:\\n quote:\\\" backslash:\\\\\""
|
||||
expect = Right [LStringLiteral "tab:\t newline:\n quote:\" backslash:\\"]
|
||||
runParser tricuLexer "" input @?= expect
|
||||
|
||||
, testCase "Lex escaped characters in string literals" $ do
|
||||
let input = "x = \"line1\\nline2\\tindented\""
|
||||
expect = Right [LIdentifier "x", LAssign, LStringLiteral "line1\nline2\tindented"]
|
||||
runParser tricuLexer "" input @?= expect
|
||||
|
||||
, testCase "Lex empty string with escape sequence" $ do
|
||||
let input = "\"\\\"\""
|
||||
expect = Right [LStringLiteral "\""]
|
||||
expect = Right [LStringLiteral "hello\\nworld"]
|
||||
runParser tricuLexer "" input @?= expect
|
||||
|
||||
, testCase "Lex mixed literals" $ do
|
||||
@ -102,7 +86,7 @@ parser = testGroup "Parser Tests"
|
||||
Right _ -> assertFailure "Expected failure when trying to assign the value of T"
|
||||
|
||||
, testCase "Parse function definitions" $ do
|
||||
let input = "x = (a b c : a)"
|
||||
let input = "x = (\\a b c : a)"
|
||||
expect = SDef "x" [] (SLambda ["a"] (SLambda ["b"] (SLambda ["c"] (SVar "a"))))
|
||||
parseSingle input @?= expect
|
||||
|
||||
@ -122,7 +106,7 @@ parser = testGroup "Parser Tests"
|
||||
parseSingle input @?= expect
|
||||
|
||||
, testCase "Parse function with applications" $ do
|
||||
let input = "f = (x : t x)"
|
||||
let input = "f = (\\x : t x)"
|
||||
expect = SDef "f" [] (SLambda ["x"] (SApp TLeaf (SVar "x")))
|
||||
parseSingle input @?= expect
|
||||
|
||||
@ -164,22 +148,22 @@ parser = testGroup "Parser Tests"
|
||||
parseSingle input @?= expect
|
||||
|
||||
, testCase "Parse nested parentheses in function body" $ do
|
||||
let input = "f = (x : t (t (t t)))"
|
||||
let input = "f = (\\x : t (t (t t)))"
|
||||
expect = SDef "f" [] (SLambda ["x"] (SApp TLeaf (SApp TLeaf (SApp TLeaf TLeaf))))
|
||||
parseSingle input @?= expect
|
||||
|
||||
, testCase "Parse lambda abstractions" $ do
|
||||
let input = "(a : a)"
|
||||
let input = "(\\a : a)"
|
||||
expect = (SLambda ["a"] (SVar "a"))
|
||||
parseSingle input @?= expect
|
||||
|
||||
, testCase "Parse multiple arguments to lambda abstractions" $ do
|
||||
let input = "x = (a b : a)"
|
||||
let input = "x = (\\a b : a)"
|
||||
expect = SDef "x" [] (SLambda ["a"] (SLambda ["b"] (SVar "a")))
|
||||
parseSingle input @?= expect
|
||||
|
||||
, testCase "Grouping T terms with parentheses in function application" $ do
|
||||
let input = "x = (a : a)\nx (t)"
|
||||
let input = "x = (\\a : a)\nx (t)"
|
||||
expect = [SDef "x" [] (SLambda ["a"] (SVar "a")),SApp (SVar "x") TLeaf]
|
||||
parseTricu input @?= expect
|
||||
|
||||
@ -274,7 +258,7 @@ simpleEvaluation = testGroup "Evaluation Tests"
|
||||
|
||||
, testCase "Apply identity to Boolean Not" $ do
|
||||
let not = "(t (t (t t) (t t t)) t)"
|
||||
let input = "x = (a : a)\nx " ++ not
|
||||
let input = "x = (\\a : a)\nx " ++ not
|
||||
env = evalTricu Map.empty (parseTricu input)
|
||||
result env @?= Fork (Fork (Stem Leaf) (Fork Leaf Leaf)) Leaf
|
||||
]
|
||||
@ -282,85 +266,81 @@ simpleEvaluation = testGroup "Evaluation Tests"
|
||||
lambdas :: TestTree
|
||||
lambdas = testGroup "Lambda Evaluation Tests"
|
||||
[ testCase "Lambda Identity Function" $ do
|
||||
let input = "id = (x : x)\nid t"
|
||||
let input = "id = (\\x : x)\nid t"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Lambda Constant Function (K combinator)" $ do
|
||||
let input = "k = (x y : x)\nk t (t t)"
|
||||
let input = "k = (\\x y : x)\nk t (t t)"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Lambda Application with Variable" $ do
|
||||
let input = "id = (x : x)\nval = t t\nid val"
|
||||
let input = "id = (\\x : x)\nval = t t\nid val"
|
||||
runTricu input @?= "Stem Leaf"
|
||||
|
||||
, testCase "Lambda Application with Multiple Arguments" $ do
|
||||
let input = "apply = (f x y : f x y)\nk = (a b : a)\napply k t (t t)"
|
||||
let input = "apply = (\\f x y : f x y)\nk = (\\a b : a)\napply k t (t t)"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Nested Lambda Application" $ do
|
||||
let input = "apply = (f x y : f x y)\nid = (x : x)\napply (f x : f x) id t"
|
||||
let input = "apply = (\\f x y : f x y)\nid = (\\x : x)\napply (\\f x : f x) id t"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Lambda with a complex body" $ do
|
||||
let input = "f = (x : t (t x))\nf t"
|
||||
let input = "f = (\\x : t (t x))\nf t"
|
||||
runTricu input @?= "Stem (Stem Leaf)"
|
||||
|
||||
, testCase "Lambda returning a function" $ do
|
||||
let input = "f = (x : (y : x))\ng = f t\ng (t t)"
|
||||
let input = "f = (\\x : (\\y : x))\ng = f t\ng (t t)"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Lambda with Shadowing" $ do
|
||||
let input = "f = (x : (x : x))\nf t (t t)"
|
||||
let input = "f = (\\x : (\\x : x))\nf t (t t)"
|
||||
runTricu input @?= "Stem Leaf"
|
||||
|
||||
, testCase "Lambda returning another lambda" $ do
|
||||
let input = "k = (x : (y : x))\nk_app = k t\nk_app (t t)"
|
||||
let input = "k = (\\x : (\\y : x))\nk_app = k t\nk_app (t t)"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Lambda with free variables" $ do
|
||||
let input = "y = t t\nf = (x : y)\nf t"
|
||||
let input = "y = t t\nf = (\\x : y)\nf t"
|
||||
runTricu input @?= "Stem Leaf"
|
||||
|
||||
, testCase "SKI Composition" $ do
|
||||
let input = "s = (x y z : x z (y z))\nk = (x y : x)\ni = (x : x)\ncomp = s k i\ncomp t (t t)"
|
||||
let input = "s = (\\x y z : x z (y z))\nk = (\\x y : x)\ni = (\\x : x)\ncomp = s k i\ncomp t (t t)"
|
||||
runTricu input @?= "Stem (Stem Leaf)"
|
||||
|
||||
, testCase "Lambda with multiple parameters and application" $ do
|
||||
let input = "f = (a b c : t a b c)\nf t (t t) (t t t)"
|
||||
let input = "f = (\\a b c : t a b c)\nf t (t t) (t t t)"
|
||||
runTricu input @?= "Stem Leaf"
|
||||
|
||||
, testCase "Lambda with nested application in the body" $ do
|
||||
let input = "f = (x : t (t (t x)))\nf t"
|
||||
let input = "f = (\\x : t (t (t x)))\nf t"
|
||||
runTricu input @?= "Stem (Stem (Stem Leaf))"
|
||||
|
||||
, testCase "Lambda returning a function and applying it" $ do
|
||||
let input = "f = (x : (y : t x y))\ng = f t\ng (t t)"
|
||||
let input = "f = (\\x : (\\y : t x y))\ng = f t\ng (t t)"
|
||||
runTricu input @?= "Fork Leaf (Stem Leaf)"
|
||||
|
||||
, testCase "Lambda applying a variable" $ do
|
||||
let input = "id = (x : x)\na = t t\nid a"
|
||||
let input = "id = (\\x : x)\na = t t\nid a"
|
||||
runTricu input @?= "Stem Leaf"
|
||||
|
||||
, testCase "Nested lambda abstractions in the same expression" $ do
|
||||
let input = "f = (x : (y : x y))\ng = (z : z)\nf g t"
|
||||
let input = "f = (\\x : (\\y : x y))\ng = (\\z : z)\nf g t"
|
||||
runTricu input @?= "Leaf"
|
||||
|
||||
, testCase "Lambda applied to string literal" $ do
|
||||
let input = "f = (x : x)\nf \"hello\""
|
||||
, testCase "Lambda with a string literal" $ do
|
||||
let input = "f = (\\x : x)\nf \"hello\""
|
||||
runTricu input @?= "Fork (Fork Leaf (Fork Leaf (Fork Leaf (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) Leaf))))))) (Fork (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork Leaf (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) Leaf))))))) (Fork (Fork Leaf (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) Leaf))))))) (Fork (Fork Leaf (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) Leaf))))))) (Fork (Fork (Stem Leaf) (Fork (Stem Leaf) (Fork (Stem Leaf) (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork (Stem Leaf) Leaf))))))) Leaf))))"
|
||||
|
||||
|
||||
, testCase "Lambda applied to integer literal" $ do
|
||||
let input = "f = (x : x)\nf 42"
|
||||
, testCase "Lambda with an integer literal" $ do
|
||||
let input = "f = (\\x : x)\nf 42"
|
||||
runTricu input @?= "Fork Leaf (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) Leaf)))))"
|
||||
|
||||
, testCase "Lambda applied to list literal" $ do
|
||||
let input = "f = (x : x)\nf [t (t t)]"
|
||||
, testCase "Lambda with a list literal" $ do
|
||||
let input = "f = (\\x : x)\nf [t (t t)]"
|
||||
runTricu input @?= "Fork Leaf (Fork (Stem Leaf) Leaf)"
|
||||
|
||||
, testCase "Lambda containing list literal" $ do
|
||||
let input = "(a : [(a)]) 1"
|
||||
runTricu input @?= "Fork (Fork (Stem Leaf) Leaf) Leaf"
|
||||
]
|
||||
|
||||
providedLibraries :: TestTree
|
||||
@ -434,7 +414,7 @@ providedLibraries = testGroup "Library Tests"
|
||||
|
||||
, testCase "List map" $ do
|
||||
library <- evaluateFile "./lib/list.tri"
|
||||
let input = "head (tail (map (a : (t t t)) [(t) (t) (t)]))"
|
||||
let input = "head (tail (map (\\a : (t t t)) [(t) (t) (t)]))"
|
||||
env = evalTricu library (parseTricu input)
|
||||
result env @?= Fork Leaf Leaf
|
||||
|
||||
@ -538,35 +518,3 @@ demos = testGroup "Test provided demo functionality"
|
||||
res <- liftIO $ evaluateFileResult "./demos/levelOrderTraversal.tri"
|
||||
decodeResult res @?= "\"\n1 \n2 3 \n4 5 6 7 \n8 11 10 9 12 \""
|
||||
]
|
||||
|
||||
decoding :: TestTree
|
||||
decoding = testGroup "Decoding Tests"
|
||||
[ testCase "Decode Leaf" $ do
|
||||
decodeResult Leaf @?= "t"
|
||||
|
||||
, testCase "Decode list of non-ASCII numbers" $ do
|
||||
let input = ofList [ofNumber 1, ofNumber 14, ofNumber 6]
|
||||
decodeResult input @?= "[1, 14, 6]"
|
||||
|
||||
, testCase "Decode list of ASCII numbers as a string" $ do
|
||||
let input = ofList [ofNumber 97, ofNumber 98, ofNumber 99]
|
||||
decodeResult input @?= "\"abc\""
|
||||
|
||||
, testCase "Decode small number" $ do
|
||||
decodeResult (ofNumber 42) @?= "42"
|
||||
|
||||
, testCase "Decode large number" $ do
|
||||
decodeResult (ofNumber 9999) @?= "9999"
|
||||
|
||||
, testCase "Decode string in list" $ do
|
||||
let input = ofList [ofString "hello", ofString "world"]
|
||||
decodeResult input @?= "[\"hello\", \"world\"]"
|
||||
|
||||
, testCase "Decode mixed list with strings" $ do
|
||||
let input = ofList [ofString "hello", ofNumber 42, ofString "world"]
|
||||
decodeResult input @?= "[\"hello\", 42, \"world\"]"
|
||||
|
||||
, testCase "Decode nested lists with strings" $ do
|
||||
let input = ofList [ofList [ofString "nested"], ofString "string"]
|
||||
decodeResult input @?= "[[\"nested\"], \"string\"]"
|
||||
]
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
-- This is a tricu comment!
|
||||
-- t (t t) (t (t t t))
|
||||
-- t (t t t) (t t)
|
||||
-- x = (a : a)
|
||||
-- x = (\a : a)
|
||||
main = t (t t) t -- Fork (Stem Leaf) Leaf
|
||||
-- t t
|
||||
-- x
|
||||
-- x = (a : a)
|
||||
-- x = (\a : a)
|
||||
-- t
|
||||
|
||||
@ -1 +1 @@
|
||||
main = (x : x) t
|
||||
main = (\x : x) t
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
x = map (i : append "Successfully concatenated " i) [("two strings!")]
|
||||
x = map (\i : append "Successfully concatenated " i) [("two strings!")]
|
||||
main = equal? x [("Successfully concatenated two strings!")]
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
compose = f g x : f (g x)
|
||||
compose = \f g x : f (g x)
|
||||
|
||||
succ = y (self :
|
||||
succ = y (\self :
|
||||
triage
|
||||
1
|
||||
t
|
||||
(triage
|
||||
(t (t t))
|
||||
(_ tail : t t (self tail))
|
||||
(\_ tail : t t (self tail))
|
||||
t))
|
||||
|
||||
size = (x :
|
||||
(y (self x :
|
||||
size = (\x :
|
||||
(y (\self x :
|
||||
compose succ
|
||||
(triage
|
||||
(x : x)
|
||||
(\x : x)
|
||||
self
|
||||
(x y : compose (self x) (self y))
|
||||
(\x y : compose (self x) (self y))
|
||||
x)) x 0))
|
||||
|
||||
size size
|
||||
|
||||
@ -1 +1 @@
|
||||
head (map (i : append "String " i) [("test!")])
|
||||
head (map (\i : append "String " i) [("test!")])
|
||||
|
||||
@ -1 +1 @@
|
||||
y = x : x
|
||||
y = \x : x
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
cabal-version: 1.12
|
||||
|
||||
name: tricu
|
||||
version: 0.18.1
|
||||
version: 0.15.0
|
||||
description: A micro-language for exploring Tree Calculus
|
||||
author: James Eversole
|
||||
maintainer: james@eversole.co
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user