add evalT

Author: felixbd

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+
+repos:
+  - repo: local
+    hooks:
+      - id: hlint
+        name: HLint
+        # entry: stack exec hlint
+        entry: hlint
+        language: system
+        files: ^(src/|app/|test/).+\.hs$
+        pass_filenames: true
+
+      - id: stack-test
+        name: Stack Tests
+        entry: stack test
+        language: system
+        pass_filenames: false

README.org

@@ -2,7 +2,7 @@
 #+author: Felix Drees
 #+STARTUP: latexpreview
 #+OPTIONS: toc:nil tex:t  # tex:verbatim num:nil
-#+keywords: while programs, turing complete, turing machines
+#+keywords: while
 
 * while
 
@@ -132,7 +132,7 @@ stack run
 #+RESULTS:
 :
 : = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-: [Error]: Usage: stack run <filename>
+: [Error]: Usage: stack run <filename>
 : Use 'stack run <filename>' to interpret a while source file.
 : = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
 :
@@ -146,17 +146,33 @@ stack run ./examples/multiplication-func.while
 
 = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
 
-[Interpreting file]    ./examples/multiplication-func.while
-[READING .WHILE FILE] "./examples/multiplication-func.while"
-[DONE TOKENIZE]
-[DONE PARSING AST]
-[RESULT OF EVALUATION]
+[Interpreting file]    ./examples/multiplication-func.while
+[READING .WHILE FILE] "./examples/multiplication-func.while"
+[DONE TOKENIZE]
+[DONE PARSING AST]
+[RESULT OF EVALUATION]
 [("temp",28980),("b",0),("a",420),("rv",28980)]
 
 = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
 
 #+end_example
 
+or use
+
+#+begin_src shell
+stack ghci
+
+ghci> xs <- readFileContent "./examples/multiplication-func.while"
+[READING .WHILE FILE] "./examples/multiplication-func.while"
+ghci> eval ((runASTParser . tokenize) xs) []
+[("temp",28980),("b",0),("a",420),("rv",28980)]
+ghci> evalT ((runASTParser . tokenize) xs) []
+((),[("temp",28980),("b",0),("a",420),("rv",28980)])
+ghci>
+#+end_src
+
+
+
 
 *** compile
 
@@ -186,6 +202,14 @@ stack exec hlint src/*.hs app/*.hs test/*.hs
 #+end_src
 
 
+*** pre commit
+
+#+begin_src shell
+pre-commit run --all-files
+#+end_src
+
+
+
 ** requirements
 
 *** using `apt`

app/Main.hs

@@ -6,7 +6,7 @@ module Main (main) where
 import System.Environment (getArgs)
 
 import WhileParser (tokenize, readFileContent, runASTParser)  -- WhileAST(..),
-import WhileEvaluation (eval) --, evalM, VarName, VarVal, VarState, VarStateWorld)
+import WhileEvaluation (eval, evalT, evalM) --, evalM, VarName, VarVal, VarState, VarStateWorld)
 
 
 -- | Define a data type to represent the command-line options
@@ -40,6 +40,8 @@ runInterpreter options = do
   let a = eval ast []
   print a
 
+  print $ evalT ast []
+
   putStrLn $ "\n" ++ concat (replicate 40 "= ") ++ "=\n"
 
 

shell.nix

@@ -7,9 +7,18 @@ pkgs.mkShell {
     stack
     ghc
     hlint
+
+    #(python313.withPackages(ps: with ps; [
+    #  pre-commit
+    #  pre-commit-hooks
+    #]))
+
+    pre-commit
   ];
 
   shellHook = ''
+    # python -m pre-commit --version
+    # pre-commit --version
     echo "Start developing..."
   '';
 }

src/WhileEvaluation.hs

@@ -6,6 +6,7 @@
 
 module WhileEvaluation
   (evalM
+  ,evalT
   ,eval
   ,VarName
   ,VarVal