Resolves issue with parsing comments #2

Closed
James wants to merge 0 commits from fix/comments-0001 into main
46 changed files with 789 additions and 2033 deletions

View File

@ -1,65 +0,0 @@
name: Test, Build, and Release
on:
push:
tags:
- '*'
jobs:
test:
container:
image: docker.matri.cx/nix-runner:v0.1.0
credentials:
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up cache for Cabal
uses: actions/cache@v4
with:
path: |
~/.cache/cabal
~/.config/cabal
~/.local/state/cabal
key: cabal-${{ hashFiles('tricu.cabal') }}
restore-keys: |
cabal-
- name: Initialize Cabal and update package list
run: |
nix develop --command cabal update
- name: Run test suite
run: |
nix develop --command cabal test
build:
needs: test
container:
image: docker.matri.cx/nix-runner:v0.1.0
credentials:
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build and shrink binary
run: |
nix build
cp -L ./result/bin/tricu ./tricu
chmod 755 ./tricu
nix develop --command upx ./tricu
- name: Release binary
uses: akkuman/gitea-release-action@v1
with:
files: |-
./tricu
token: '${{ secrets.RELEASE_TOKEN }}'
body: '${{ gitea.event.head_commit.message }}'
prerelease: true

18
.gitignore vendored
View File

@ -1,12 +1,14 @@
bin/
data/Purr.sqlite
data/encryptionKey
/result
/config.dhall
/Dockerfile
/docker-stack.yml
.stack-work/
*.swp *.swp
*.txt dist*
*~ *~
.env .env
.stack-work/
/Dockerfile
/config.dhall
/result
WD WD
bin/ *.hs.txt
dist*
.tricu_history

118
README.md
View File

@ -2,103 +2,61 @@
## Introduction ## Introduction
tricu (pronounced "tree-shoe") is a purely functional interpreted language implemented in Haskell. It is fundamentally based on the application of [Tree Calculus](https://github.com/barry-jay-personal/typed_tree_calculus/blob/main/typed_program_analysis.pdf) terms, but minimal syntax sugar is included to provide a useful programming tool. tricu (pronounced like "tree-shoe" in English) is a purely functional interpreted language implemented in Haskell. [I'm](https://eversole.co) developing tricu to further research the possibilities offered by the various forms of [Tree Calculi](https://github.com/barry-jay-personal/typed_tree_calculus/blob/main/typed_program_analysis.pdf).
*tricu is under active development and you should expect breaking changes with every commit.* tricu offers minimal syntax sugar yet manages to provide a complete, intuitive, and familiar programming environment. There is great power in simplicity. tricu offers:
tricu is the word for "tree" in Lojban: `(x1) is a tree of species/cultivar (x2)`. 1. `t` operator behaving by the rules of Tree Calculus
1. Function definitions/assignments
1. Lambda abstractions eliminated to Tree Calculus forms
1. List, Number, and String literals
1. Parentheses for grouping function application
## Features These features move us cleanly out of the [turing tarpit](https://en.wikipedia.org/wiki/Turing_tarpit) territory that you may find yourself in if you try working only with the `t` operator.
- Tree Calculus operator: `t` tricu is the word for "tree" in Lojban: `(x1) is a tree of species/cultivar (x2)`. This project was named "sapling" until I discovered the name is already being used for other (completely unrelated) programming language development projects.
- Immutable definitions: `x = t t`
- Lambda abstraction: `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")]`
- Intensionality blurs the distinction between functions and data (see REPL examples)
- Simple module system for code organization
## REPL examples ## What does it look like?
``` ```
tricu < -- Anything after `--` on a single line is a comment -- Anything after `--` on a single line is a comment
tricu < id = (a : a) -- Lambda abstraction is eliminated to tree calculus terms -- We can define functions or "variables" as Tree Calculus values
tricu < head (map (i : append i " world!") [("Hello, ")]) false = t
tricu > "Hello, world!" _ = t
tricu < id (head (map (i : append i " world!") [("Hello, ")])) true = t t
tricu > "Hello, world!" -- We can define functions as lambda expressions that are eliminated to Tree
-- Calculus terms.
id = (\a : a) -- `id` evaluates to the TC form of: t (t (t t)) t
triage = (\a b c : t (t a b) c)
-- Intensionality! We can inspect program structure, not just inputs/outputs:
test = triage "Leaf" (\_ : "Stem") (\_ _ : "Fork")
tricu < -- Intensionality! We can inspect the structure of a function or data. -- REPL
tricu < triage = (a b c : t (t a b) c) -- `tricu <` is the input prompt
tricu < test = triage "Leaf" (z : "Stem") (a b : "Fork") -- `tricu >` is the Tree Calculus form output. Most are elided below.
-- `READ -:` is an attempt to interpret the TC output as strings/numbers.
tricu < test t
tricu > Fork (Fork Leaf (Fork ...) ... )
READ -: "Leaf"
tricu < test (t t) tricu < test (t t)
tricu > "Stem" READ -: "Stem"
tricu < -- We can even convert a term back to source code (/demos/toSource.tri) tricu < test (t t t)
tricu < toSource not? READ -: "Fork"
tricu > "(t (t (t t) (t t t)) (t t (t t t)))" tricu < map (\i : listConcat i " is super cool!") [("Tree Calculus") ("Intensionality") ("tricu")]
tricu < -- or calculate its size (/demos/size.tri) READ -: ["Tree Calculus is super cool!", "Intensionality is super cool!", "tricu is super cool!"]
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 ## Installation
You can easily build and run this project using [Nix](https://nixos.org/download/). You can easily build and/or run this project using [Nix](https://nixos.org/download/).
- Quick Start (REPL): - Run REPL immediately:
- `nix run git+https://git.eversole.co/James/tricu` - `nix run git+https://git.eversole.co/James/tricu`
- Build executable in `./result/bin`: - Build REPL executable in `./result/bin`:
- `nix build git+https://git.eversole.co/James/tricu` - `nix build git+https://git.eversole.co/James/tricu`
`./result/bin/tricu --help`
```
tricu Evaluator and REPL
tricu [COMMAND] ... [OPTIONS]
tricu: Exploring Tree Calculus
Common flags:
-? --help Display help message
-V --version Print version information
tricu [repl] [OPTIONS]
Start interactive REPL
tricu eval [OPTIONS]
Evaluate tricu and return the result of the final expression.
-f --file=FILE Input file path(s) for evaluation.
Defaults to stdin.
-t --form=FORM Optional output form: (tree|fsl|ast|ternary|ascii|decode).
Defaults to tricu-compatible `t` tree form.
tricu decode [OPTIONS]
Decode a Tree Calculus value into a string representation.
-f --file=FILE Optional input file path to attempt decoding.
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 ## Acknowledgements
Tree Calculus was discovered by [Barry Jay](https://github.com/barry-jay-personal/blog). Tree Calculus was discovered by [Barry Jay](https://github.com/barry-jay-personal/blog).
[treecalcul.us](https://treecalcul.us) is an excellent website with an intuitive Tree Calculus code playground created by [Johannes Bader](https://johannes-bader.com/) that introduced me to Tree Calculus. [treecalcul.us](https://treecalcul.us) is an excellent website with an intuitive playground created by [Johannes Bader](https://johannes-bader.com/) that introduced me to Tree Calculus. If tricu sounds interesting but compiling this repo sounds like a hassle, you should check out his site.

View File

@ -1,37 +0,0 @@
!import "../lib/base.tri" !Local
!import "../lib/list.tri" !Local
main = lambdaEqualsTC
-- We represent `false` with a Leaf and `true` with a Stem Leaf
demo_false = t
demo_true = t t
-- Tree Calculus representation of the Boolean `not` function
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)
-- 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
-- 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.
-- Let's see if these are the same:
lambdaEqualsTC = equal? not_TC? not_Lambda?
-- Here are some checks to verify their extensional behavior is the same:
true_TC? = not_TC? demo_false
false_TC? = not_TC? demo_true
true_Lambda? = not_Lambda? demo_false
false_Lambda? = not_Lambda? demo_true
bothTrueEqual? = equal? true_TC? true_Lambda?
bothFalseEqual? = equal? false_TC? false_Lambda?

View File

@ -1,64 +0,0 @@
!import "../lib/base.tri" Lib
!import "../lib/list.tri" !Local
main = exampleTwo
-- Level Order Traversal of a labelled binary tree
-- Objective: Print each "level" of the tree on a separate line
--
-- We model labelled binary trees as nested lists where values act as labels. We
-- require explicit notation of empty nodes. Empty nodes can be represented
-- with an empty list, `[]`, which evaluates to a single node `t`.
--
-- Example tree inputs:
-- [("1") [("2") [("4") t t] t] [("3") [("5") t t] [("6") t t]]]]
-- Graph:
-- 1
-- / \
-- 2 3
-- / / \
-- 4 5 6
label = node : head 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)))
[]
(head (tail (tail 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)
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)
flatten = foldl (acc x : append acc x) ""
levelOrderTraversal = s : append (t 10 t) (flatten (levelOrderToString s))
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]]]
[("3") [("5") [("11") t t] t] [("7") t t]]]

View File

@ -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!"

View File

@ -1,11 +0,0 @@
!import "../lib/base.tri" !Local
!import "../lib/list.tri" !Local
main = size size
size = x : y (self x : compose succ (triage
id
self
(x y : compose (self x) (self y))
x)
) x 0

View File

@ -1,50 +0,0 @@
!import "../lib/base.tri" !Local
!import "../lib/list.tri" !Local
main = toSource not?
-- Thanks to intensionality, we can inspect the structure of a given value
-- even if it's a function. This includes lambdas which are eliminated to
-- Tree Calculus (TC) terms during evaluation.
-- `triage` takes four arguments: the first three represent behaviors for each
-- structural case in Tree Calculus (Leaf, Stem, and Fork).
-- The fourth argument is the value whose structure is inspected. By evaluating
-- the Tree Calculus term, `triage` enables branching logic based on the term's
-- shape, making it possible to perform structure-specific operations such as
-- reconstructing the terms' source code representation.
-- triage = (\leaf stem fork : t (t leaf stem) fork)
-- Base case of a single Leaf
sourceLeaf = t (head "t")
-- Stem case
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.
-- Fork case
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.
-- Wrapper around triage
toSource_ = y (self arg :
triage
sourceLeaf -- `triage` "a" case, Leaf
(sourceStem self) -- `triage` "b" case, Stem
(sourceFork self) -- `triage` "c" case, Fork
arg) -- The term to be inspected
-- toSource takes a single TC term and returns a String
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)))"

View File

@ -32,12 +32,10 @@
defaultPackage = self.packages.${system}.default; defaultPackage = self.packages.${system}.default;
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs.haskellPackages; [
haskellPackages.cabal-install cabal-install
haskellPackages.ghc-events ghcid
haskellPackages.ghcid
customGHC customGHC
upx
]; ];
inputsFrom = builtins.attrValues self.packages.${system}; inputsFrom = builtins.attrValues self.packages.${system};
}; };

View File

@ -1,74 +0,0 @@
false = t
_ = t
true = t t
id = a : a
const = a b : a
pair = t
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))
compose = f g x : f (g x)
triage = leaf stem fork : t (t leaf stem) fork
test = triage "Leaf" (_ : "Stem") (_ _ : "Fork")
matchBool = (ot of : triage
of
(_ : ot)
(_ _ : ot)
)
lAnd = (triage
(_ : false)
(_ x : x)
(_ _ x : x))
lOr = (triage
(x : x)
(_ _ : true)
(_ _ _ : true))
matchPair = a : triage _ _ a
not? = matchBool false true
and? = matchBool id (_ : false)
or? = (x z :
matchBool
(matchBool true true z)
(matchBool true false z)
x)
xor? = (x z :
matchBool
(matchBool false true z)
(matchBool true false z)
x)
equal? = y (self : triage
(triage
true
(_ : false)
(_ _ : false))
(ax :
triage
false
(self ax)
(_ _ : false))
(ax ay :
triage
false
(_ : false)
(bx by : lAnd (self ax bx) (self ay by))))
succ = y (self :
triage
1
t
(triage
(t (t t))
(_ tail : t t (self tail))
t))

View File

@ -1,70 +0,0 @@
!import "base.tri" !Local
_ = t
matchList = a b : triage a _ b
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)))
lExist? = y (self x : matchList
false
(h z : or? (equal? x h) (self x z)))
map_ = y (self :
matchList
(_ : 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
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
length = y (self : matchList
0
(_ tail : succ (self tail)))
reverse = y (self : matchList
t
(head tail : append (self tail) (pair head t)))
snoc = y (self x : matchList
(pair x t)
(h z : pair h (self x z)))
count = y (self x : matchList
0
(h z : matchBool
(succ (self x z))
(self x z)
(equal? x h)))
last = y (self : matchList
t
(hd tl : matchBool
hd
(self tl)
(emptyList? tl)))
all? = y (self pred : matchList
true
(h z : and? (pred h) (self pred z)))
any? = y (self pred : matchList
false
(h z : or? (pred h) (self pred z)))
intersect = xs ys : filter (x : lExist? x ys) xs

View File

@ -1,24 +0,0 @@
!import "base.tri" !Local
!import "list.tri" List
match_ = y (self value patterns :
triage
t
(_ : t)
(pattern rest :
triage
t
(_ : 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)))
patterns))
otherwise = const (t t)

8
shell.nix Normal file
View File

@ -0,0 +1,8 @@
{ pkgs ? import <nixpkgs> {} }:
let x = pkgs.haskellPackages.ghcWithPackages (hpkgs: with hpkgs; [
megaparsec
]);
in
pkgs.mkShell {
buildInputs = [ x ];
}

View File

@ -3,195 +3,119 @@ module Eval where
import Parser import Parser
import Research import Research
import Data.List (partition, (\\))
import Data.Map (Map) import Data.Map (Map)
import Data.List (foldl')
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
evalSingle :: Env -> TricuAST -> Env evalSingle :: Map String T -> TricuAST -> Map String T
evalSingle env term evalSingle env term = case term of
| SDef name [] body <- term SFunc name [] body ->
= case Map.lookup name env of let lineNoLambda = eliminateLambda body
Just existingValue result = evalAST env lineNoLambda
| existingValue == evalAST env body -> env in Map.insert name result env
| otherwise -> errorWithoutStackTrace $ SLambda _ body ->
"Unable to rebind immutable identifier: " ++ name let result = evalAST env body
Nothing -> in Map.insert "__result" result env
let res = evalAST env body SApp func arg ->
in Map.insert "!result" res (Map.insert name res env) let result = apply (evalAST env $ eliminateLambda func) (evalAST env $ eliminateLambda arg)
| SApp func arg <- term in Map.insert "__result" result env
= let res = apply (evalAST env func) (evalAST env arg) SVar name ->
in Map.insert "!result" res env case Map.lookup name env of
| SVar name <- term Just value -> Map.insert "__result" value env
= case Map.lookup name env of Nothing -> error $ "Variable " ++ name ++ " not defined"
Just v -> Map.insert "!result" v env _ ->
Nothing -> let result = evalAST env term
errorWithoutStackTrace $ "Variable `" ++ name ++ "` not defined\n\ in Map.insert "__result" result env
\This error should never occur here. Please report this as an issue."
| otherwise
= Map.insert "!result" (evalAST env term) env
evalTricu :: Env -> [TricuAST] -> Env evalTricu :: Map String T -> [TricuAST] -> Map String T
evalTricu env x = go env (reorderDefs env x) evalTricu env [] = env
where evalTricu env [lastLine] =
go env [] = env let lastLineNoLambda = eliminateLambda lastLine
go env [x] = updatedEnv = evalSingle env lastLineNoLambda
let updatedEnv = evalSingle env x in Map.insert "__result" (result updatedEnv) updatedEnv
in Map.insert "!result" (result updatedEnv) updatedEnv evalTricu env (line:rest) =
go env (x:xs) = let lineNoLambda = eliminateLambda line
evalTricu (evalSingle env x) xs updatedEnv = evalSingle env lineNoLambda
in evalTricu updatedEnv rest
evalAST :: Env -> TricuAST -> T evalAST :: Map String T -> TricuAST -> T
evalAST env term evalAST env term = case term of
| SLambda _ _ <- term = evalAST env (elimLambda term) SVar name -> case Map.lookup name env of
| SVar name <- term = evalVar name Just value -> value
| TLeaf <- term = Leaf Nothing -> error $ "Variable " ++ name ++ " not defined"
| TStem t <- term = Stem (evalAST env t) TLeaf -> Leaf
| TFork t u <- term = Fork (evalAST env t) (evalAST env u) TStem t -> Stem (evalAST env t)
| SApp t u <- term = apply (evalAST env t) (evalAST env u) TFork t1 t2 -> Fork (evalAST env t1) (evalAST env t2)
| SStr s <- term = ofString s SApp t1 t2 -> apply (evalAST env t1) (evalAST env t2)
| SInt n <- term = ofNumber n SStr str -> ofString str
| SList xs <- term = ofList (map (evalAST env) xs) SInt num -> ofNumber num
| SEmpty <- term = Leaf SList elems -> ofList (map (evalAST Map.empty) elems)
| otherwise = errorWithoutStackTrace "Unexpected AST term" SEmpty -> Leaf
where SFunc name args body ->
evalVar name = Map.findWithDefault error $ "Unexpected function definition " ++ name
(errorWithoutStackTrace $ "Variable " ++ name ++ " not defined") ++ " in evalAST; define via evalSingle."
name env SLambda {} -> error "Internal error: SLambda found in evalAST after elimination."
elimLambda :: TricuAST -> TricuAST eliminateLambda :: TricuAST -> TricuAST
elimLambda = go eliminateLambda (SLambda (v:vs) body)
where | null vs = lambdaToT v (eliminateLambda body)
-- η-reduction | otherwise = eliminateLambda (SLambda [v] (SLambda vs body))
go (SLambda [v] (SApp f (SVar x))) eliminateLambda (SApp f arg) = SApp (eliminateLambda f) (eliminateLambda arg)
| v == x && not (isFree v f) = elimLambda f eliminateLambda (TStem t) = TStem (eliminateLambda t)
-- Triage optimization eliminateLambda (TFork l r) = TFork (eliminateLambda l) (eliminateLambda r)
go (SLambda [a] (SLambda [b] (SLambda [c] body))) eliminateLambda (SList xs) = SList (map eliminateLambda xs)
| body == triageBody = _TRIAGE eliminateLambda other = other
where
triageBody =
SApp (SApp TLeaf (SApp (SApp TLeaf (SVar a)) (SVar b))) (SVar c)
-- Composition optimization
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))
go (SApp f g) = SApp (elimLambda f) (elimLambda g)
go x = x
toSKI x (SVar y) -- https://github.com/barry-jay-personal/typed_tree_calculus/blob/main/typed_program_analysis.pdf
| x == y = _I -- Chapter 4: Lambda-Abstraction
| otherwise = SApp _K (SVar y) lambdaToT :: String -> TricuAST -> TricuAST
toSKI x t@(SApp n u) lambdaToT x (SVar y)
| not (isFree x t) = SApp _K t | x == y = tI
| otherwise = SApp (SApp _S (toSKI x n)) (toSKI x u) lambdaToT x (SVar y)
toSKI x t | x /= y = SApp tK (SVar y)
| not (isFree x t) = SApp _K t lambdaToT x t
| otherwise = errorWithoutStackTrace "Unhandled toSKI conversion" | not (isFree x t) = SApp tK t
lambdaToT x (SApp n u)
| not (isFree x (SApp n u)) = SApp tK (SApp (eliminateLambda n) (eliminateLambda u))
lambdaToT x (SApp n u) = SApp (SApp tS (lambdaToT x (eliminateLambda n))) (lambdaToT x (eliminateLambda u))
lambdaToT x body
| not (isFree x body) = SApp tK body
| otherwise = SApp (SApp tS (lambdaToT x body)) TLeaf
_S = parseSingle "t (t (t t t)) t" freeVars :: TricuAST -> Set.Set String
_K = parseSingle "t t" freeVars (SVar v) = Set.singleton v
_I = parseSingle "t (t (t t)) t" freeVars (SInt _) = Set.empty
_B = parseSingle "t (t (t t (t (t (t t t)) t))) (t t)" freeVars (SStr _) = Set.empty
_TRIAGE = parseSingle "t (t (t t (t (t (t t t))))) t" freeVars (SList xs) = foldMap freeVars xs
freeVars (SApp f arg) = freeVars f <> freeVars arg
freeVars TLeaf = Set.empty
freeVars (SFunc _ _ b) = freeVars b
freeVars (TStem t) = freeVars t
freeVars (TFork l r) = freeVars l <> freeVars r
freeVars (SLambda vs b) = foldr Set.delete (freeVars b) vs
isFree :: String -> TricuAST -> Bool isFree :: String -> TricuAST -> Bool
isFree x = Set.member x . freeVars isFree x = Set.member x . freeVars
freeVars :: TricuAST -> Set.Set String toAST :: T -> TricuAST
freeVars (SVar v ) = Set.singleton v toAST Leaf = TLeaf
freeVars (SInt _ ) = Set.empty toAST (Stem a) = TStem (toAST a)
freeVars (SStr _ ) = Set.empty toAST (Fork a b) = TFork (toAST a) (toAST b)
freeVars (SList s ) = foldMap freeVars s
freeVars (SApp f a ) = freeVars f <> freeVars a
freeVars TLeaf = Set.empty
freeVars (SDef _ _ b) = freeVars b
freeVars (TStem t ) = freeVars t
freeVars (TFork l r ) = freeVars l <> freeVars r
freeVars (SLambda v b ) = foldr Set.delete (freeVars b) v
freeVars _ = Set.empty
reorderDefs :: Env -> [TricuAST] -> [TricuAST] -- We need the SKI operators in an unevaluated TricuAST tree form so that we
reorderDefs env defs -- can keep the evaluation functions straightforward
| not (null missingDeps) = tI :: TricuAST
errorWithoutStackTrace $ tI = SApp (SApp TLeaf (SApp TLeaf (SApp TLeaf TLeaf))) TLeaf
"Missing dependencies detected: " ++ show missingDeps
| otherwise = orderedDefs ++ others
where
(defsOnly, others) = partition isDef defs
defNames = [ name | SDef name _ _ <- defsOnly ]
defsWithFreeVars = [(def, freeVars body) | def@(SDef _ _ body) <- defsOnly] tK :: TricuAST
tK = SApp TLeaf TLeaf
graph = buildDepGraph defsOnly tS :: TricuAST
sortedDefs = sortDeps graph tS = SApp (SApp TLeaf (SApp TLeaf (SApp (SApp TLeaf TLeaf) TLeaf))) TLeaf
defMap = Map.fromList [(name, def) | def@(SDef name _ _) <- defsOnly]
orderedDefs = map (\name -> defMap Map.! name) sortedDefs
freeVarsDefs = foldMap snd defsWithFreeVars result :: Map String T -> T
freeVarsOthers = foldMap freeVars others result r = case Map.lookup "__result" r of
allFreeVars = freeVarsDefs <> freeVarsOthers
validNames = Set.fromList defNames `Set.union` Set.fromList (Map.keys env)
missingDeps = Set.toList (allFreeVars `Set.difference` validNames)
isDef (SDef _ _ _) = True
isDef _ = False
buildDepGraph :: [TricuAST] -> Map.Map String (Set.Set String)
buildDepGraph topDefs
| not (null conflictingDefs) =
errorWithoutStackTrace $
"Conflicting definitions detected: " ++ show conflictingDefs
| otherwise =
Map.fromList
[ (name, depends topDefs (SDef name [] body))
| SDef name _ body <- topDefs]
where
defsMap = Map.fromListWith (++)
[(name, [(name, body)]) | SDef name _ body <- topDefs]
conflictingDefs =
[ name
| (name, defs) <- Map.toList defsMap
, let bodies = map snd defs
, not $ all (== head bodies) (tail bodies)
]
sortDeps :: Map.Map String (Set.Set String) -> [String]
sortDeps graph = go [] Set.empty (Map.keys graph)
where
go sorted sortedSet [] = sorted
go sorted sortedSet remaining =
let ready = [ name | name <- remaining
, let deps = Map.findWithDefault Set.empty name graph
, Set.isSubsetOf deps sortedSet ]
notReady = remaining \\ ready
in if null ready
then errorWithoutStackTrace
"ERROR: Cyclic dependency detected and prohibited.\n\
\RESOLVE: Use nested lambdas."
else go (sorted ++ ready)
(Set.union sortedSet (Set.fromList ready))
notReady
depends :: [TricuAST] -> TricuAST -> Set.Set String
depends topDefs (SDef _ _ body) =
Set.intersection
(Set.fromList [n | SDef n _ _ <- topDefs])
(freeVars body)
depends _ _ = Set.empty
result :: Env -> T
result r = case Map.lookup "!result" r of
Just a -> a Just a -> a
Nothing -> errorWithoutStackTrace "No !result field found in provided env" Nothing -> error "No __result field found in provided environment"
mainResult :: Env -> T
mainResult r = case Map.lookup "main" r of
Just a -> a
Nothing -> errorWithoutStackTrace "No valid definition for `main` found."

View File

@ -1,158 +0,0 @@
module FileEval where
import Eval
import Lexer
import Parser
import Research
import Data.List (partition)
import Data.Maybe (mapMaybe)
import Control.Monad (foldM)
import System.IO
import System.FilePath (takeDirectory, normalise, (</>))
import qualified Data.Map as Map
import qualified Data.Set as Set
extractMain :: Env -> Either String T
extractMain env =
case Map.lookup "main" env of
Just result -> Right result
Nothing -> Left "No `main` function detected"
processImports :: Set.Set FilePath -> FilePath -> FilePath -> [TricuAST]
-> Either String ([TricuAST], [(FilePath, String, FilePath)])
processImports seen base currentPath asts =
let (imports, nonImports) = partition isImp asts
importPaths = mapMaybe getImportInfo imports
in if currentPath `Set.member` seen
then Left $ "Encountered cyclic import: " ++ currentPath
else Right (nonImports, importPaths)
where
isImp (SImport _ _) = True
isImp _ = False
getImportInfo (SImport p n) = Just (p, n, makeRelativeTo currentPath p)
getImportInfo _ = Nothing
evaluateFileResult :: FilePath -> IO T
evaluateFileResult filePath = do
contents <- readFile filePath
let tokens = lexTricu contents
case parseProgram tokens of
Left err -> errorWithoutStackTrace (handleParseError err)
Right ast -> do
processedAst <- preprocessFile filePath
let finalEnv = evalTricu Map.empty processedAst
case extractMain finalEnv of
Right result -> return result
Left err -> errorWithoutStackTrace err
evaluateFile :: FilePath -> IO Env
evaluateFile filePath = do
contents <- readFile filePath
let tokens = lexTricu contents
case parseProgram tokens of
Left err -> errorWithoutStackTrace (handleParseError err)
Right ast -> do
ast <- preprocessFile filePath
pure $ evalTricu Map.empty ast
evaluateFileWithContext :: Env -> FilePath -> IO Env
evaluateFileWithContext env filePath = do
contents <- readFile filePath
let tokens = lexTricu contents
case parseProgram tokens of
Left err -> errorWithoutStackTrace (handleParseError err)
Right ast -> do
ast <- preprocessFile filePath
pure $ evalTricu env ast
preprocessFile :: FilePath -> IO [TricuAST]
preprocessFile p = preprocessFile' Set.empty p p
preprocessFile' :: Set.Set FilePath -> FilePath -> FilePath -> IO [TricuAST]
preprocessFile' seen base currentPath = do
contents <- readFile currentPath
let tokens = lexTricu contents
case parseProgram tokens of
Left err -> errorWithoutStackTrace (handleParseError err)
Right ast ->
case processImports seen base currentPath ast of
Left err -> errorWithoutStackTrace err
Right (nonImports, importPaths) -> do
let seen' = Set.insert currentPath seen
imported <- concat <$> mapM (processImportPath seen' base) importPaths
pure $ imported ++ nonImports
where
processImportPath seen base (path, name, importPath) = do
ast <- preprocessFile' seen base importPath
pure $ map (nsDefinition (if name == "!Local" then "" else name))
$ filter (not . isImp) ast
isImp (SImport _ _) = True
isImp _ = False
makeRelativeTo :: FilePath -> FilePath -> FilePath
makeRelativeTo f i =
let d = takeDirectory f
in normalise $ d </> i
nsDefinitions :: String -> [TricuAST] -> [TricuAST]
nsDefinitions moduleName = map (nsDefinition moduleName)
nsDefinition :: String -> TricuAST -> TricuAST
nsDefinition "" def = def
nsDefinition moduleName (SDef name args body)
| isPrefixed name = SDef name args (nsBody moduleName body)
| otherwise = SDef (nsVariable moduleName name)
args (nsBody moduleName body)
nsDefinition moduleName other =
nsBody moduleName other
nsBody :: String -> TricuAST -> TricuAST
nsBody moduleName (SVar name)
| isPrefixed name = SVar name
| otherwise = SVar (nsVariable moduleName name)
nsBody moduleName (SApp func arg) =
SApp (nsBody moduleName func) (nsBody moduleName arg)
nsBody moduleName (SLambda args body) =
SLambda args (nsBodyScoped moduleName args body)
nsBody moduleName (SList items) =
SList (map (nsBody moduleName) items)
nsBody moduleName (TFork left right) =
TFork (nsBody moduleName left) (nsBody moduleName right)
nsBody moduleName (TStem subtree) =
TStem (nsBody moduleName subtree)
nsBody moduleName (SDef name args body)
| isPrefixed name = SDef name args (nsBody moduleName body)
| otherwise = SDef (nsVariable moduleName name)
args (nsBody moduleName body)
nsBody _ other = other
nsBodyScoped :: String -> [String] -> TricuAST -> TricuAST
nsBodyScoped moduleName args body = case body of
SVar name ->
if name `elem` args
then SVar name
else nsBody moduleName (SVar name)
SApp func arg ->
SApp (nsBodyScoped moduleName args func) (nsBodyScoped moduleName args arg)
SLambda innerArgs innerBody ->
SLambda innerArgs (nsBodyScoped moduleName (args ++ innerArgs) innerBody)
SList items ->
SList (map (nsBodyScoped moduleName args) items)
TFork left right ->
TFork (nsBodyScoped moduleName args left)
(nsBodyScoped moduleName args right)
TStem subtree ->
TStem (nsBodyScoped moduleName args subtree)
SDef name innerArgs innerBody ->
SDef (nsVariable moduleName name) innerArgs
(nsBodyScoped moduleName (args ++ innerArgs) innerBody)
other -> other
isPrefixed :: String -> Bool
isPrefixed name = '.' `elem` name
nsVariable :: String -> String -> String
nsVariable "" name = name
nsVariable moduleName name = moduleName ++ "." ++ name

View File

@ -1,119 +1,42 @@
module Lexer where module Lexer where
import Research import Research
import Control.Monad (void)
import Data.Functor (($>))
import Data.Void
import Text.Megaparsec import Text.Megaparsec
import Text.Megaparsec.Char hiding (space) import Text.Megaparsec.Char hiding (space)
import Text.Megaparsec.Char.Lexer import Text.Megaparsec.Char.Lexer
import Control.Monad (void)
import Data.Void
import qualified Data.Set as Set import qualified Data.Set as Set
type Lexer = Parsec Void String type Lexer = Parsec Void String
tricuLexer :: Lexer [LToken] data LToken
tricuLexer = do = LKeywordT
sc | LIdentifier String
header <- many $ do | LIntegerLiteral Int
tok <- choice | LStringLiteral String
[ try lImport | LAssign
, lnewline | LColon
] | LBackslash
sc | LOpenParen
pure tok | LCloseParen
tokens <- many $ do | LOpenBracket
tok <- choice tricuLexer' | LCloseBracket
sc | LNewline
pure tok deriving (Show, Eq, Ord)
sc
eof
pure (header ++ tokens)
where
tricuLexer' =
[ try lnewline
, try namespace
, try dot
, try identifier
, try keywordT
, try integerLiteral
, try stringLiteral
, assign
, colon
, openParen
, closeParen
, openBracket
, closeBracket
]
lexTricu :: String -> [LToken]
lexTricu input = case runParser tricuLexer "" input of
Left err -> errorWithoutStackTrace $ "Lexical error:\n" ++ errorBundlePretty err
Right tokens -> tokens
keywordT :: Lexer LToken keywordT :: Lexer LToken
keywordT = string "t" *> notFollowedBy alphaNumChar $> LKeywordT keywordT = string "t" *> notFollowedBy alphaNumChar *> pure LKeywordT
identifier :: Lexer LToken identifier :: Lexer LToken
identifier = do identifier = do
first <- lowerChar <|> char '_' name <- some (letterChar <|> char '_' <|> char '-')
rest <- many $ letterChar if (name == "t" || name == "__result")
<|> digitChar <|> char '_' <|> char '-' <|> char '?' then fail "Keywords (`t`, `__result`) cannot be used as an identifier"
<|> char '$' <|> char '#' <|> char '@' <|> char '%'
let name = first : rest
if name == "t" || name == "!result"
then fail "Keywords (`t`, `!result`) cannot be used as an identifier"
else return (LIdentifier name) else return (LIdentifier name)
namespace :: Lexer LToken
namespace = do
name <- try (string "!Local") <|> do
first <- upperChar
rest <- many (letterChar <|> digitChar)
return (first:rest)
return (LNamespace name)
dot :: Lexer LToken
dot = char '.' $> LDot
lImport :: Lexer LToken
lImport = do
_ <- string "!import"
space1
LStringLiteral path <- stringLiteral
space1
LNamespace name <- namespace
return (LImport path name)
assign :: Lexer LToken
assign = char '=' $> LAssign
colon :: Lexer LToken
colon = char ':' $> LColon
openParen :: Lexer LToken
openParen = char '(' $> LOpenParen
closeParen :: Lexer LToken
closeParen = char ')' $> LCloseParen
openBracket :: Lexer LToken
openBracket = char '[' $> LOpenBracket
closeBracket :: Lexer LToken
closeBracket = char ']' $> LCloseBracket
lnewline :: Lexer LToken
lnewline = char '\n' $> LNewline
sc :: Lexer ()
sc = space
(void $ takeWhile1P (Just "space") (\c -> c == ' ' || c == '\t'))
(skipLineComment "--")
(skipBlockComment "|-" "-|")
integerLiteral :: Lexer LToken integerLiteral :: Lexer LToken
integerLiteral = do integerLiteral = do
num <- some digitChar num <- some digitChar
@ -122,22 +45,67 @@ integerLiteral = do
stringLiteral :: Lexer LToken stringLiteral :: Lexer LToken
stringLiteral = do stringLiteral = do
char '"' char '"'
content <- manyTill Lexer.charLiteral (char '"') content <- many (noneOf ['"'])
if null content
then fail "Empty string literals are not allowed"
else do
char '"' --"
return (LStringLiteral content) return (LStringLiteral content)
charLiteral :: Lexer Char assign :: Lexer LToken
charLiteral = escapedChar <|> normalChar assign = char '=' *> pure LAssign
colon :: Lexer LToken
colon = char ':' *> pure LColon
backslash :: Lexer LToken
backslash = char '\\' *> pure LBackslash
openParen :: Lexer LToken
openParen = char '(' *> pure LOpenParen
closeParen :: Lexer LToken
closeParen = char ')' *> pure LCloseParen
openBracket :: Lexer LToken
openBracket = char '[' *> pure LOpenBracket
closeBracket :: Lexer LToken
closeBracket = char ']' *> pure LCloseBracket
lnewline :: Lexer LToken
lnewline = char '\n' *> pure LNewline
sc :: Lexer ()
sc = space space1 (skipLineComment "--") (skipBlockComment "|-" "-|")
tricuLexer :: Lexer [LToken]
tricuLexer = do
sc
tokens <- many $ do
tok <- choice tricuLexer'
sc
pure tok
sc
eof
pure tokens
where where
normalChar = noneOf ['"', '\\'] tricuLexer' =
escapedChar = do [ try identifier
void $ char '\\' , try keywordT
c <- oneOf ['n', 't', 'r', 'f', 'b', '\\', '"', '\''] , try integerLiteral
return $ case c of , try stringLiteral
'n' -> '\n' , assign
't' -> '\t' , colon
'r' -> '\r' , backslash
'f' -> '\f' , openParen
'b' -> '\b' , closeParen
'\\' -> '\\' , openBracket
'"' -> '"' , closeBracket
'\'' -> '\'' ]
lexTricu :: String -> [LToken]
lexTricu input = case runParser tricuLexer "" input of
Left err -> error $ "Lexical error:\n" ++ errorBundlePretty err
Right tokens -> tokens

46
src/Library.hs Normal file
View File

@ -0,0 +1,46 @@
module Library where
import Eval
import Parser
import Research
import qualified Data.Map as Map
library :: Map.Map String T
library = evalTricu Map.empty $ parseTricu $ unlines
[ "false = t"
, "true = t t"
, "_ = t"
, "k = t t"
, "i = t (t k) t"
, "s = t (t (k t)) t"
, "m = s i i"
, "b = s (k s) k"
, "c = s (s (k s) (s (k k) s)) (k k)"
, "iC = (\\a b c : s a (k c) b)"
, "iD = b (b iC) iC"
, "iE = b (b iD) iC"
, "yi = (\\i : b m (c b (i m)))"
, "y = yi iC"
, "yC = yi iD"
, "yD = yi iE"
, "id = (\\a : a)"
, "triage = (\\a b c : t (t a b) c)"
, "pair = t"
, "matchBool = (\\ot of : triage of (\\_ : ot) (\\_ _ : ot))"
, "matchList = (\\oe oc : triage oe _ oc)"
, "matchPair = (\\op : triage _ _ op)"
, "not = matchBool false true"
, "and = matchBool id (\\z : false)"
, "if = (\\cond then else : t (t else (t t then)) t cond)"
, "test = triage \"Leaf\" (\\z : \"Stem\") (\\a b : \"Fork\")"
, "emptyList = matchList true (\\y z : false)"
, "head = matchList t (\\hd tl : hd)"
, "tail = matchList t (\\hd tl : tl)"
, "listConcat = y (\\self : matchList (\\k : k) (\\h r k : pair h (self r k)))"
, "lAnd = triage (\\x : false) (\\_ x : x) (\\_ _ x : x)"
, "lOr = triage (\\x : x) (\\_ _ : true) (\\_ _ x : true)"
, "hmap = y (\\self : matchList (\\f : t) (\\hd tl f : pair (f hd) (self tl f)))"
, "map = (\\f l : hmap l f)"
, "equal = y (\\self : triage (triage true (\\z : false) (\\y z : false)) (\\ax : triage false (self ax) (\\y z : false)) (\\ax ay : triage false (\\z : false) (\\bx by : lAnd (self ax bx) (self ay by))))"
]

View File

@ -1,89 +1,22 @@
module Main where module Main where
import Eval (evalTricu, mainResult, result) import Eval (evalTricu, result)
import FileEval import Library (library)
import Parser (parseTricu) import Parser (parseTricu)
import REPL import REPL (repl)
import Research import Research (T)
import Control.Monad (foldM)
import Control.Monad.IO.Class (liftIO)
import Data.Version (showVersion)
import Text.Megaparsec (runParser) import Text.Megaparsec (runParser)
import Paths_tricu (version)
import System.Console.CmdArgs
import qualified Data.Map as Map import qualified Data.Map as Map
data TricuArgs
= Repl
| Evaluate { file :: [FilePath], form :: EvaluatedForm }
| TDecode { file :: [FilePath] }
deriving (Show, Data, Typeable)
replMode :: TricuArgs
replMode = Repl
&= help "Start interactive REPL"
&= auto
&= name "repl"
evaluateMode :: TricuArgs
evaluateMode = Evaluate
{ file = def &= help "Input file path(s) for evaluation.\n \
\ Defaults to stdin."
&= name "f" &= typ "FILE"
, form = TreeCalculus &= typ "FORM"
&= help "Optional output form: (tree|fsl|ast|ternary|ascii|decode).\n \
\ Defaults to tricu-compatible `t` tree form."
&= name "t"
}
&= help "Evaluate tricu and return the result of the final expression."
&= explicit
&= name "eval"
decodeMode :: TricuArgs
decodeMode = TDecode
{ file = def
&= help "Optional input file path to attempt decoding.\n \
\ Defaults to stdin."
&= name "f" &= typ "FILE"
}
&= help "Decode a Tree Calculus value into a string representation."
&= explicit
&= name "decode"
main :: IO () main :: IO ()
main = do main = do
let versionStr = "tricu Evaluator and REPL " ++ showVersion version putStrLn "Welcome to the tricu Interpreter"
args <- cmdArgs $ modes [replMode, evaluateMode, decodeMode] putStrLn "You can exit at any time by typing and entering: "
&= help "tricu: Exploring Tree Calculus" putStrLn ":_exit"
&= program "tricu" repl library
&= summary versionStr
&= versionArg [explicit, name "version", summary versionStr]
case args of
Repl -> do
putStrLn "Welcome to the tricu REPL"
putStrLn "You can exit with `CTRL+D` or the `!exit` command.`"
repl Map.empty
Evaluate { file = filePaths, form = form } -> do
result <- case filePaths of
[] -> do
t <- getContents
pure $ runTricu t
(filePath:restFilePaths) -> do
initialEnv <- evaluateFile filePath
finalEnv <- foldM evaluateFileWithContext initialEnv restFilePaths
pure $ mainResult finalEnv
let fRes = formatResult form result
putStr fRes
TDecode { file = filePaths } -> do
value <- case filePaths of
[] -> getContents
(filePath:_) -> readFile filePath
putStrLn $ decodeResult $ result $ evalTricu Map.empty $ parseTricu value
runTricu :: String -> T runTricu :: String -> T
runTricu input = runTricu s = result (evalTricu Map.empty $ parseTricu s)
let asts = parseTricu input runTricuEnv env s = result (evalTricu env $ parseTricu s)
finalEnv = evalTricu Map.empty asts
in result finalEnv

View File

@ -1,312 +1,262 @@
module Parser where module Parser where
import Lexer import Lexer
import Research import Research hiding (toList)
import Control.Monad (void)
import Control.Monad.State
import Data.List.NonEmpty (toList) import Data.List.NonEmpty (toList)
import Data.Void (Void) import Data.Void (Void)
import Text.Megaparsec import Text.Megaparsec
import Text.Megaparsec.Error (ParseErrorBundle, errorBundlePretty) import Text.Megaparsec.Char
import Text.Megaparsec.Error (errorBundlePretty, ParseErrorBundle)
import qualified Data.Set as Set import qualified Data.Set as Set
data PState = PState type Parser = Parsec Void [LToken]
{ parenDepth :: Int
, bracketDepth :: Int
} deriving (Show)
type ParserM = StateT PState (Parsec Void [LToken]) data TricuAST
= SVar String
satisfyM :: (LToken -> Bool) -> ParserM LToken | SInt Int
satisfyM f = do | SStr String
token <- lift (satisfy f) | SList [TricuAST]
modify' (updateDepth token) | SFunc String [String] TricuAST
return token | SApp TricuAST TricuAST
| TLeaf
updateDepth :: LToken -> PState -> PState | TStem TricuAST
updateDepth LOpenParen st = st { parenDepth = parenDepth st + 1 } | TFork TricuAST TricuAST
updateDepth LOpenBracket st = st { bracketDepth = bracketDepth st + 1 } | SLambda [String] TricuAST
updateDepth LCloseParen st = st { parenDepth = parenDepth st - 1 } | SEmpty
updateDepth LCloseBracket st = st { bracketDepth = bracketDepth st - 1 } deriving (Show, Eq, Ord)
updateDepth _ st = st
topLevelNewline :: ParserM ()
topLevelNewline = do
st <- get
if parenDepth st == 0 && bracketDepth st == 0
then void (satisfyM (== LNewline))
else fail "Top-level exit in nested context (paren or bracket)"
parseProgram :: [LToken] -> Either (ParseErrorBundle [LToken] Void) [TricuAST]
parseProgram tokens =
runParser (evalStateT (parseProgramM <* finalizeDepth <* eof) (PState 0 0)) "" tokens
parseSingleExpr :: [LToken] -> Either (ParseErrorBundle [LToken] Void) TricuAST
parseSingleExpr tokens =
runParser (evalStateT (scnParserM *> parseExpressionM <* finalizeDepth <* eof) (PState 0 0)) "" tokens
finalizeDepth :: ParserM ()
finalizeDepth = do
st <- get
case (parenDepth st, bracketDepth st) of
(0, 0) -> pure ()
(p, b) -> fail $ "Unmatched tokens: " ++ show (p, b)
parseTricu :: String -> [TricuAST] parseTricu :: String -> [TricuAST]
parseTricu input = parseTricu input
case lexTricu input of | null tokens = []
| otherwise = map parseSingle tokens
where
tokens = case lexTricu input of
[] -> [] [] -> []
toks -> tokens -> lines input
case parseProgram toks of
Left err -> errorWithoutStackTrace (handleParseError err)
Right asts -> asts
parseSingle :: String -> TricuAST parseSingle :: String -> TricuAST
parseSingle input = parseSingle input = case lexTricu input of
case lexTricu input of
[] -> SEmpty [] -> SEmpty
toks -> tokens -> case runParser parseExpression "" tokens of
case parseSingleExpr toks of Left err -> error $ handleParseError err
Left err -> errorWithoutStackTrace (handleParseError err)
Right ast -> ast Right ast -> ast
parseProgramM :: ParserM [TricuAST] parseExpression :: Parser TricuAST
parseProgramM = do parseExpression = choice
skipMany topLevelNewline [ try parseFunction
importNodes <- many (do , try parseLambda
node <- parseImportM , try parseLambdaExpression
skipMany topLevelNewline , try parseListLiteral
return node) , try parseApplication
skipMany topLevelNewline , try parseTreeTerm
exprs <- sepEndBy parseOneExpression (some topLevelNewline) , parseLiteral
skipMany topLevelNewline
return (importNodes ++ exprs)
parseImportM :: ParserM TricuAST
parseImportM = do
LImport filePath moduleName <- satisfyM isImport
pure (SImport filePath moduleName)
where
isImport (LImport _ _) = True
isImport _ = False
parseOneExpression :: ParserM TricuAST
parseOneExpression = scnParserM *> parseExpressionM
scnParserM :: ParserM ()
scnParserM = skipMany $ do
t <- lookAhead anySingle
st <- get
if | (parenDepth st > 0 || bracketDepth st > 0) && (t == LNewline) ->
void $ satisfyM (== LNewline)
| otherwise ->
fail "In nested context or no space token" <|> empty
eofM :: ParserM ()
eofM = lift eof
parseExpressionM :: ParserM TricuAST
parseExpressionM = choice
[ try parseFunctionM
, try parseLambdaM
, try parseLambdaExpressionM
, try parseListLiteralM
, try parseApplicationM
, try parseTreeTermM
, parseLiteralM
] ]
parseFunctionM :: ParserM TricuAST scnParser :: Parser ()
parseFunctionM = do scnParser = skipMany (satisfy isNewline)
let ident = (\case LIdentifier _ -> True; _ -> False)
LIdentifier name <- satisfyM ident
args <- many $ satisfyM ident
_ <- satisfyM (== LAssign)
scnParserM
body <- parseExpressionM
pure (SDef name (map getIdentifier args) body)
parseLambdaM :: ParserM TricuAST parseFunction :: Parser TricuAST
parseLambdaM = do parseFunction = do
let ident = (\case LIdentifier _ -> True; _ -> False) LIdentifier name <- satisfy isIdentifier
params <- some (satisfyM ident) args <- many (satisfy isIdentifier)
_ <- satisfyM (== LColon) satisfy (== LAssign)
scnParserM body <- parseExpression
body <- parseLambdaExpressionM return (SFunc name (map getIdentifier args) body)
pure $ foldr (\param acc -> SLambda [getIdentifier param] acc) body params
parseLambdaExpressionM :: ParserM TricuAST parseAtomicBase :: Parser TricuAST
parseLambdaExpressionM = choice parseAtomicBase = choice
[ try parseLambdaApplicationM [ try parseVarWithoutAssignment
, parseAtomicLambdaM , parseTreeLeaf
, parseGrouped
]
parseVarWithoutAssignment :: Parser TricuAST
parseVarWithoutAssignment = do
LIdentifier name <- satisfy isIdentifier
if (name == "t" || name == "__result")
then fail $ "Reserved keyword: " ++ name ++ " cannot be assigned."
else notFollowedBy (satisfy (== LAssign)) *> return (SVar name)
parseLambda :: Parser TricuAST
parseLambda = between (satisfy (== LOpenParen)) (satisfy (== LCloseParen)) $ do
satisfy (== LBackslash)
param <- satisfy isIdentifier
rest <- many (satisfy isIdentifier)
satisfy (== LColon)
body <- parseLambdaExpression
let nestedLambda = foldr (\v acc -> SLambda [v] acc) body (map getIdentifier rest)
return (SLambda [getIdentifier param] nestedLambda)
parseLambdaExpression :: Parser TricuAST
parseLambdaExpression = choice
[ try parseLambdaApplication
, parseAtomicLambda
] ]
parseAtomicLambdaM :: ParserM TricuAST parseAtomicLambda :: Parser TricuAST
parseAtomicLambdaM = choice parseAtomicLambda = choice
[ try parseLambdaM [ parseVar
, parseVarM , parseTreeLeaf
, parseTreeLeafM , parseLiteral
, parseLiteralM , parseListLiteral
, parseListLiteralM , try parseLambda
, between (satisfyM (== LOpenParen)) (satisfyM (== LCloseParen)) parseLambdaExpressionM , between (satisfy (== LOpenParen)) (satisfy (== LCloseParen)) parseLambdaExpression
] ]
parseApplicationM :: ParserM TricuAST parseApplication :: Parser TricuAST
parseApplicationM = do parseApplication = do
func <- parseAtomicBaseM func <- parseAtomicBase
scnParserM args <- many parseAtomic
args <- many $ do return $ foldl (\acc arg -> SApp acc arg) func args
scnParserM
arg <- parseAtomicM
return arg
return $ foldl SApp func args
parseLambdaApplicationM :: ParserM TricuAST parseLambdaApplication :: Parser TricuAST
parseLambdaApplicationM = do parseLambdaApplication = do
func <- parseAtomicLambdaM func <- parseAtomicLambda
scnParserM args <- many parseAtomicLambda
args <- many $ do return $ foldl (\acc arg -> SApp acc arg) func args
arg <- parseAtomicLambdaM
scnParserM
pure arg
pure $ foldl SApp func args
parseAtomicBaseM :: ParserM TricuAST isTreeTerm :: TricuAST -> Bool
parseAtomicBaseM = choice isTreeTerm TLeaf = True
[ parseTreeLeafM isTreeTerm (TStem _) = True
, parseGroupedM isTreeTerm (TFork _ _) = True
] isTreeTerm _ = False
parseTreeLeafM :: ParserM TricuAST parseTreeLeaf :: Parser TricuAST
parseTreeLeafM = do parseTreeLeaf = satisfy isKeywordT *> notFollowedBy (satisfy (== LAssign)) *> pure TLeaf
let keyword = (\case LKeywordT -> True; _ -> False)
_ <- satisfyM keyword
notFollowedBy $ lift $ satisfy (== LAssign)
pure TLeaf
parseTreeTermM :: ParserM TricuAST
parseTreeTermM = do
base <- parseTreeLeafOrParenthesizedM
rest <- many parseTreeLeafOrParenthesizedM
pure (foldl combine base rest)
where
combine acc next
| TLeaf <- acc = TStem next
| TStem t <- acc = TFork t next
| TFork _ _ <- acc = TFork acc next
parseTreeLeafOrParenthesizedM :: ParserM TricuAST
parseTreeLeafOrParenthesizedM = choice
[ between (satisfyM (== LOpenParen)) (satisfyM (== LCloseParen)) parseTreeTermM
, parseTreeLeafM
]
parseAtomicM :: ParserM TricuAST
parseAtomicM = choice
[ try parseLambdaM
, parseVarM
, parseTreeLeafM
, parseListLiteralM
, parseGroupedM
, parseLiteralM
]
parseGroupedM :: ParserM TricuAST
parseGroupedM = between (satisfyM (== LOpenParen)) (satisfyM (== LCloseParen)) $
scnParserM *> parseExpressionM <* scnParserM
parseLiteralM :: ParserM TricuAST
parseLiteralM = choice
[ parseIntLiteralM
, parseStrLiteralM
]
parseListLiteralM :: ParserM TricuAST
parseListLiteralM = do
_ <- satisfyM (== LOpenBracket)
elements <- many $ do
scnParserM
parseListItemM
scnParserM
_ <- satisfyM (== LCloseBracket)
pure (SList elements)
parseListItemM :: ParserM TricuAST
parseListItemM = choice
[ parseGroupedItemM
, parseListLiteralM
, parseSingleItemM
]
parseGroupedItemM :: ParserM TricuAST
parseGroupedItemM = do
_ <- satisfyM (== LOpenParen)
inner <- parseExpressionM
_ <- satisfyM (== LCloseParen)
pure inner
parseSingleItemM :: ParserM TricuAST
parseSingleItemM = do
token <- satisfyM (\case LIdentifier _ -> True; LKeywordT -> True; _ -> False)
if | LIdentifier name <- token -> pure (SVar name)
| token == LKeywordT -> pure TLeaf
| otherwise -> fail "Unexpected token in list item"
parseVarM :: ParserM TricuAST
parseVarM = do
token <- satisfyM (\case
LNamespace _ -> True
LIdentifier _ -> True
_ -> False)
case token of
LNamespace ns -> do
_ <- satisfyM (== LDot)
LIdentifier name <- satisfyM (\case LIdentifier _ -> True; _ -> False)
pure $ SVar (ns ++ "." ++ name)
LIdentifier name
| name == "t" || name == "!result" ->
fail ("Reserved keyword: " ++ name ++ " cannot be assigned.")
| otherwise -> pure (SVar name)
_ -> fail "Unexpected token while parsing variable"
parseIntLiteralM :: ParserM TricuAST
parseIntLiteralM = do
let intL = (\case LIntegerLiteral _ -> True; _ -> False)
token <- satisfyM intL
if | LIntegerLiteral value <- token ->
pure (SInt value)
| otherwise ->
fail "Unexpected token while parsing integer literal"
parseStrLiteralM :: ParserM TricuAST
parseStrLiteralM = do
let strL = (\case LStringLiteral _ -> True; _ -> False)
token <- satisfyM strL
if | LStringLiteral value <- token ->
pure (SStr value)
| otherwise ->
fail "Unexpected token while parsing string literal"
getIdentifier :: LToken -> String getIdentifier :: LToken -> String
getIdentifier (LIdentifier name) = name getIdentifier (LIdentifier name) = name
getIdentifier _ = errorWithoutStackTrace "Expected identifier" getIdentifier _ = error "Expected identifier"
parseTreeTerm :: Parser TricuAST
parseTreeTerm = do
base <- parseTreeLeafOrParenthesized
rest <- many parseTreeLeafOrParenthesized
pure $ foldl combine base rest
where
combine acc next = case acc of
TLeaf -> TStem next
TStem t -> TFork t next
TFork _ _ -> TFork acc next
parseTreeLeafOrParenthesized :: Parser TricuAST
parseTreeLeafOrParenthesized = choice
[ between (satisfy (== LOpenParen)) (satisfy (== LCloseParen)) parseTreeTerm
, parseTreeLeaf
]
foldTree :: [TricuAST] -> TricuAST
foldTree [] = TLeaf
foldTree [x] = x
foldTree (x:y:rest) = TFork x (foldTree (y:rest))
parseAtomic :: Parser TricuAST
parseAtomic = choice
[ parseVar
, parseTreeLeaf
, parseListLiteral
, parseGrouped
, parseLiteral
]
parseGrouped :: Parser TricuAST
parseGrouped = between (satisfy (== LOpenParen)) (satisfy (== LCloseParen)) parseExpression
parseLiteral :: Parser TricuAST
parseLiteral = choice
[ parseIntLiteral
, parseStrLiteral
]
parens :: Parser TricuAST -> Parser TricuAST
parens p = do
satisfy (== LOpenParen)
result <- p
satisfy (== LCloseParen)
return result
parseListLiteral :: Parser TricuAST
parseListLiteral = do
satisfy (== LOpenBracket)
elements <- many parseListItem
satisfy (== LCloseBracket)
return (SList elements)
parseListItem :: Parser TricuAST
parseListItem = choice
[ parseGroupedItem
, parseListLiteral
, parseSingleItem
]
parseGroupedItem :: Parser TricuAST
parseGroupedItem = do
satisfy (== LOpenParen)
inner <- parseExpression
satisfy (== LCloseParen)
return inner
parseSingleItem :: Parser TricuAST
parseSingleItem = do
token <- satisfy isListItem
case token of
LIdentifier name -> return (SVar name)
LKeywordT -> return TLeaf
_ -> fail "Unexpected token in list item"
isListItem :: LToken -> Bool
isListItem (LIdentifier _) = True
isListItem LKeywordT = True
isListItem _ = False
parseVar :: Parser TricuAST
parseVar = do
LIdentifier name <- satisfy isIdentifier
if (name == "t" || name == "__result")
then fail $ "Reserved keyword: " ++ name ++ " cannot be assigned."
else return (SVar name)
parseIntLiteral :: Parser TricuAST
parseIntLiteral = do
LIntegerLiteral value <- satisfy isIntegerLiteral
return (SInt value)
parseStrLiteral :: Parser TricuAST
parseStrLiteral = do
LStringLiteral value <- satisfy isStringLiteral
return (SStr value)
-- Boolean Helpers
isKeywordT (LKeywordT) = True
isKeywordT _ = False
isIdentifier (LIdentifier _) = True
isIdentifier _ = False
isIntegerLiteral (LIntegerLiteral _) = True
isIntegerLiteral _ = False
isStringLiteral (LStringLiteral _) = True
isStringLiteral _ = False
isLiteral (LIntegerLiteral _) = True
isLiteral (LStringLiteral _) = True
isLiteral _ = False
isNewline (LNewline) = True
isNewline _ = False
-- Error Handling
handleParseError :: ParseErrorBundle [LToken] Void -> String handleParseError :: ParseErrorBundle [LToken] Void -> String
handleParseError bundle = handleParseError bundle =
let errors = bundleErrors bundle let errors = bundleErrors bundle
formattedErrors = map formatError (Data.List.NonEmpty.toList errors) errorList = toList errors
formattedErrors = map showError errorList
in unlines ("Parse error(s) encountered:" : formattedErrors) in unlines ("Parse error(s) encountered:" : formattedErrors)
formatError :: ParseError [LToken] Void -> String showError :: ParseError [LToken] Void -> String
formatError (TrivialError offset unexpected expected) = showError (TrivialError offset (Just (Tokens tokenStream)) expected) =
let unexpectedMsg = case unexpected of "Parse error at offset " ++ show offset ++ ": unexpected token "
Just x -> "unexpected token " ++ show x ++ show tokenStream ++ ", expected one of " ++ show (Set.toList expected)
Nothing -> "unexpected end of input" showError (FancyError offset fancy) =
expectedMsg = if null expected "Parse error at offset " ++ show offset ++ ":\n " ++ unlines (map show (Set.toList fancy))
then "" showError (TrivialError offset Nothing expected) =
else "expected " ++ show (Set.toList expected) "Parse error at offset " ++ show offset ++ ": expected one of "
in "Parse error at offset " ++ show offset ++ ": " ++ unexpectedMsg ++ ++ show (Set.toList expected)
if null expectedMsg then "" else " " ++ expectedMsg
formatError (FancyError offset _) =
"Parse error at offset " ++ show offset ++ ": unexpected FancyError"

View File

@ -1,190 +1,54 @@
module REPL where module REPL where
import Eval import Eval
import FileEval
import Lexer import Lexer
import Parser import Parser
import Research import Research
import Control.Exception (IOException, SomeException, catch import Control.Exception (SomeException, catch)
, displayException)
import Control.Monad (forM_)
import Control.Monad.Catch (handle, MonadCatch)
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Control.Monad.Trans.Class (lift) import Data.List (intercalate)
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 System.Console.Haskeline import System.Console.Haskeline
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Text as T
import qualified Data.Text.IO as T
repl :: Env -> IO () repl :: Map.Map String T -> IO ()
repl env = runInputT settings (withInterrupt (loop env Decode)) repl env = runInputT defaultSettings (loop env)
where where
settings :: Settings IO loop :: Map.Map String T -> InputT IO ()
settings = Settings loop env = do
{ complete = completeWord Nothing " \t" completeCommands
, historyFile = Just "~/.local/state/tricu/history"
, autoAddHistory = True
}
completeCommands :: String -> IO [Completion]
completeCommands str = return $ map simpleCompletion $
filter (str `isPrefixOf`) commands
where
commands = [ "!exit"
, "!output"
, "!definitions"
, "!import"
, "!clear"
, "!save"
, "!reset"
, "!version"
]
loop :: Env -> EvaluatedForm -> InputT IO ()
loop env form = handle (interruptHandler env form) $ do
minput <- getInputLine "tricu < " minput <- getInputLine "tricu < "
case minput of case minput of
Nothing -> outputStrLn "Exiting tricu" Nothing -> outputStrLn "Goodbye!"
Just s Just ":_exit" -> outputStrLn "Goodbye!"
| strip s == "" -> loop env form Just "" -> do
| strip s == "!exit" -> outputStrLn "Exiting tricu" outputStrLn ""
| strip s == "!clear" -> do loop env
liftIO $ putStr "\ESC[2J\ESC[H" Just input -> do
loop env form newEnv <- liftIO $ (processInput env input `catch` errorHandler env)
| strip s == "!reset" -> do loop newEnv
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 == "!definitions" -> do
let defs = Map.keys $ Map.delete "!result" env
if null defs
then outputStrLn "No definitions discovered."
else do
outputStrLn "Available definitions:"
mapM_ outputStrLn defs
loop env form
| "!import" `isPrefixOf` strip s -> handleImport env form
| take 2 s == "--" -> loop env form
| otherwise -> do
newEnv <- liftIO $ processInput env s form `catch` errorHandler env
loop newEnv form
handleOutput :: Env -> EvaluatedForm -> InputT IO () processInput :: Map.Map String T -> String -> IO (Map.Map String T)
handleOutput env currentForm = do processInput env input = do
let formats = [Decode, TreeCalculus, FSL, AST, Ternary, Ascii] let clearEnv = Map.delete "__result" env
outputStrLn "Available output formats:" newEnv = evalSingle clearEnv (parseSingle input)
mapM_ (\(i, f) -> outputStrLn $ show i ++ ". " ++ show f) case Map.lookup "__result" newEnv of
(zip [1..] formats)
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 $
getInputLineWithInitial "File path to load < " ("", "")
text <- MaybeT $ liftIO $ handle (\e -> do
putStrLn $ "Error reading file: " ++ displayException (e :: IOException)
return Nothing
) $ Just <$> 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) < " ("", "")
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
interruptHandler :: Env -> EvaluatedForm -> Interrupt -> InputT IO ()
interruptHandler env form _ = do
outputStrLn "Interrupted with CTRL+C\n\
\You can use the !exit command or CTRL+D to exit"
loop env form
processInput :: Env -> String -> EvaluatedForm -> IO Env
processInput env input form = do
let asts = parseTricu input
newEnv = evalTricu env asts
case Map.lookup "!result" newEnv of
Just r -> do Just r -> do
putStrLn $ "tricu > " ++ formatResult form r putStrLn $ "tricu > " ++ show r
Nothing -> pure () putStrLn $ "READ -: \"" ++ decodeResult r ++ "\""
Nothing -> return ()
return newEnv return newEnv
errorHandler :: Env -> SomeException -> IO (Env) errorHandler :: Map.Map String T -> SomeException -> IO (Map.Map String T)
errorHandler env e = do errorHandler env e = do
putStrLn $ "Error: " ++ show e putStrLn $ "Error: " ++ show e
return env return env
strip :: String -> String decodeResult :: T -> String
strip = dropWhileEnd isSpace . dropWhile isSpace decodeResult tc = case toNumber tc of
Right num -> show num
handleSave :: Env -> EvaluatedForm -> InputT IO () Left _ -> case toString tc of
handleSave env form = do Right str -> str
let fset = setComplete completeFilename defaultSettings Left _ -> case toList tc of
path <- runInputT fset $ Right list -> "[" ++ intercalate ", " (map decodeResult list) ++ "]"
getInputLineWithInitial "File to save < " ("", "") Left _ -> ""
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

View File

@ -1,76 +1,45 @@
module Research where module Research where
import Control.Monad.State
import Data.List (intercalate) import Data.List (intercalate)
import Data.Map (Map) import Data.Map (Map)
import Data.Text (Text, replace)
import System.Console.CmdArgs (Data, Typeable)
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Text as T
-- Tree Calculus Types
data T = Leaf | Stem T | Fork T T data T = Leaf | Stem T | Fork T T
deriving (Show, Eq, Ord) deriving (Show, Eq, Ord)
-- Abstract Syntax Tree for tricu
data TricuAST
= SVar String
| SInt Int
| SStr String
| SList [TricuAST]
| SDef String [String] TricuAST
| SApp TricuAST TricuAST
| TLeaf
| TStem TricuAST
| TFork TricuAST TricuAST
| SLambda [String] TricuAST
| SEmpty
| SImport String String
deriving (Show, Eq, Ord)
-- Lexer Tokens
data LToken
= LKeywordT
| LIdentifier String
| LNamespace String
| LIntegerLiteral Int
| LStringLiteral String
| LAssign
| LColon
| LDot
| LOpenParen
| LCloseParen
| LOpenBracket
| LCloseBracket
| LNewline
| LImport String String
deriving (Show, Eq, Ord)
-- Output formats
data EvaluatedForm = TreeCalculus | FSL | AST | Ternary | Ascii | Decode
deriving (Show, Data, Typeable)
-- 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
-}
apply :: T -> T -> T 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 Leaf b = Stem b
apply (Stem a) b = Fork a 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
reduce :: T -> T
reduce expr =
let next = step expr
in if next == expr then expr else reduce next
step :: T -> T
step (Fork left right) = reduce (apply (reduce left) (reduce right))
step (Stem inner) = Stem (reduce inner)
step t = t
-- SKI Combinators
_S :: T
_S = Fork (Stem (Fork Leaf Leaf)) Leaf
_K :: T
_K = Stem Leaf
-- Identity
-- We use the "point-free" style which drops a redundant node
-- Full I form (SKK): Fork (Stem (Stem Leaf)) (Stem Leaf)
_I :: T
_I = Fork (Stem (Stem Leaf)) Leaf
-- Booleans -- Booleans
_false :: T _false :: T
@ -84,7 +53,7 @@ _not = Fork (Fork _true (Fork Leaf _false)) Leaf
-- Marshalling -- Marshalling
ofString :: String -> T ofString :: String -> T
ofString str = ofList $ map (ofNumber . fromEnum) str ofString str = ofList (map ofNumber (map fromEnum str))
ofNumber :: Int -> T ofNumber :: Int -> T
ofNumber 0 = Leaf ofNumber 0 = Leaf
@ -94,7 +63,8 @@ ofNumber n =
(ofNumber (n `div` 2)) (ofNumber (n `div` 2))
ofList :: [T] -> T ofList :: [T] -> T
ofList = foldr Fork Leaf ofList [] = Leaf
ofList (x:xs) = Fork x (ofList xs)
toNumber :: T -> Either String Int toNumber :: T -> Either String Int
toNumber Leaf = Right 0 toNumber Leaf = Right 0
@ -118,32 +88,7 @@ toList (Fork x rest) = case toList rest of
Left err -> Left err Left err -> Left err
toList _ = Left "Invalid Tree Calculus list" toList _ = Left "Invalid Tree Calculus list"
-- Outputs -- Utility
formatResult :: EvaluatedForm -> T -> String
formatResult TreeCalculus = toSimpleT . show
formatResult FSL = show
formatResult AST = show . toAST
formatResult Ternary = toTernaryString
formatResult Ascii = toAscii
formatResult Decode = decodeResult
toSimpleT :: String -> String
toSimpleT s = T.unpack
$ replace "Fork" "t"
$ replace "Stem" "t"
$ replace "Leaf" "t"
$ T.pack s
toTernaryString :: T -> String
toTernaryString Leaf = "0"
toTernaryString (Stem t) = "1" ++ toTernaryString t
toTernaryString (Fork t1 t2) = "2" ++ toTernaryString t1 ++ toTernaryString t2
toAST :: T -> TricuAST
toAST Leaf = TLeaf
toAST (Stem a) = TStem (toAST a)
toAST (Fork a b) = TFork (toAST a) (toAST b)
toAscii :: T -> String toAscii :: T -> String
toAscii tree = go tree "" True toAscii tree = go tree "" True
where where
@ -158,19 +103,41 @@ toAscii tree = go tree "" True
++ go left (prefix ++ (if isLast then " " else "| ")) False ++ go left (prefix ++ (if isLast then " " else "| ")) False
++ go right (prefix ++ (if isLast then " " else "| ")) True ++ go right (prefix ++ (if isLast then " " else "| ")) True
decodeResult :: T -> String rules :: IO ()
decodeResult Leaf = "t" rules = putStr $ header
decodeResult tc = ++ (unlines $ tcRules)
case (toString tc, toList tc, toNumber tc) of ++ (unlines $ haskellRules)
(Right s, _, _) | all isCommonChar s -> "\"" ++ s ++ "\"" ++ footer
(_, _, Right n) -> show n
(_, Right xs@(_:_), _) -> "[" ++ intercalate ", " (map decodeResult xs) ++ "]"
(_, Right [], _) -> "[]"
_ -> formatResult TreeCalculus tc
where where
isCommonChar c = tcRules :: [String]
let n = fromEnum c tcRules =
in (n >= 32 && n <= 126) [ "| |"
|| n == 9 , "| ┌--------- | Tree Calculus | ---------┐ |"
|| n == 10 , "| | 1. t t a b -> a | |"
|| n == 13 , "| | 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 | |"
, "| └-------------------------------------┘ |"
, "| |"
]
haskellRules :: [String]
haskellRules =
[ "| ┌------------------------------ | Haskell | --------------------------------┐ |"
, "| | | |"
, "| | data T = Leaf | Stem T | Fork TT | |"
, "| | | |"
, "| | apply :: T -> T -> T | |"
, "| | 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 | |"
, "| └---------------------------------------------------------------------------┘ |"
]
header :: String
header = "┌-------------------- | Rules for evaluating Tree Calculus | -------------------┐\n"
footer :: String
footer = "└-------------------- | Rules for evaluating Tree Calculus | -------------------┘\n"

View File

@ -1,15 +1,12 @@
module Main where module Main where
import Eval import Eval
import FileEval
import Lexer import Lexer
import Library
import Parser import Parser
import REPL import REPL
import Research import Research
import Control.Exception (evaluate, try, SomeException) import Control.Exception (evaluate, try, SomeException)
import Control.Monad.IO.Class (liftIO)
import Data.List (isInfixOf)
import Test.Tasty import Test.Tasty
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Test.Tasty.QuickCheck import Test.Tasty.QuickCheck
@ -26,233 +23,189 @@ runTricu s = show $ result (evalTricu Map.empty $ parseTricu s)
tests :: TestTree tests :: TestTree
tests = testGroup "Tricu Tests" tests = testGroup "Tricu Tests"
[ lexer [ lexerTests
, parser , parserTests
, simpleEvaluation , evaluationTests
, lambdas , lambdaEvalTests
, providedLibraries , libraryTests
, fileEval , propertyTests
, modules
, demos
, decoding
] ]
lexer :: TestTree lexerTests :: TestTree
lexer = testGroup "Lexer Tests" lexerTests = testGroup "Lexer Tests"
[ testCase "Lex simple identifiers" $ do [ testCase "Lex simple identifiers" $ do
let input = "x a b = a" let input = "x a b = a"
expect = Right [LIdentifier "x", LIdentifier "a", LIdentifier "b", LAssign, LIdentifier "a"] expect = Right [LIdentifier "x", LIdentifier "a", LIdentifier "b", LAssign, LIdentifier "a"]
runParser tricuLexer "" input @?= expect runParser tricuLexer "" input @?= expect
, testCase "Lex Tree Calculus terms" $ do , testCase "Lex Tree Calculus terms" $ do
let input = "t t t" let input = "t t t"
expect = Right [LKeywordT, LKeywordT, LKeywordT] expect = Right [LKeywordT, LKeywordT, LKeywordT]
runParser tricuLexer "" input @?= expect runParser tricuLexer "" input @?= expect
, testCase "Lex escaped characters in strings" $ do , testCase "Lex escaped characters in strings" $ do
let input = "\"hello\\nworld\"" let input = "\"hello\\nworld\""
expect = Right [LStringLiteral "hello\nworld"] expect = Right [LStringLiteral "hello\\nworld"]
runParser tricuLexer "" input @?= expect 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 "\""]
runParser tricuLexer "" input @?= expect
, testCase "Lex mixed literals" $ do , testCase "Lex mixed literals" $ do
let input = "t \"string\" 42" let input = "t \"string\" 42"
expect = Right [LKeywordT, LStringLiteral "string", LIntegerLiteral 42] expect = Right [LKeywordT, LStringLiteral "string", LIntegerLiteral 42]
runParser tricuLexer "" input @?= expect runParser tricuLexer "" input @?= expect
, testCase "Lex invalid token" $ do , testCase "Lex invalid token" $ do
let input = "&invalid" let input = "$invalid"
case runParser tricuLexer "" input of case runParser tricuLexer "" input of
Left _ -> return () Left _ -> return ()
Right _ -> assertFailure "Expected lexer to fail on invalid token" Right _ -> assertFailure "Expected lexer to fail on invalid token"
, testCase "Drop trailing whitespace in definitions" $ do , testCase "Drop trailing whitespace in definitions" $ do
let input = "x = 5 " let input = "x = 5 "
expect = [LIdentifier "x",LAssign,LIntegerLiteral 5] expect = [LIdentifier "x",LAssign,LIntegerLiteral 5]
case (runParser tricuLexer "" input) of case (runParser tricuLexer "" input) of
Left _ -> assertFailure "Failed to lex input" Left _ -> assertFailure "Failed to lex input"
Right i -> i @?= expect Right i -> i @?= expect
, testCase "Error when using invalid characters in identifiers" $ do , testCase "Error when using invalid characters in identifiers" $ do
case (runParser tricuLexer "" "!result = 5") of case (runParser tricuLexer "" "__result = 5") of
Left _ -> return () Left _ -> return ()
Right _ -> assertFailure "Expected failure when trying to assign the value of !result" Right _ -> assertFailure "Expected failure when trying to assign the value of __result"
] ]
parser :: TestTree parserTests :: TestTree
parser = testGroup "Parser Tests" parserTests = testGroup "Parser Tests"
[ testCase "Error when assigning a value to T" $ do [-- testCase "Error when parsing incomplete definitions" $ do
let tokens = lexTricu "t = x" -- let input = lexTricu "x = "
case parseSingleExpr tokens of -- case (runParser parseExpression "" input) of
-- Left _ -> return ()
-- Right _ -> assertFailure "Expected failure on invalid input"
testCase "Error when assigning a value to T" $ do
let input = lexTricu "t = x"
case (runParser parseExpression "" input) of
Left _ -> return () Left _ -> return ()
Right _ -> assertFailure "Expected failure when trying to assign the value of T" Right _ -> assertFailure "Expected failure when trying to assign the value of T"
, testCase "Parse function definitions" $ do , 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")))) expect = SFunc "x" [] (SLambda ["a"] (SLambda ["b"] (SLambda ["c"] (SVar "a"))))
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse nested Tree Calculus terms" $ do , testCase "Parse nested Tree Calculus terms" $ do
let input = "t (t t) t" let input = "t (t t) t"
expect = SApp (SApp TLeaf (SApp TLeaf TLeaf)) TLeaf expect = SApp (SApp TLeaf (SApp TLeaf TLeaf)) TLeaf
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse sequential Tree Calculus terms" $ do , testCase "Parse sequential Tree Calculus terms" $ do
let input = "t t t" let input = "t t t"
expect = SApp (SApp TLeaf TLeaf) TLeaf expect = SApp (SApp TLeaf TLeaf) TLeaf
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse mixed list literals" $ do , testCase "Parse mixed list literals" $ do
let input = "[t (\"hello\") t]" let input = "[t (\"hello\") t]"
expect = SList [TLeaf, SStr "hello", TLeaf] expect = SList [TLeaf, SStr "hello", TLeaf]
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse function with applications" $ do , 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"))) expect = SFunc "f" [] (SLambda ["x"] (SApp TLeaf (SVar "x")))
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse nested lists" $ do , testCase "Parse nested lists" $ do
let input = "[t [(t t)]]" let input = "[t [(t t)]]"
expect = SList [TLeaf,SList [SApp TLeaf TLeaf]] expect = SList [TLeaf,SList [SApp TLeaf TLeaf]]
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse complex parentheses" $ do , testCase "Parse complex parentheses" $ do
let input = "t (t t (t t))" let input = "t (t t (t t))"
expect = SApp TLeaf (SApp (SApp TLeaf TLeaf) (SApp TLeaf TLeaf)) expect = SApp TLeaf (SApp (SApp TLeaf TLeaf) (SApp TLeaf TLeaf))
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse empty list" $ do , testCase "Parse empty list" $ do
let input = "[]" let input = "[]"
expect = SList [] expect = SList []
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse multiple nested lists" $ do , testCase "Parse multiple nested lists" $ do
let input = "[[t t] [t (t t)]]" let input = "[[t t] [t (t t)]]"
expect = SList [SList [TLeaf,TLeaf],SList [TLeaf,SApp TLeaf TLeaf]] expect = SList [SList [TLeaf,TLeaf],SList [TLeaf,SApp TLeaf TLeaf]]
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse whitespace variance" $ do , testCase "Parse whitespace variance" $ do
let input1 = "[t t]" let input1 = "[t t]"
let input2 = "[ t t ]" let input2 = "[ t t ]"
expect = SList [TLeaf, TLeaf] expect = SList [TLeaf, TLeaf]
parseSingle input1 @?= expect parseSingle input1 @?= expect
parseSingle input2 @?= expect parseSingle input2 @?= expect
, testCase "Parse string in list" $ do , testCase "Parse string in list" $ do
let input = "[(\"hello\")]" let input = "[(\"hello\")]"
expect = SList [SStr "hello"] expect = SList [SStr "hello"]
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse parentheses inside list" $ do , testCase "Parse parentheses inside list" $ do
let input = "[t (t t)]" let input = "[t (t t)]"
expect = SList [TLeaf,SApp TLeaf TLeaf] expect = SList [TLeaf,SApp TLeaf TLeaf]
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse nested parentheses in function body" $ do , 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)))) expect = SFunc "f" [] (SLambda ["x"] (SApp TLeaf (SApp TLeaf (SApp TLeaf TLeaf))))
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse lambda abstractions" $ do , testCase "Parse lambda abstractions" $ do
let input = "(a : a)" let input = "(\\a : a)"
expect = (SLambda ["a"] (SVar "a")) expect = (SLambda ["a"] (SVar "a"))
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Parse multiple arguments to lambda abstractions" $ do , 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"))) expect = SFunc "x" [] (SLambda ["a"] (SLambda ["b"] (SVar "a")))
parseSingle input @?= expect parseSingle input @?= expect
, testCase "Grouping T terms with parentheses in function application" $ do , 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] expect = [SFunc "x" [] (SLambda ["a"] (SVar "a")),SApp (SVar "x") TLeaf]
parseTricu input @?= expect parseTricu input @?= expect
, testCase "Comments 1" $ do , testCase "Comments 1" $ do
let input = "(t) (t) -- (t)" let input = "(t) (t) -- (t)"
expect = [SApp TLeaf TLeaf] expect = [SApp TLeaf TLeaf]
parseTricu input @?= expect parseTricu input @?= expect
, testCase "Comments 2" $ do , testCase "Comments 2" $ do
let input = "(t) -- (t) -- (t)" let input = "(t) -- (t) -- (t)"
expect = [TLeaf] expect = [TLeaf]
parseTricu input @?= expect parseTricu input @?= expect
-- , testCase "Comments with no terms" $ do
-- let input = unlines ["-- (t)", "(t t)"]
-- expect = []
-- parseTricu input @?= expect
] ]
simpleEvaluation :: TestTree evaluationTests :: TestTree
simpleEvaluation = testGroup "Evaluation Tests" evaluationTests = testGroup "Evaluation Tests"
[ testCase "Evaluate single Leaf" $ do [ testCase "Evaluate single Leaf" $ do
let input = "t" let input = "t"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= Leaf (result $ evalSingle Map.empty ast) @?= Leaf
, testCase "Evaluate single Stem" $ do , testCase "Evaluate single Stem" $ do
let input = "t t" let input = "t t"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= Stem Leaf (result $ evalSingle Map.empty ast) @?= Stem Leaf
, testCase "Evaluate single Fork" $ do , testCase "Evaluate single Fork" $ do
let input = "t t t" let input = "t t t"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= Fork Leaf Leaf (result $ evalSingle Map.empty ast) @?= Fork Leaf Leaf
, testCase "Evaluate nested Fork and Stem" $ do , testCase "Evaluate nested Fork and Stem" $ do
let input = "t (t t) t" let input = "t (t t) t"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= Fork (Stem Leaf) Leaf (result $ evalSingle Map.empty ast) @?= Fork (Stem Leaf) Leaf
, testCase "Evaluate `not` function" $ do , testCase "Evaluate `not` function" $ do
let input = "t (t (t t) (t t t)) t" let input = "t (t (t t) (t t t)) t"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= (result $ evalSingle Map.empty ast) @?=
Fork (Fork (Stem Leaf) (Fork Leaf Leaf)) Leaf Fork (Fork (Stem Leaf) (Fork Leaf Leaf)) Leaf
, testCase "Environment updates with definitions" $ do , testCase "Environment updates with definitions" $ do
let input = "x = t\ny = x" let input = "x = t\ny = x"
env = evalTricu Map.empty (parseTricu input) env = evalTricu Map.empty (parseTricu input)
Map.lookup "x" env @?= Just Leaf Map.lookup "x" env @?= Just Leaf
Map.lookup "y" env @?= Just Leaf Map.lookup "y" env @?= Just Leaf
, testCase "Variable substitution" $ do , testCase "Variable substitution" $ do
let input = "x = t t\ny = t x\ny" let input = "x = t t\ny = t x\ny"
env = evalTricu Map.empty (parseTricu input) env = evalTricu Map.empty (parseTricu input)
(result env) @?= Stem (Stem Leaf) (result env) @?= Stem (Stem Leaf)
, testCase "Multiline input evaluation" $ do , testCase "Multiline input evaluation" $ do
let input = "x = t\ny = t t\nx" let input = "x = t\ny = t t\nx"
env = evalTricu Map.empty (parseTricu input) env = evalTricu Map.empty (parseTricu input)
(result env) @?= Leaf (result env) @?= Leaf
, testCase "Evaluate string literal" $ do , testCase "Evaluate string literal" $ do
let input = "\"hello\"" let input = "\"hello\""
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= ofString "hello" (result $ evalSingle Map.empty ast) @?= ofString "hello"
, testCase "Evaluate list literal" $ do , testCase "Evaluate list literal" $ do
let input = "[t (t t)]" let input = "[t (t t)]"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= ofList [Leaf, Stem Leaf] (result $ evalSingle Map.empty ast) @?= ofList [Leaf, Stem Leaf]
, testCase "Evaluate empty list" $ do , testCase "Evaluate empty list" $ do
let input = "[]" let input = "[]"
let ast = parseSingle input let ast = parseSingle input
(result $ evalSingle Map.empty ast) @?= ofList [] (result $ evalSingle Map.empty ast) @?= ofList []
, testCase "Evaluate variable dependency chain" $ do , testCase "Evaluate variable dependency chain" $ do
let input = "x = t (t t)\n \ let input = "x = t (t t)\n \
\ y = x\n \ \ y = x\n \
@ -261,312 +214,176 @@ simpleEvaluation = testGroup "Evaluation Tests"
\ variablewithamuchlongername" \ variablewithamuchlongername"
env = evalTricu Map.empty (parseTricu input) env = evalTricu Map.empty (parseTricu input)
(result env) @?= (Stem (Stem Leaf)) (result env) @?= (Stem (Stem Leaf))
, testCase "Evaluate variable shadowing" $ do
, testCase "Immutable definitions" $ do
let input = "x = t t\nx = t\nx" let input = "x = t t\nx = t\nx"
env = evalTricu Map.empty (parseTricu input) env = evalTricu Map.empty (parseTricu input)
result <- try (evaluate (runTricu input)) :: IO (Either SomeException String) (result env) @?= Leaf
case result of
Left _ -> return ()
Right _ -> assertFailure "Expected evaluation error"
, testCase "Apply identity to Boolean Not" $ do , testCase "Apply identity to Boolean Not" $ do
let not = "(t (t (t t) (t t t)) t)" 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) env = evalTricu Map.empty (parseTricu input)
result env @?= Fork (Fork (Stem Leaf) (Fork Leaf Leaf)) Leaf result env @?= Fork (Fork (Stem Leaf) (Fork Leaf Leaf)) Leaf
] ]
lambdas :: TestTree lambdaEvalTests :: TestTree
lambdas = testGroup "Lambda Evaluation Tests" lambdaEvalTests = testGroup "Lambda Evaluation Tests"
[ testCase "Lambda Identity Function" $ do [ testCase "Lambda Identity Function" $ do
let input = "id = (x : x)\nid t" let input = "id = (\\x : x)\nid t"
runTricu input @?= "Leaf" runTricu input @?= "Leaf"
, testCase "Lambda Constant Function (K combinator)" $ do , 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" runTricu input @?= "Leaf"
, testCase "Lambda Application with Variable" $ do , 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" runTricu input @?= "Stem Leaf"
, testCase "Lambda Application with Multiple Arguments" $ do , 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" runTricu input @?= "Leaf"
, testCase "Nested Lambda Application" $ do , 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" runTricu input @?= "Leaf"
, testCase "Lambda with a complex body" $ do , 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)" runTricu input @?= "Stem (Stem Leaf)"
, testCase "Lambda returning a function" $ do , 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" runTricu input @?= "Leaf"
, testCase "Lambda with Shadowing" $ do , 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" runTricu input @?= "Stem Leaf"
, testCase "Lambda returning another lambda" $ do , 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" runTricu input @?= "Leaf"
, testCase "Lambda with free variables" $ do , 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" runTricu input @?= "Stem Leaf"
, testCase "SKI Composition" $ do , 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)" runTricu input @?= "Stem (Stem Leaf)"
, testCase "Lambda with multiple parameters and application" $ do , 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" runTricu input @?= "Stem Leaf"
, testCase "Lambda with nested application in the body" $ do , 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))" runTricu input @?= "Stem (Stem (Stem Leaf))"
, testCase "Lambda returning a function and applying it" $ do , 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)" runTricu input @?= "Fork Leaf (Stem Leaf)"
, testCase "Lambda applying a variable" $ do , 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" runTricu input @?= "Stem Leaf"
, testCase "Nested lambda abstractions in the same expression" $ do , 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" runTricu input @?= "Leaf"
, testCase "Lambda with a string literal" $ do
, testCase "Lambda applied to string literal" $ do let input = "f = (\\x : x)\nf \"hello\""
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))))" 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 with an integer literal" $ do
let input = "f = (\\x : x)\nf 42"
, testCase "Lambda applied to 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)))))" runTricu input @?= "Fork Leaf (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) (Fork Leaf (Fork (Stem Leaf) Leaf)))))"
, testCase "Lambda with a list literal" $ do
, testCase "Lambda applied to list literal" $ do let input = "f = (\\x : x)\nf [t (t t)]"
let input = "f = (x : x)\nf [t (t t)]"
runTricu input @?= "Fork Leaf (Fork (Stem Leaf) Leaf)" 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 libraryTests :: TestTree
providedLibraries = testGroup "Library Tests" libraryTests = testGroup "Library Tests"
[ testCase "Triage test Leaf" $ do [ testCase "K combinator 1" $ do
library <- evaluateFile "./lib/list.tri" let input = "k (t) (t t)"
let input = "test t"
env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "\"Leaf\""
, testCase "Triage test (Stem Leaf)" $ do
library <- evaluateFile "./lib/list.tri"
let input = "test (t t)"
env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "\"Stem\""
, testCase "Triage test (Fork Leaf Leaf)" $ do
library <- evaluateFile "./lib/list.tri"
let input = "test (t t t)"
env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "\"Fork\""
, testCase "Boolean NOT: true" $ do
library <- evaluateFile "./lib/list.tri"
let input = "not? true"
env = result $ evalTricu library (parseTricu input)
env @?= Leaf
, testCase "Boolean NOT: false" $ do
library <- evaluateFile "./lib/list.tri"
let input = "not? false"
env = result $ evalTricu library (parseTricu input)
env @?= Stem Leaf
, testCase "Boolean AND TF" $ do
library <- evaluateFile "./lib/list.tri"
let input = "and? (t t) (t)"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Leaf result env @?= Leaf
, testCase "K combinator 2" $ do
, testCase "Boolean AND FT" $ do let input = "k (t t) (t)"
library <- evaluateFile "./lib/list.tri" env = evalTricu library (parseTricu input)
let input = "and? (t) (t t)" result env @?= Stem Leaf
env = evalTricu library (parseTricu input) , testCase "K combinator 3" $ do
result env @?= Leaf let input = "k (t t t) (t)"
env = evalTricu library (parseTricu input)
, testCase "Boolean AND FF" $ do result env @?= Fork Leaf Leaf
library <- evaluateFile "./lib/list.tri" , testCase "S combinator" $ do
let input = "and? (t) (t)" let input = "s (t) (t) (t)"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Leaf result env @?= Fork Leaf (Stem Leaf)
, testCase "SKK == I (fully expanded)" $ do
, testCase "Boolean AND TT" $ do let input = "s k k"
library <- evaluateFile "./lib/list.tri" env = evalTricu library (parseTricu input)
let input = "and? (t t) (t t)" result env @?= Fork (Stem (Stem Leaf)) (Stem Leaf)
, testCase "I combinator" $ do
let input = "i not"
env = evalTricu library (parseTricu input)
result env @?= Fork (Fork (Stem Leaf) (Fork Leaf Leaf)) (Fork Leaf (Fork Leaf Leaf))
, testCase "Triage test Leaf" $ do
let input = "test t"
env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "Leaf"
, testCase "Triage test (Stem Leaf)" $ do
let input = "test (t t)"
env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "Stem"
, testCase "Triage test (Fork Leaf Leaf)" $ do
let input = "test (t t t)"
env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "Fork"
, testCase "Boolean NOT: true" $ do
let input = "not true"
env = result $ evalTricu library (parseTricu input)
env @?= Leaf
, testCase "Boolean NOT: false" $ do
let input = "not false"
env = result $ evalTricu library (parseTricu input)
env @?= Stem Leaf
, testCase "Boolean AND TF" $ do
let input = "and (t t) (t)"
env = evalTricu library (parseTricu input)
result env @?= Leaf
, testCase "Boolean AND FT" $ do
let input = "and (t) (t t)"
env = evalTricu library (parseTricu input)
result env @?= Leaf
, testCase "Boolean AND FF" $ do
let input = "and (t) (t)"
env = evalTricu library (parseTricu input)
result env @?= Leaf
, testCase "Boolean AND TT" $ do
let input = "and (t t) (t t)"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Stem Leaf result env @?= Stem Leaf
, testCase "List head" $ do , testCase "List head" $ do
library <- evaluateFile "./lib/list.tri"
let input = "head [(t) (t t) (t t t)]" let input = "head [(t) (t t) (t t t)]"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Leaf result env @?= Leaf
, testCase "List tail" $ do , testCase "List tail" $ do
library <- evaluateFile "./lib/list.tri"
let input = "head (tail (tail [(t) (t t) (t t t)]))" let input = "head (tail (tail [(t) (t t) (t t t)]))"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Fork Leaf Leaf result env @?= Fork Leaf Leaf
, testCase "List map" $ do , 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) env = evalTricu library (parseTricu input)
result env @?= Fork Leaf Leaf result env @?= Fork Leaf Leaf
, testCase "Empty list check" $ do , testCase "Empty list check" $ do
library <- evaluateFile "./lib/list.tri" let input = "emptyList []"
let input = "emptyList? []"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Stem Leaf result env @?= Stem Leaf
, testCase "Non-empty list check" $ do , testCase "Non-empty list check" $ do
library <- evaluateFile "./lib/list.tri" let input = "not (emptyList [(1) (2) (3)])"
let input = "not? (emptyList? [(1) (2) (3)])"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Stem Leaf result env @?= Stem Leaf
, testCase "Concatenate strings" $ do , testCase "Concatenate strings" $ do
library <- evaluateFile "./lib/list.tri" let input = "listConcat \"Hello, \" \"world!\""
let input = "append \"Hello, \" \"world!\""
env = decodeResult $ result $ evalTricu library (parseTricu input) env = decodeResult $ result $ evalTricu library (parseTricu input)
env @?= "\"Hello, world!\"" env @?= "Hello, world!"
, testCase "Verifying Equality" $ do , testCase "Verifying Equality" $ do
library <- evaluateFile "./lib/list.tri" let input = "equal (t t t) (t t t)"
let input = "equal? (t t t) (t t t)"
env = evalTricu library (parseTricu input) env = evalTricu library (parseTricu input)
result env @?= Stem Leaf result env @?= Stem Leaf
] ]
fileEval :: TestTree propertyTests :: TestTree
fileEval = testGroup "File evaluation tests" propertyTests = testGroup "Property Tests"
[ testCase "Forks" $ do [ testProperty "Lexing and parsing round-trip" $ \input ->
res <- liftIO $ evaluateFileResult "./test/fork.tri" case runParser tricuLexer "" input of
res @?= Fork Leaf Leaf Left _ -> property True
Right tokens -> case runParser parseExpression "" tokens of
, testCase "File ends with comment" $ do Left _ -> property True
res <- liftIO $ evaluateFileResult "./test/comments-1.tri" Right ast -> parseSingle input === ast
res @?= Fork (Stem Leaf) Leaf
, testCase "Mapping and Equality" $ do
library <- liftIO $ evaluateFile "./lib/list.tri"
fEnv <- liftIO $ evaluateFileWithContext library "./test/map.tri"
(mainResult fEnv) @?= Stem Leaf
, testCase "Eval and decoding string" $ do
library <- liftIO $ evaluateFile "./lib/list.tri"
res <- liftIO $ evaluateFileWithContext library "./test/string.tri"
decodeResult (result res) @?= "\"String test!\""
]
modules :: TestTree
modules = testGroup "Test modules"
[ testCase "Detect cyclic dependencies" $ do
result <- try (liftIO $ evaluateFileResult "./test/cycle-1.tri") :: IO (Either SomeException T)
case result of
Left e -> do
let errorMsg = show e
if "Encountered cyclic import" `isInfixOf` errorMsg
then return ()
else assertFailure $ "Unexpected error: " ++ errorMsg
Right _ -> assertFailure "Expected cyclic dependencies"
, testCase "Module imports and namespacing" $ do
res <- liftIO $ evaluateFileResult "./test/namespace-A.tri"
res @?= Leaf
, testCase "Multiple imports" $ do
res <- liftIO $ evaluateFileResult "./test/vars-A.tri"
res @?= Leaf
, testCase "Error on unresolved variable" $ do
result <- try (liftIO $ evaluateFileResult "./test/unresolved-A.tri") :: IO (Either SomeException T)
case result of
Left e -> do
let errorMsg = show e
if "undefinedVar" `isInfixOf` errorMsg
then return ()
else assertFailure $ "Unexpected error: " ++ errorMsg
Right _ -> assertFailure "Expected unresolved variable error"
, testCase "Multi-level imports" $ do
res <- liftIO $ evaluateFileResult "./test/multi-level-A.tri"
res @?= Leaf
, testCase "Lambda expression namespaces" $ do
res <- liftIO $ evaluateFileResult "./test/lambda-A.tri"
res @?= Leaf
, testCase "Local namespace import chain" $ do
res <- liftIO $ evaluateFileResult "./test/local-ns/1.tri"
res @?= Fork (Stem Leaf) (Fork (Stem Leaf) Leaf)
]
-- All of our demo tests are also module tests
demos :: TestTree
demos = testGroup "Test provided demo functionality"
[ testCase "Structural equality demo" $ do
res <- liftIO $ evaluateFileResult "./demos/equality.tri"
decodeResult res @?= "t t"
, testCase "Convert values back to source code demo" $ do
res <- liftIO $ evaluateFileResult "./demos/toSource.tri"
decodeResult res @?= "\"(t (t (t t) (t t t)) (t t (t t t)))\""
, testCase "Determining the size of functions" $ do
res <- liftIO $ evaluateFileResult "./demos/size.tri"
decodeResult res @?= "454"
, testCase "Level Order Traversal demo" $ do
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\"]"
] ]

View File

@ -1,9 +0,0 @@
-- This is a tricu comment!
-- t (t t) (t (t t t))
-- t (t t t) (t t)
-- x = (a : a)
main = t (t t) t -- Fork (Stem Leaf) Leaf
-- t t
-- x
-- x = (a : a)
-- t

View File

@ -1,4 +0,0 @@
!import "cycle-2.tri" Cycle2
cycle1 = t Cycle2.cycle2

View File

@ -1,4 +0,0 @@
!import "cycle-1.tri" Cycle1
cycle2 = t Cycle1.cycle1

View File

@ -1 +0,0 @@
main = t t t

View File

@ -1 +0,0 @@
main = (x : x) t

View File

@ -1,4 +0,0 @@
!import "2.tri" Two
main = Two.x

View File

@ -1,2 +0,0 @@
!import "3.tri" !Local

View File

@ -1 +0,0 @@
x = 3

View File

@ -1,2 +0,0 @@
x = map (i : append "Successfully concatenated " i) [("two strings!")]
main = equal? x [("Successfully concatenated two strings!")]

View File

@ -1,2 +0,0 @@
!import "multi-level-B.tri" B
main = B.main

View File

@ -1,2 +0,0 @@
!import "multi-level-C.tri" C
main = C.val

View File

@ -1 +0,0 @@
val = t

View File

@ -1,7 +0,0 @@
!import "lib/base.tri"
!import "test/named-imports/2.tri"
!import "test/named-imports/3.tri" ThreeRenamed
main = equal? (equal? Two.x 2) (equal? ThreeRenamed.x 3)

View File

@ -1,2 +0,0 @@
x = 2

View File

@ -1,2 +0,0 @@
x = 3

View File

@ -1,2 +0,0 @@
!import "namespace-B.tri" B
main = B.x

View File

@ -1 +0,0 @@
x = t

View File

@ -1,21 +0,0 @@
compose = f g x : f (g x)
succ = y (self :
triage
1
t
(triage
(t (t t))
(_ tail : t t (self tail))
t))
size = (x :
(y (self x :
compose succ
(triage
(x : x)
self
(x y : compose (self x) (self y))
x)) x 0))
size size

View File

@ -1 +0,0 @@
head (map (i : append "String " i) [("test!")])

View File

@ -1 +0,0 @@
main = undefinedVar

View File

@ -1,6 +0,0 @@
!import "vars-B.tri" B
!import "vars-C.tri" C
main = B.y (C.z)

View File

@ -1 +0,0 @@
y = x : x

View File

@ -1 +0,0 @@
z = t

View File

@ -1,7 +1,7 @@
cabal-version: 1.12 cabal-version: 1.12
name: tricu name: tricu
version: 0.18.1 version: 0.4.0
description: A micro-language for exploring Tree Calculus description: A micro-language for exploring Tree Calculus
author: James Eversole author: James Eversole
maintainer: james@eversole.co maintainer: james@eversole.co
@ -17,26 +17,25 @@ executable tricu
hs-source-dirs: hs-source-dirs:
src src
default-extensions: default-extensions:
DeriveDataTypeable ConstraintKinds
LambdaCase DataKinds
MultiWayIf DeriveGeneric
FlexibleContexts
FlexibleInstances
GeneralizedNewtypeDeriving
OverloadedStrings OverloadedStrings
ScopedTypeVariables
ghc-options: -threaded -rtsopts -with-rtsopts=-N -optl-pthread -fPIC ghc-options: -threaded -rtsopts -with-rtsopts=-N -optl-pthread -fPIC
build-depends: build-depends:
base >=4.7 base >=4.7
, cmdargs
, containers , containers
, exceptions
, filepath
, haskeline , haskeline
, megaparsec , megaparsec
, mtl , mtl
, text
, transformers
other-modules: other-modules:
Eval Eval
FileEval
Lexer Lexer
Library
Parser Parser
REPL REPL
Research Research
@ -46,30 +45,20 @@ test-suite tricu-tests
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: Spec.hs main-is: Spec.hs
hs-source-dirs: test, src hs-source-dirs: test, src
default-extensions:
DeriveDataTypeable
LambdaCase
MultiWayIf
OverloadedStrings
build-depends: build-depends:
base base
, cmdargs
, containers , containers
, exceptions
, filepath
, haskeline , haskeline
, megaparsec , megaparsec
, mtl , mtl
, tasty , tasty
, tasty-hunit , tasty-hunit
, tasty-quickcheck , tasty-quickcheck
, text
, transformers
default-language: Haskell2010 default-language: Haskell2010
other-modules: other-modules:
Eval Eval
FileEval
Lexer Lexer
Library
Parser Parser
REPL REPL
Research Research