merging with haskell-package

miladz68 · Nov 30, 2011 · acc5214 · acc5214
2 parents ca6e9a2 + 0522b17
commit acc5214
Show file tree

Hide file tree

Showing 70 changed files with 118 additions and 12 deletions.
diff --git a/.ghci b/.ghci
@@ -1,5 +1,5 @@
+:set -isrc
 :m + Test.QuickCheck
-:l Course.hs
 :m + Course
 :set prompt ">> "
 :set -Wall

diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
-syntax: glob
-*.swp
-*.*~
-*.o
-*.orig
-*.hi
-*.lkshs
-*/.idea/ant.xml
-*/.idea/workspace.xml
-dist
-out
+syntax: glob
+*.swp
+*.*~
+*.o
+*.orig
+*.hi
+*.lkshs
+*/.idea/ant.xml
+*/.idea/workspace.xml
+dist
+out
diff --git a/Course.hs → src/Course.hs b/Course.hs → src/Course.hs
diff --git a/L01/Optional.hs → src/L01/Optional.hs b/L01/Optional.hs → src/L01/Optional.hs
diff --git a/L01/Validation.hs → src/L01/Validation.hs b/L01/Validation.hs → src/L01/Validation.hs
diff --git a/L02/List.hs → src/L02/List.hs b/L02/List.hs → src/L02/List.hs
diff --git a/L03/Parser.hs → src/L03/Parser.hs b/L03/Parser.hs → src/L03/Parser.hs
diff --git a/L03/Person.hs → src/L03/Person.hs b/L03/Person.hs → src/L03/Person.hs
diff --git a/L04/Fluffy.hs → src/L04/Fluffy.hs b/L04/Fluffy.hs → src/L04/Fluffy.hs
diff --git a/L04/Misty.hs → src/L04/Misty.hs b/L04/Misty.hs → src/L04/Misty.hs
diff --git a/L04/Tests.hs → src/L04/Tests.hs b/L04/Tests.hs → src/L04/Tests.hs
diff --git a/L05/Testing.hs → src/L05/Testing.hs b/L05/Testing.hs → src/L05/Testing.hs
diff --git a/L06/JsonParser.hs → src/L06/JsonParser.hs b/L06/JsonParser.hs → src/L06/JsonParser.hs
diff --git a/L06/JsonValue.hs → src/L06/JsonValue.hs b/L06/JsonValue.hs → src/L06/JsonValue.hs
diff --git a/L06/MoreParser.hs → src/L06/MoreParser.hs b/L06/MoreParser.hs → src/L06/MoreParser.hs
diff --git a/L07/Anagrams.hs → src/L07/Anagrams.hs b/L07/Anagrams.hs → src/L07/Anagrams.hs
diff --git a/L08/FastAnagrams.hs → src/L08/FastAnagrams.hs b/L08/FastAnagrams.hs → src/L08/FastAnagrams.hs
diff --git a/L09/BKTree.hs → src/L09/BKTree.hs b/L09/BKTree.hs → src/L09/BKTree.hs
diff --git a/L09/EditDistance.hs → src/L09/EditDistance.hs b/L09/EditDistance.hs → src/L09/EditDistance.hs
diff --git a/L09/MetricSpace.hs → src/L09/MetricSpace.hs b/L09/MetricSpace.hs → src/L09/MetricSpace.hs
diff --git a/L10/Compose.hs → src/L10/Compose.hs b/L10/Compose.hs → src/L10/Compose.hs
diff --git a/src/M.hs b/src/M.hs
@@ -0,0 +1,9 @@
+module M where
+
+add ::
+  Int
+  -> Int
+  -> Int
+add =
+  (+)
+
diff --git a/TicTacToe/TicTacToe.md → src/TicTacToe/TicTacToe.md b/TicTacToe/TicTacToe.md → src/TicTacToe/TicTacToe.md
diff --git a/TicTacToe/agda/TicTacToe.agda → src/TicTacToe/agda/TicTacToe.agda b/TicTacToe/agda/TicTacToe.agda → src/TicTacToe/agda/TicTacToe.agda
diff --git a/TicTacToe/haskell/.ghci → src/TicTacToe/haskell/.ghci b/TicTacToe/haskell/.ghci → src/TicTacToe/haskell/.ghci
diff --git a/TicTacToe/haskell/Data/TicTacToe.hs → src/TicTacToe/haskell/Data/TicTacToe.hs b/TicTacToe/haskell/Data/TicTacToe.hs → src/TicTacToe/haskell/Data/TicTacToe.hs
diff --git a/TicTacToe/haskell/Data/TicTacToe/Board.hs → ...TicTacToe/haskell/Data/TicTacToe/Board.hs b/TicTacToe/haskell/Data/TicTacToe/Board.hs → ...TicTacToe/haskell/Data/TicTacToe/Board.hs
diff --git a/...cToe/haskell/Data/TicTacToe/GameResult.hs → ...cToe/haskell/Data/TicTacToe/GameResult.hs b/...cToe/haskell/Data/TicTacToe/GameResult.hs → ...cToe/haskell/Data/TicTacToe/GameResult.hs
diff --git a/TicTacToe/haskell/Data/TicTacToe/Interact.hs → ...TacToe/haskell/Data/TicTacToe/Interact.hs b/TicTacToe/haskell/Data/TicTacToe/Interact.hs → ...TacToe/haskell/Data/TicTacToe/Interact.hs
diff --git a/TicTacToe/haskell/Data/TicTacToe/Player.hs → ...icTacToe/haskell/Data/TicTacToe/Player.hs b/TicTacToe/haskell/Data/TicTacToe/Player.hs → ...icTacToe/haskell/Data/TicTacToe/Player.hs
diff --git a/TicTacToe/haskell/Data/TicTacToe/Position.hs → ...TacToe/haskell/Data/TicTacToe/Position.hs b/TicTacToe/haskell/Data/TicTacToe/Position.hs → ...TacToe/haskell/Data/TicTacToe/Position.hs
diff --git a/TicTacToe/haskell/LICENSE → src/TicTacToe/haskell/LICENSE b/TicTacToe/haskell/LICENSE → src/TicTacToe/haskell/LICENSE
diff --git a/TicTacToe/haskell/Setup.hs → src/TicTacToe/haskell/Setup.hs b/TicTacToe/haskell/Setup.hs → src/TicTacToe/haskell/Setup.hs
diff --git a/TicTacToe/haskell/Test/Data/TicTacToe.hs → src/TicTacToe/haskell/Test/Data/TicTacToe.hs b/TicTacToe/haskell/Test/Data/TicTacToe.hs → src/TicTacToe/haskell/Test/Data/TicTacToe.hs
diff --git a/...cToe/haskell/Test/Data/TicTacToe/Board.hs → ...cToe/haskell/Test/Data/TicTacToe/Board.hs b/...cToe/haskell/Test/Data/TicTacToe/Board.hs → ...cToe/haskell/Test/Data/TicTacToe/Board.hs
diff --git a/...haskell/Test/Data/TicTacToe/GameResult.hs → ...haskell/Test/Data/TicTacToe/GameResult.hs b/...haskell/Test/Data/TicTacToe/GameResult.hs → ...haskell/Test/Data/TicTacToe/GameResult.hs
diff --git a/...Toe/haskell/Test/Data/TicTacToe/Player.hs → ...Toe/haskell/Test/Data/TicTacToe/Player.hs b/...Toe/haskell/Test/Data/TicTacToe/Player.hs → ...Toe/haskell/Test/Data/TicTacToe/Player.hs
diff --git a/...e/haskell/Test/Data/TicTacToe/Position.hs → ...e/haskell/Test/Data/TicTacToe/Position.hs b/...e/haskell/Test/Data/TicTacToe/Position.hs → ...e/haskell/Test/Data/TicTacToe/Position.hs
diff --git a/TicTacToe/haskell/TicTacToe → src/TicTacToe/haskell/TicTacToe b/TicTacToe/haskell/TicTacToe → src/TicTacToe/haskell/TicTacToe
diff --git a/TicTacToe/haskell/TicTacToe.cabal → src/TicTacToe/haskell/TicTacToe.cabal b/TicTacToe/haskell/TicTacToe.cabal → src/TicTacToe/haskell/TicTacToe.cabal
diff --git a/TicTacToe/haskell/TicTacToe.lkshw → src/TicTacToe/haskell/TicTacToe.lkshw b/TicTacToe/haskell/TicTacToe.lkshw → src/TicTacToe/haskell/TicTacToe.lkshw
diff --git a/TicTacToe/java/.idea/.name → src/TicTacToe/java/.idea/.name b/TicTacToe/java/.idea/.name → src/TicTacToe/java/.idea/.name
diff --git a/TicTacToe/java/.idea/ant.xml → src/TicTacToe/java/.idea/ant.xml b/TicTacToe/java/.idea/ant.xml → src/TicTacToe/java/.idea/ant.xml
diff --git a/TicTacToe/java/.idea/compiler.xml → src/TicTacToe/java/.idea/compiler.xml b/TicTacToe/java/.idea/compiler.xml → src/TicTacToe/java/.idea/compiler.xml
diff --git a/...ava/.idea/copyright/profiles_settings.xml → ...ava/.idea/copyright/profiles_settings.xml b/...ava/.idea/copyright/profiles_settings.xml → ...ava/.idea/copyright/profiles_settings.xml
diff --git a/TicTacToe/java/.idea/encodings.xml → src/TicTacToe/java/.idea/encodings.xml b/TicTacToe/java/.idea/encodings.xml → src/TicTacToe/java/.idea/encodings.xml
diff --git a/...e/java/.idea/libraries/functionaljava.xml → ...e/java/.idea/libraries/functionaljava.xml b/...e/java/.idea/libraries/functionaljava.xml → ...e/java/.idea/libraries/functionaljava.xml
diff --git a/TicTacToe/java/.idea/misc.xml → src/TicTacToe/java/.idea/misc.xml b/TicTacToe/java/.idea/misc.xml → src/TicTacToe/java/.idea/misc.xml
diff --git a/TicTacToe/java/.idea/modules.xml → src/TicTacToe/java/.idea/modules.xml b/TicTacToe/java/.idea/modules.xml → src/TicTacToe/java/.idea/modules.xml
diff --git a/TicTacToe/java/.idea/uiDesigner.xml → src/TicTacToe/java/.idea/uiDesigner.xml b/TicTacToe/java/.idea/uiDesigner.xml → src/TicTacToe/java/.idea/uiDesigner.xml
diff --git a/TicTacToe/java/.idea/vcs.xml → src/TicTacToe/java/.idea/vcs.xml b/TicTacToe/java/.idea/vcs.xml → src/TicTacToe/java/.idea/vcs.xml
diff --git a/TicTacToe/java/.idea/workspace.xml → src/TicTacToe/java/.idea/workspace.xml b/TicTacToe/java/.idea/workspace.xml → src/TicTacToe/java/.idea/workspace.xml
diff --git a/.../lib/functionaljava-3.1-SNAPSHOT-docs.jar → .../lib/functionaljava-3.1-SNAPSHOT-docs.jar b/.../lib/functionaljava-3.1-SNAPSHOT-docs.jar → .../lib/functionaljava-3.1-SNAPSHOT-docs.jar
diff --git a/...b/functionaljava-3.1-SNAPSHOT-sources.jar → ...b/functionaljava-3.1-SNAPSHOT-sources.jar b/...b/functionaljava-3.1-SNAPSHOT-sources.jar → ...b/functionaljava-3.1-SNAPSHOT-sources.jar
diff --git a/.../java/lib/functionaljava-3.1-SNAPSHOT.jar → .../java/lib/functionaljava-3.1-SNAPSHOT.jar b/.../java/lib/functionaljava-3.1-SNAPSHOT.jar → .../java/lib/functionaljava-3.1-SNAPSHOT.jar
diff --git a/TicTacToe/java/src/tictactoe/Board.java → src/TicTacToe/java/src/tictactoe/Board.java b/TicTacToe/java/src/tictactoe/Board.java → src/TicTacToe/java/src/tictactoe/Board.java
diff --git a/TicTacToe/java/src/tictactoe/BoardLike.java → ...cTacToe/java/src/tictactoe/BoardLike.java b/TicTacToe/java/src/tictactoe/BoardLike.java → ...cTacToe/java/src/tictactoe/BoardLike.java
diff --git a/TicTacToe/java/src/tictactoe/GameResult.java → ...TacToe/java/src/tictactoe/GameResult.java b/TicTacToe/java/src/tictactoe/GameResult.java → ...TacToe/java/src/tictactoe/GameResult.java
diff --git a/TicTacToe/java/src/tictactoe/Main.java → src/TicTacToe/java/src/tictactoe/Main.java b/TicTacToe/java/src/tictactoe/Main.java → src/TicTacToe/java/src/tictactoe/Main.java
diff --git a/TicTacToe/java/src/tictactoe/MoveResult.java → ...TacToe/java/src/tictactoe/MoveResult.java b/TicTacToe/java/src/tictactoe/MoveResult.java → ...TacToe/java/src/tictactoe/MoveResult.java
diff --git a/TicTacToe/java/src/tictactoe/Player.java → src/TicTacToe/java/src/tictactoe/Player.java b/TicTacToe/java/src/tictactoe/Player.java → src/TicTacToe/java/src/tictactoe/Player.java
diff --git a/TicTacToe/java/src/tictactoe/Position.java → ...icTacToe/java/src/tictactoe/Position.java b/TicTacToe/java/src/tictactoe/Position.java → ...icTacToe/java/src/tictactoe/Position.java
diff --git a/TicTacToe/java/src/tictactoe/TakenBack.java → ...cTacToe/java/src/tictactoe/TakenBack.java b/TicTacToe/java/src/tictactoe/TakenBack.java → ...cTacToe/java/src/tictactoe/TakenBack.java
diff --git a/TicTacToe/java/tictactoe.iml → src/TicTacToe/java/tictactoe.iml b/TicTacToe/java/tictactoe.iml → src/TicTacToe/java/tictactoe.iml
diff --git a/TicTacToe/scala/TicTacToe.scala → src/TicTacToe/scala/TicTacToe.scala b/TicTacToe/scala/TicTacToe.scala → src/TicTacToe/scala/TicTacToe.scala
diff --git a/test/.ghci b/test/.ghci
@@ -0,0 +1,6 @@
+:set -i../src -isrc
+:m + Test.QuickCheck
+:l Main
+:set prompt "test>> "
+:set -Wall
+
diff --git a/test/.gitignore b/test/.gitignore
@@ -0,0 +1,3 @@
+dist
+*.tix
+.hpc
diff --git a/test/Package-Test.cabal b/test/Package-Test.cabal
@@ -0,0 +1,39 @@
+Name:               Haskell-Package-Test
+Version:            0.0.1
+Author:             Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>
+Maintainer:         Tony Morris
+Copyright:          Tony Morris
+Synopsis:           A skeleton for testing haskell packages
+Category:           Development
+Description:        A skeleton for testing haskell packages
+Homepage:           https://github.com/tonymorris/haskell-package
+Cabal-Version:      >= 1.6
+Build-Type:         Simple
+
+Source-Repository   head
+  Type:             git
+  Location:         [email protected]:tonymorris/haskell-package.git
+
+Flag                small_base
+  Description:      Choose the new, split-up base package.
+
+Executable          package-test
+  Hs-Source-Dirs:  
+                    ../src src
+
+  Main-Is: 
+                    Main.hs
+
+  Ghc-Options:
+                    -O2
+                    -Wall
+                    -fhpc
+                    -fwarn-tabs
+
+  Build-Depends:  
+                   base < 5 && >= 3
+                   , QuickCheck
+                   , test-framework
+                   , test-framework-quickcheck2
+                   , test-framework-hunit
+
diff --git a/test/src/M/Tests.hs b/test/src/M/Tests.hs
@@ -0,0 +1,29 @@
+module M.Tests
+  (
+    main
+  , test
+  ) where
+
+import Test.Framework
+import Test.Framework.Providers.QuickCheck2 (testProperty)
+import M
+
+main :: 
+  IO ()
+main = 
+  defaultMain [test]
+
+test :: 
+  Test
+test =
+    testGroup "M"
+      [
+        testProperty "Right Identity" prop_right_identity
+      ]
+
+prop_right_identity ::
+  Int
+  -> Bool
+prop_right_identity n =
+  n `add` 0 == n
+
diff --git a/test/src/Main.hs b/test/src/Main.hs
@@ -0,0 +1,20 @@
+module Main where
+
+import qualified M.Tests
+import Test.Framework
+
+main ::
+  IO ()
+main = 
+  defaultMain tests 
+
+tests ::
+  [Test]
+tests =
+  [
+    testGroup "Tests"
+      [
+        M.Tests.test
+      ]
+  ]
+
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    dist
+    *.tix
+    .hpc