Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Dev #17

Merged
merged 102 commits into from
Dec 13, 2023
Merged

Dev #17

Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
0e9becb
add executable to gitignore
TTENSHII Nov 29, 2023
91274a7
add powershell build script
TTENSHII Nov 29, 2023
5944580
Add work in progress
TTENSHII Nov 29, 2023
434e120
add work in progress
TTENSHII Nov 30, 2023
b644978
Interpreter V.0: Add textToAST parser, handling int64, bool and funct…
guillaumeAbel Dec 2, 2023
3b9337a
Merge branch 'dev' into 2-parse-text-to-ast
guillaumeAbel Dec 2, 2023
f4ba375
Interpreter V.0: Fix remaining debug + wrong word
guillaumeAbel Dec 2, 2023
fd655e7
Interpreter v.0: Fix pr requests
guillaumeAbel Dec 2, 2023
5241cde
Interpreter v.0: Fix compil
guillaumeAbel Dec 2, 2023
0f82b94
Interpreter v.0: Fix norm
guillaumeAbel Dec 2, 2023
d3b0643
Fix conflicts
guillaumeAbel Dec 2, 2023
f9c87b5
Fix test maybe
Saverio976 Dec 2, 2023
3d3a591
Add test for Varidadic argument/list
Saverio976 Dec 4, 2023
0fd7729
Send bad exit code if error
Saverio976 Dec 4, 2023
47ed9fb
Add env and new functions
TTENSHII Dec 4, 2023
47ff922
Interpreter v.0: Add current progress
guillaumeAbel Dec 4, 2023
a030bcd
Merge branch '2-parse-text-to-ast' of https://github.com/X-R-G-B/koak…
guillaumeAbel Dec 4, 2023
c21ab8f
Remove some compil error
Saverio976 Dec 4, 2023
d2414a3
Fix last part of variadic
Saverio976 Dec 4, 2023
8afc1f9
Add test for some parsing case
Saverio976 Dec 4, 2023
91c86ef
Add more tests and Fix bug
Saverio976 Dec 4, 2023
7d16bd9
Interpreter v.0: Add test
guillaumeAbel Dec 4, 2023
9ab54bf
Add test and bug fix
Saverio976 Dec 4, 2023
a9453c7
Fix bug space at end
Saverio976 Dec 4, 2023
f5d5eb7
Fix line too long
Saverio976 Dec 4, 2023
c81bc17
Fix norm guard
Saverio976 Dec 4, 2023
a8600e6
Merge pull request #8 from X-R-G-B/2-parse-text-to-ast
TTENSHII Dec 4, 2023
fb75ee5
add working defines with basic operations (+-*)
TTENSHII Dec 5, 2023
99a30cf
add deepestnode
TTENSHII Dec 5, 2023
43746a8
add build script
TTENSHII Dec 5, 2023
c73322c
Fix resolveDeepestNode
TTENSHII Dec 5, 2023
cd08a38
Merge main into compute AST
TTENSHII Dec 5, 2023
84eab85
Fix header
TTENSHII Dec 5, 2023
b21f8b9
Merge branch 'dev' into 3-compute-ast
TTENSHII Dec 5, 2023
9c88c5a
Add unit tests for compute
TTENSHII Dec 5, 2023
b5f5af2
Interpreter v.0: Add debug
guillaumeAbel Dec 5, 2023
1e84747
Interpreter v.0: Add tests
guillaumeAbel Dec 5, 2023
97bbbf7
Fix tests
Saverio976 Dec 5, 2023
7da3907
Interpreter v.0: Add tests
guillaumeAbel Dec 5, 2023
b390b67
Add more tests
TTENSHII Dec 5, 2023
9217e32
Interpreter v.0: Fix norm
guillaumeAbel Dec 5, 2023
9f6cfc1
Add coverage to documentation
Saverio976 Dec 5, 2023
e64ec13
Merge branch 'parser-more-testing' of github.com:X-R-G-B/koaky into p…
Saverio976 Dec 5, 2023
32af367
add work in progress
TTENSHII Dec 6, 2023
2dd3c0d
Divide files
TTENSHII Dec 6, 2023
960e364
Clean files
TTENSHII Dec 6, 2023
284c0c5
fix coding style
TTENSHII Dec 6, 2023
78403ef
Fix coding style
TTENSHII Dec 6, 2023
7664757
Add step 2-3 to project
Saverio976 Dec 6, 2023
280f0ab
Add bootstrap part 2-3
Saverio976 Dec 6, 2023
ce47211
Add bootstrap part 2.1.2
Saverio976 Dec 6, 2023
012aa59
Add support of modulo
TTENSHII Dec 6, 2023
e029b82
Add parser end bootstrap
Saverio976 Dec 6, 2023
c51b4d4
Interpreter v.0: Add debug
guillaumeAbel Dec 5, 2023
4dd4dd6
Interpreter v.0: Add tests
guillaumeAbel Dec 5, 2023
96544dd
Fix tests
Saverio976 Dec 5, 2023
69bac8b
Interpreter v.0: Add tests
guillaumeAbel Dec 5, 2023
9b02c73
Interpreter v.0: Fix norm
guillaumeAbel Dec 5, 2023
aedba32
Add coverage to documentation
Saverio976 Dec 5, 2023
932bd74
Fix documentation
Saverio976 Dec 6, 2023
312a66e
Merge branch 'dev' into 3-compute-ast
guillaumeAbel Dec 6, 2023
c8c5584
Fix compil
Saverio976 Dec 6, 2023
e727a2f
Merge pull request #10 from X-R-G-B/3-compute-ast
guillaumeAbel Dec 6, 2023
ecb7ddc
Interpreter v.1: Refactor Tree
guillaumeAbel Dec 6, 2023
4dfbddd
Interpreter v.1: Fix test
guillaumeAbel Dec 6, 2023
27420bd
Interpreter v.1: Fix type + update tests
guillaumeAbel Dec 7, 2023
a3bfe70
Interpreter v.1: Remove Maybe Tree
guillaumeAbel Dec 7, 2023
45b9331
Add compute tests
TTENSHII Dec 8, 2023
8122e56
Merge branch 'dev' into 13-compute-with-new-tree-type
TTENSHII Dec 8, 2023
bd59a2e
Merge branch 'dev' into 13-compute-with-new-tree-type
TTENSHII Dec 8, 2023
1a3a3fb
add work in progress
TTENSHII Dec 10, 2023
757559c
add better defines
TTENSHII Dec 10, 2023
fb2fa21
add getSymbolValue for int
TTENSHII Dec 10, 2023
a70451e
add more tests
TTENSHII Dec 10, 2023
4218e9a
add errors module
TTENSHII Dec 10, 2023
d1c1d13
clean code
TTENSHII Dec 10, 2023
78031b0
add addition
TTENSHII Dec 10, 2023
a1dcf4f
set better name to tests
TTENSHII Dec 10, 2023
f42022a
add doesListContainsList func
TTENSHII Dec 10, 2023
c06bd22
Add working nested list
TTENSHII Dec 10, 2023
c60d905
Fix funcitons
TTENSHII Dec 10, 2023
74f9cb2
add division and modulo
TTENSHII Dec 11, 2023
8d479ac
Fix define with list
TTENSHII Dec 11, 2023
64bec86
Clean code
TTENSHII Dec 11, 2023
6e895b2
fix too long line
TTENSHII Dec 11, 2023
00cd7e3
Fix f4 too long funciton
TTENSHII Dec 11, 2023
d150014
Add more tests
TTENSHII Dec 11, 2023
7cbafd1
Merge pull request #14 from X-R-G-B/13-compute-with-new-tree-type
guillaumeAbel Dec 11, 2023
2d64b8e
Interpreter v.2: Fix conflicts
guillaumeAbel Dec 11, 2023
de517b2
Interpreter v.1: Fix conflicts
guillaumeAbel Dec 11, 2023
767117e
Interpreter v.1: Fix conflicts
guillaumeAbel Dec 11, 2023
ff24e08
Interpreter v.1: Add parseTree
guillaumeAbel Dec 11, 2023
34af72c
Add current progress
guillaumeAbel Dec 12, 2023
68d9604
Add current progress
guillaumeAbel Dec 12, 2023
f2669b1
Interpreter v.1: Add new parser, tested
guillaumeAbel Dec 12, 2023
eb73df5
Fix norm
guillaumeAbel Dec 12, 2023
81e1028
Merge pull request #15 from X-R-G-B/parser-v2
guillaumeAbel Dec 12, 2023
fe5c884
Add current progress
guillaumeAbel Dec 12, 2023
cc9d238
Add prompt
guillaumeAbel Dec 13, 2023
2619aff
Add current progress
guillaumeAbel Dec 13, 2023
1402c05
Add read stdin
guillaumeAbel Dec 13, 2023
5ffc248
Fix warning
guillaumeAbel Dec 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix warning
  • Loading branch information
guillaumeAbel authored and Saverio976 committed Dec 13, 2023
commit 5ffc24806b3856bdf106a9ed85c0b9213c3d0ae6
6 changes: 4 additions & 2 deletions app/Main.hs
Original file line number Diff line number Diff line change
@@ -11,8 +11,10 @@ import Types
import System.IO

printErrors :: (Env) -> IO ()
printErrors (Env defines_ []) = printErrors (Env defines_ ["Unable to compute"])
printErrors (Env defines_ errors_) = mapM_ putStrLn errors_ >> handleInput (Env defines_ [])
printErrors (Env defines_ []) =
printErrors (Env defines_ ["Unable to compute"])
printErrors (Env defines_ errors_) =
mapM_ putStrLn errors_ >> handleInput (Env defines_ [])

checkComputing :: (Env, Maybe Result) -> IO ()
checkComputing (env, Nothing) = printErrors env
4 changes: 1 addition & 3 deletions src/Types.hs
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import Data.Int (Int64)

type Symbol = String

data Tree = Number Int64 | Symbol Symbol | Boolean Bool | List [Tree] | Empty
data Tree = Number Int64 | Symbol Symbol | Boolean Bool | List [Tree]

data Define = Define {
symbol :: String,
@@ -39,7 +39,6 @@ instance Eq Tree where
Symbol a == Symbol b = a == b
Boolean a == Boolean b = a == b
List a == List b = a == b
Empty == Empty = True
_ == _ = False

instance Eq Env where
@@ -58,7 +57,6 @@ instance Show Tree where
show (Symbol a) = "S:'" ++ a ++ "'"
show (Boolean value) = "B: " ++ show value
show (List list) = "L: " ++ show list
show Empty = "Empty"

instance Show Env where
show (Env { defines = def, errors = err }) =