khbminus · khbminus · Nov 16, 2022 · Nov 16, 2022 · Nov 16, 2022 · Nov 17, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+on: [ push ]
+name: Test run
+
+jobs:
+  runhaskell:
+    name: Tests
+    runs-on: ubuntu-latest # or macOS-latest, or windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: haskell/actions/setup@v2
+        with:
+          ghc-version: '8.10.7' # Exact version of ghc to use
+          # cabal-version: 'latest'. Omitted, but defaults to 'latest'
+          enable-stack: true
+          stack-version: 'latest'
+      - run: stack test
diff --git a/L-static-analyzer.cabal b/L-static-analyzer.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -25,14 +25,34 @@ source-repository head
 
 library
   exposed-modules:
-      Lib
+      Analysis.AstToIr
+      Analysis.IR
+      Analysis.IrToAst
+      Analysis.Live
+      Analysis.OptSupport
+      Console
+      ConsoleParser
+      Context
+      Error
+      Evaluate
+      Execute
+      Grammar
+      Statement
   other-modules:
       Paths_L_static_analyzer
   hs-source-dirs:
       src
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-depends:
       base >=4.7 && <5
+    , composition-prelude
+    , containers
+    , hoopl
+    , megaparsec
+    , mtl
+    , optparse-applicative
+    , parser-combinators
+    , transformers
   default-language: Haskell2010
 
 executable L-static-analyzer-exe
@@ -45,17 +65,50 @@ executable L-static-analyzer-exe
   build-depends:
       L-static-analyzer
     , base >=4.7 && <5
+    , composition-prelude
+    , containers
+    , hoopl
+    , megaparsec
+    , mtl
+    , optparse-applicative
+    , parser-combinators
+    , transformers
   default-language: Haskell2010
 
 test-suite L-static-analyzer-test
   type: exitcode-stdio-1.0
-  main-is: Spec.hs
+  main-is: Test.hs
   other-modules:
+      Test.ConsoleParser
+      Test.Evaluate
+      Test.Execute
+      Test.Live
+      Test.Parsers
+      Test.PropertyExpr
+      Test.PropertyOptimizing
       Paths_L_static_analyzer
   hs-source-dirs:
       test
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      L-static-analyzer
+      HUnit
+    , HUnit-approx
+    , L-static-analyzer
     , base >=4.7 && <5
+    , composition-prelude
+    , containers
+    , hedgehog
+    , hoopl
+    , hspec
+    , hspec-megaparsec
+    , megaparsec
+    , mtl
+    , parser-combinators
+    , tasty
+    , tasty-discover
+    , tasty-hedgehog
+    , tasty-hspec
+    , tasty-hunit
+    , tasty-quickcheck
+    , transformers
   default-language: Haskell2010
diff --git a/README.md b/README.md
@@ -1 +1,89 @@
-# L programming language & static analyzer
+# L programming language & static analyzer
+
+## L Syntax
+
+L is a simple imperative programming language which supports basic statements:
+
+* Variable assignment: `<name> := <expr>`
+* `if`:
+
+```text
+if a > b then { write a; b := a  } else { write b; a := b }
+```
+
+That generally is
+
+```text
+if <expr> then { <trueBody> } else { <falseBody> }
+```
+
+* `while`:
+
+```text
+while x > 10 do { write x; x := x - 1 }
+```
+
+That generally is
+
+```text
+while <expr> do { <body> }
+```
+
+* `Skip` -- no-op command
+* `Write <expr>` and `Read <variable name>` commands
+* Functions:
+    * where declaration `def <name>(<arg1>, <arg2>,...) { <body> }`
+      or `def <name>(<arg1>, <arg2>,...) { <body>} return <expr>`
+    * and call is `<name>(arg1, arg2,...)` where `arg` is an expression. Call also supported in
+      expressions: `x := 2 + sum(2, 3)`.
+
+Expressions support variable access, function calls and several binary operations
+such: `+, -, *, /, %, >, >=, ==, !=, <=, <, &&, ||`.
+
+### Examples
+
+Factorial function:
+
+```text
+def f(x) { ans := 1; while (x > 0) do { ans := ans * x; x := x - 1 } } return ans
+```
+
+Recursive Fibonacci numbers:
+
+```text
+def fib(x) { ans := 1; if (x < 2) then { skip } else { ans := fib(x - 1) + fib(x - 2) } } return ans 
+```
+
+## Usage of CLI app
+
+### REPL
+
+If you run the application without arguments, you will get a REPL mode.
+
+### File interpretation
+
+If flag `-i <FILE>` is passed, a file will be interpreted. Additionally, you can provide `--liveness-optimization` flag
+to enable liveness optimization and provide starting variables and its values.
+
+## Static Analysis
+
+We wrote a static analyzer with liveness optimization that eliminate dead code. It could make code faster in situations
+when we compute unused in future code. E.g. in this code we have unnecessary infinity loop:
+
+```text
+write 1
+def f() { x := 0; while 1 do { x := x + 1} } return 1
+def g() { x := f() }
+g()
+```
+
+This will be optimized into
+
+```text
+write 1
+def f() { x := 0; while 1 do { x := x + 1} } return 1
+def g() { }
+g()
+```
+
+That is in common not used for optimization, but used for error analysis and highlighting.
diff --git a/app/Main.hs b/app/Main.hs
@@ -1,6 +1,36 @@
-module Main (main) where
+module Main where
 
-import Lib
+import Options.Applicative ( (<**>), fullDesc, header, info, progDesc, execParser, helper )
+import Console (runLoop, readEvalWriteLoop, printIr, printExtended)
+import ConsoleParser (Action(..), Input(..), actionParser, getVarContext)
+import Context (Context(vars), newContext)
+import Control.Monad.State ( evalStateT )
 
+-- Программа парсит аргументы командной строки при помощи execParser,
+-- а потом запускает функцию runAction (логику приложения)
 main :: IO ()
-main = someFunc
+main = do
+    runAction =<< execParser opts
+  where
+    -- Задает парсер аргументов actionParser, сопровождая его автоматической генерацией странички help.
+    opts = info (actionParser <**> helper)
+      (  fullDesc
+      <> progDesc "This application executes programms in L"
+      <> header "L interpreter"
+      )
+
+runAction :: Action -> IO ()
+runAction (Action (FileInput path) live varContext extend ir) = do
+  i <- readFile path
+  let context = newContext { Context.vars = [getVarContext varContext]}
+  case (ir, extend) of
+    (False, False) -> evalStateT (runLoop live i) context
+    (False, True) -> evalStateT (printExtended live i) context
+    (True, False) -> evalStateT (printIr live i) context
+    (True, True) -> evalStateT (do {printExtended live i; printIr live i}) context
+
+-- выход: q
+runAction (Action Interactive _ varContext extend ir) =
+  if extend || ir then error "can't handle extend or IR option in REPL mode" else
+  let context = newContext { Context.vars = [getVarContext varContext]} in
+  evalStateT readEvalWriteLoop context
diff --git a/config.yaml b/config.yaml
@@ -0,0 +1 @@
+allow-newer: true
diff --git a/package.yaml b/package.yaml
@@ -21,6 +21,13 @@ description:         Please see the README on GitHub at <https://github.com/khbm
 
 dependencies:
 - base >= 4.7 && < 5
+- containers
+- transformers
+- composition-prelude
+- megaparsec
+- parser-combinators
+- mtl
+- hoopl
 
 ghc-options:
 - -Wall
@@ -35,6 +42,11 @@ ghc-options:
 
 library:
   source-dirs: src
+  dependencies:
+  - containers
+  - optparse-applicative
+  - transformers
+  - megaparsec
 
 executables:
   L-static-analyzer-exe:
@@ -46,14 +58,30 @@ executables:
     - -with-rtsopts=-N
     dependencies:
     - L-static-analyzer
+    - optparse-applicative
 
 tests:
   L-static-analyzer-test:
-    main:                Spec.hs
+    main:                Test.hs
     source-dirs:         test
     ghc-options:
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
     dependencies:
+    - hedgehog
+    - HUnit
+    - HUnit-approx
+    - hspec
+    - hspec-megaparsec
+    - tasty
+    - tasty-hspec
+    - tasty-hedgehog
+    - tasty-hunit
+    - tasty-discover
+    - tasty-quickcheck
     - L-static-analyzer
+    - HUnit
+    - tasty-hunit
+    - tasty
+    - transformers