HUnit installed and a first test passed.

MaxVortman · MaxVortman · commit 35b231c7cd35 · 2018-10-15T07:20:13.000+03:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -0,0 +1,3 @@
+# Changelog for LangToGroup
+
+## Unreleased changes
diff --git a/LangToGroup.cabal b/LangToGroup.cabal
@@ -0,0 +1,71 @@
+-- This file has been generated from package.yaml by hpack version 0.28.2.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: e5bd5a115e6c958840612b41dc6ceef41bd84bb315db8601a999ae2433b24be4
+
+name:           LangToGroup
+version:        0.1.0.0
+description:    Please see the README on GitHub at <https://github.com/githubuser/LangToGroup#readme>
+homepage:       https://github.com/githubuser/LangToGroup#readme
+bug-reports:    https://github.com/githubuser/LangToGroup/issues
+author:         Author name here
+maintainer:     example@example.com
+copyright:      2018 Author name here
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+cabal-version:  >= 1.10
+extra-source-files:
+    ChangeLog.md
+    README.md
+
+source-repository head
+  type: git
+  location: https://github.com/githubuser/LangToGroup
+
+library
+  exposed-modules:
+      CfgToTm1Mapper
+      GrammarType
+      Lib
+      PdaType
+      Tm1Type
+  other-modules:
+      Paths_LangToGroup
+  hs-source-dirs:
+      src
+  build-depends:
+      base >=4.7 && <5
+    , containers
+  default-language: Haskell2010
+
+executable LangToGroup-exe
+  main-is: Main.hs
+  other-modules:
+      Paths_LangToGroup
+  hs-source-dirs:
+      app
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      LangToGroup
+    , base >=4.7 && <5
+    , containers
+  default-language: Haskell2010
+
+test-suite LangToGroup-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      Paths_LangToGroup
+  hs-source-dirs:
+      test
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      HUnit
+    , LangToGroup
+    , base >=4.7 && <5
+    , containers
+    , test-framework
+    , test-framework-hunit
+  default-language: Haskell2010
diff --git a/PdaType.hs b/PdaType.hs
diff --git a/Setup.hs b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/app/Main.hs b/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib
+
+main :: IO ()
+main = someFunc
diff --git a/package.yaml b/package.yaml
@@ -0,0 +1,52 @@
+name:                LangToGroup
+version:             0.1.0.0
+github:              "githubuser/LangToGroup"
+license:             BSD3
+author:              "Author name here"
+maintainer:          "example@example.com"
+copyright:           "2018 Author name here"
+
+extra-source-files:
+- README.md
+- ChangeLog.md
+
+# Metadata used when publishing your package
+# synopsis:            Short description of your package
+# category:            Web
+
+# To avoid duplicated efforts in documentation and dealing with the
+# complications of embedding Haddock markup inside cabal files, it is
+# common to point users to the README.md file.
+description:         Please see the README on GitHub at <https://github.com/githubuser/LangToGroup#readme>
+
+dependencies:
+- base >= 4.7 && < 5
+- containers
+
+library:
+  source-dirs: src
+
+executables:
+  LangToGroup-exe:
+    main:                Main.hs
+    source-dirs:         app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - LangToGroup
+
+tests:
+  LangToGroup-test:
+    main:                Spec.hs
+    source-dirs:         test
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - LangToGroup
+    - HUnit
+    - test-framework
+    - test-framework-hunit
diff --git a/src/CfgToTm1Mapper.hs b/src/CfgToTm1Mapper.hs
@@ -2,6 +2,7 @@ module CfgToTm1Mapper where
 
 import qualified PdaType
 import qualified GrammarType
+import qualified Tm1Type
 import Data.Set (Set)
 import qualified Data.Set as Set
 
@@ -21,17 +22,19 @@ mapCfgToPda
     let startState = PdaType.State 's'
     let finalState = PdaType.State 'f'
     let states = PdaType.States (Set.fromList [startState, finalState])
-    let mappedRelations = do
-        let mapSymbolToLetter (GrammarType.T (GrammarType.Terminal x)) = PdaType.Letter x 
-        let mapSymbolToLetter (GrammarType.N (GrammarType.Nonterminal x)) = PdaType.Letter x
-        let mapListOfSymbolsToListOfLetters = map mapSymbolToLetter
-        Set.map (\(GrammarType.Relation (GrammarType.Nonterminal nonterminalSymbol, symbols)) -> 
-            PdaType.TransitionRelation (
-                (finalState, PdaType.emptySymbol, PdaType.Letter nonterminalSymbol), 
-                (finalState, mapListOfSymbolsToListOfLetters symbols)
-                )) 
+    let mapSymbolToLetter x =
+            case x of 
+            GrammarType.T (GrammarType.Terminal c) -> PdaType.Letter c
+            GrammarType.N (GrammarType.Nonterminal c) -> PdaType.Letter c
+    let mapListOfSymbolsToListOfLetters = map mapSymbolToLetter
+    let mappedRelations =
+            Set.map (\(GrammarType.Relation (GrammarType.Nonterminal nonterminalSymbol, symbols)) -> 
+                PdaType.TransitionRelation (
+                    (finalState, PdaType.emptySymbol, PdaType.Letter nonterminalSymbol), 
+                    (finalState, mapListOfSymbolsToListOfLetters symbols)
+                    ))
                 setOfRelations
-    let transinstFromTerminals = Set.map 
+    let transitionsFromTerminals = Set.map 
             (\letter -> 
                 PdaType.TransitionRelation (
                     (finalState, letter, letter), 
@@ -43,7 +46,7 @@ mapCfgToPda
                 (startState, PdaType.emptySymbol, PdaType.emptySymbol), 
                 (finalState, [PdaType.Letter startSymbol])
                 )) 
-            (Set.union mappedRelations transinstFromTerminals)
+            (Set.union mappedRelations transitionsFromTerminals)
     PdaType.Pda (
         states, 
         pdaInputAlphabet, 
@@ -52,4 +55,16 @@ mapCfgToPda
         startState, 
         PdaType.InitialStackSymbols [], 
         PdaType.AcceptingStates (PdaType.States (Set.fromList [finalState]))
-        )
+        )
+
+-- mapPdaToTm1 :: PdaType.Pda -> Tm1Type.TM1
+-- mapPdaToTm1 
+--     (PdaType.Pda 
+--         (PdaType.States setOfStates, 
+--         PdaType.InputAlphabet setOfInputLetters, 
+--         PdaType.StackAlphabet setOfStackLetters, 
+--         PdaType.TransitionRelations setOfTransitions, 
+--         startState, 
+--         PdaType.InitialStackSymbols listOfInitialStackLetters, 
+--         PdaType.AcceptingStates)
+--         ) = do
diff --git a/src/GrammarType.hs b/src/GrammarType.hs
@@ -9,12 +9,18 @@ newtype Nonterminal = Nonterminal Char
     deriving (Eq, Ord)
 -- union of terminal and nonterminal
 data Symbol = T Terminal | N Nonterminal
+    deriving (Eq, Ord)
 -- start symbol must be a nonterminal synonym
 type StartSymbol = Nonterminal
 -- grammar relation
 newtype Relation = Relation (Nonterminal, [Symbol])
+    deriving (Eq, Ord)
 newtype Relations = Relations (Set Relation)
+    deriving (Eq, Ord)
 newtype Nonterminals = Nonterminals (Set Nonterminal)
+    deriving (Eq, Ord)
 newtype Terminals = Terminals (Set Terminal)
+    deriving (Eq, Ord)
 -- grammar type
-newtype Grammar = Grammar (Nonterminals, Terminals, Relations, StartSymbol)
+newtype Grammar = Grammar (Nonterminals, Terminals, Relations, StartSymbol)
+    deriving (Eq, Ord)
diff --git a/src/Lib.hs b/src/Lib.hs
@@ -0,0 +1,6 @@
+module Lib
+    ( someFunc
+    ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
diff --git a/src/PdaType.hs b/src/PdaType.hs
@@ -0,0 +1,46 @@
+module PdaType where
+
+import Data.Set (Set)
+import qualified Data.Set as Set
+
+newtype State = State Char
+    deriving (Eq, Ord, Show)
+
+newtype States = States (Set State)
+    deriving (Eq, Ord, Show)
+
+-- letter
+newtype Letter = Letter Char
+    deriving (Eq, Ord, Show)
+-- input, stack alphabets
+newtype InputAlphabet = InputAlphabet (Set Letter)
+    deriving (Eq, Ord, Show)
+newtype StackAlphabet = StackAlphabet (Set Letter)
+    deriving (Eq, Ord, Show)
+type StartState = State
+
+newtype InitialStackSymbols = InitialStackSymbols [Letter]
+    deriving (Eq, Ord, Show)
+
+newtype AcceptingStates = AcceptingStates States
+    deriving (Eq, Ord, Show)
+
+newtype TransitionRelation = TransitionRelation ((State, Letter, Letter), (State, [Letter]))
+    deriving (Eq, Ord, Show)
+
+newtype TransitionRelations = TransitionRelations (Set TransitionRelation)
+    deriving (Eq, Ord, Show)
+emptySymbol = Letter 'ε'
+
+newtype Pda = Pda (States, InputAlphabet, StackAlphabet, TransitionRelations, StartState, InitialStackSymbols, AcceptingStates)
+    deriving (Eq, Ord)
+
+instance Show Pda where
+    show (Pda (states, inputAlphabet, stackAlphabet, transitionRelations, startState, initialStackSymbols, acceptingStates)) = 
+            "\tStates: " ++ show states ++
+                    "\n\tInputAlphabet: " ++ show inputAlphabet ++
+                            "\n\tStackAlphabet: " ++ show stackAlphabet ++
+                                    "\n\tTransitionRelations: " ++ show transitionRelations ++
+                                            "\n\tStartState: " ++ show startState ++
+                                                    "\n\tInitialStackSymbols: " ++ show initialStackSymbols ++
+                                                            "\n\tAcceptingStates: " ++ show acceptingStates
diff --git a/src/Tm1Type.hs b/src/Tm1Type.hs
diff --git a/stack.yaml b/stack.yaml
@@ -0,0 +1,65 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+# resolver: ghcjs-0.1.0_ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-12.13
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+# - location:
+#    git: https://github.com/commercialhaskell/stack.git
+#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#  subdirs:
+#  - auto-update
+#  - wai
+packages:
+- .
+# Dependency packages to be pulled from upstream that are not in the resolver
+# using the same syntax as the packages field.
+# (e.g., acme-missiles-0.3)
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=1.7"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
diff --git a/test/Spec.hs b/test/Spec.hs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Changelog for LangToGroup`
	`2`	`+`
	`3`	`+## Unreleased changes`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import Distribution.Simple`
	`2`	`+main = defaultMain`