- Commit
- a2c22976c180c4641fc7b2182945bec3127754b9
- Parent
- 91b1955d7fe4b10952f571b5b58b6153471ce1dc
- Author
- Gark Garcia <37553739+GarkGarcia@users.noreply.github.com>
- Date
Merge branch 'haskell'
An exercise on polyglossy: the same problem solved on multiple languages
Merge branch 'haskell'
6 files changed, 5 insertions, 83 deletions
Status | File Name | N° Changes | Insertions | Deletions |
Modified | Haskell/.gitignore | 3 | 0 | 3 |
Deleted | Haskell/LICENSE | 30 | 0 | 30 |
Modified | Haskell/conjecture.cabal | 31 | 2 | 29 |
Modified | Haskell/package.yaml | 20 | 3 | 17 |
Deleted | Haskell/src/Lib.hs | 2 | 0 | 2 |
Deleted | Haskell/test/Spec.hs | 2 | 0 | 2 |
diff --git a/Haskell/.gitignore b/Haskell/.gitignore @@ -1,6 +1,3 @@ .stack-work -src -test *.cabal -LICENSE stack.yaml \ No newline at end of file
diff --git a/Haskell/LICENSE b/Haskell/LICENSE @@ -1,30 +0,0 @@ -Copyright Author name here (c) 2019 - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of Author name here nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Haskell/conjecture.cabal b/Haskell/conjecture.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 8aa8667b3d4cd7fa12aca4ea4b2ddbfe34b6f53704ead53843307c5cd05e1045 +-- hash: 68bed65e90b3cb1b3aa8bd9f8ea03c5ebb3ef6dcc8faf1dcb773b18571beb675 name: conjecture version: 1.0.0.0 @@ -16,19 +16,7 @@ license: BSD3 license-file: LICENSE build-type: Simple -library - exposed-modules: - Lib - other-modules: - Paths_conjecture - hs-source-dirs: - src - build-depends: - base >=4.7 && <5 - , clock ==0.7.2 - default-language: Haskell2010 - -executable conjecture-exe +executable haskell main-is: Main.hs other-modules: Paths_conjecture @@ -38,19 +26,4 @@ executable conjecture-exe build-depends: base >=4.7 && <5 , clock ==0.7.2 - , conjecture - default-language: Haskell2010 - -test-suite conjecture-test - type: exitcode-stdio-1.0 - main-is: Spec.hs - other-modules: - Paths_conjecture - hs-source-dirs: - test - ghc-options: -threaded -rtsopts -with-rtsopts=-N - build-depends: - base >=4.7 && <5 - , clock ==0.7.2 - , conjecture default-language: Haskell2010
diff --git a/Haskell/package.yaml b/Haskell/package.yaml @@ -20,11 +20,8 @@ dependencies: - base >= 4.7 && < 5 - clock == 0.7.2 -library: - source-dirs: src - executables: - conjecture-exe: + haskell: main: Main.hs source-dirs: app ghc-options: @@ -33,16 +30,4 @@ executables: - -with-rtsopts=-N - -O dependencies: - - conjecture - - clock == 0.7.2 - -tests: - conjecture-test: - main: Spec.hs - source-dirs: test - ghc-options: - - -threaded - - -rtsopts - - -with-rtsopts=-N - dependencies: - - conjecture + - clock == 0.7.2+ \ No newline at end of file