Merge branch 'master' of github.com:purescript/purescript-maps

Conflicts:
	.gitignore

Author: paf31

.gitignore

@@ -1,6 +1,4 @@
-/output/
-/js/
-/externs/
-/node_modules/
 /bower_components/
+/node_modules/
+/output/
 /tmp/

Gruntfile.js

@@ -5,35 +5,31 @@ module.exports = function(grunt) {
   grunt.initConfig({ 
 
     libFiles: [
-      "src/**/*.purs.hs",
+      "src/**/*.purs",
       "bower_components/purescript-*/src/**/*.purs",
-      "bower_components/purescript-*/src/**/*.purs.hs"
     ],
 
     clean: {
-      tests: ["tmp"],
-      lib: ["js", "externs"]
+        lib: ["output"],
+        tests: ["tmp"]
     },
 
-    "purescript-make": {
-      options: {
-        tco: true,
-        magicDo: true
-      },
-      lib: {
-        src: "<%=libFiles%>"
-      }
+    pscMake: ["<%=libFiles%>"],
+    dotPsci: ["<%=libFiles%>"],
+    docgen: {
+        readme: {
+            src: "src/**/*.purs",
+            dest: "README.md"
+        }
     },
-  
-    purescript: {
+    
+    psc: {
       tests: {
         options: {
-          tco: true,
-          magicDo: true,
-          module: ["Main"],
-          main: true
+          module: "Tests",
+          main: "Tests"
         },
-        src: ["tests/tests.purs.hs", "<%=libFiles%>"],
+        src: ["tests/Tests.purs", "<%=libFiles%>"],
         dest: "tmp/tests.js"
       }
     },
@@ -43,14 +39,14 @@ module.exports = function(grunt) {
         src: "tmp/tests.js"
       }
     }
-      
+
   });
 
   grunt.loadNpmTasks("grunt-contrib-clean");
   grunt.loadNpmTasks("grunt-purescript");
   grunt.loadNpmTasks("grunt-execute");
 
-  grunt.registerTask("test", ["clean:tests", "purescript:tests", "execute:tests"]);
-  grunt.registerTask("lib", ["purescript-make:lib"]);
-  grunt.registerTask("default", ["test", "lib"]);
+  grunt.registerTask("test", ["clean:tests", "psc", "execute"]);
+  grunt.registerTask("make", ["pscMake", "dotPsci", "docgen"]);
+  grunt.registerTask("default", ["make", "test"]);
 };

README.md

@@ -1,4 +1,86 @@
-purescript-maps
-===============
+# Module Documentation
 
-Purely functional maps implemented in PureScript
+## Module Data.Graph
+
+### Types
+
+    data Edge v where
+
+    data Graph v where
+
+
+### Values
+
+    scc :: forall v. (Eq v, Ord v) => Graph v -> [[v]]
+
+    topSort :: forall v. (Eq v, Ord v) => Graph v -> [v]
+
+
+## Module Data.Map
+
+### Types
+
+    data Map k v where
+
+
+### Type Class Instances
+
+    instance eqMap :: (P.Eq k, P.Eq v) => P.Eq (Map k v)
+
+    instance showMap :: (P.Show k, P.Show v) => P.Show (Map k v)
+
+
+### Values
+
+    alter :: forall k v. (P.Eq k, P.Ord k) => (Maybe v -> Maybe v) -> k -> Map k v -> Map k v
+
+    delete :: forall k v. (P.Eq k, P.Ord k) => k -> Map k v -> Map k v
+
+    empty :: forall k v. Map k v
+
+    fromList :: forall k v. (P.Eq k, P.Ord k) => [Tuple k v] -> Map k v
+
+    insert :: forall k v. (P.Eq k, P.Ord k) => k -> v -> Map k v -> Map k v
+
+    lookup :: forall k v. (P.Eq k, P.Ord k) => k -> Map k v -> Maybe v
+
+    map :: forall k v1 v2. (P.Eq k, P.Ord k) => (v1 -> v2) -> Map k v1 -> Map k v2
+
+    singleton :: forall k v. k -> v -> Map k v
+
+    toList :: forall k v. Map k v -> [Tuple k v]
+
+    union :: forall k v. (P.Eq k, P.Ord k) => Map k v -> Map k v -> Map k v
+
+
+## Module Data.Set
+
+### Types
+
+    data Set a where
+
+
+### Type Class Instances
+
+    instance eqSet :: (P.Eq a) => P.Eq (Set a)
+
+    instance showSet :: (P.Show a) => P.Show (Set a)
+
+
+### Values
+
+    delete :: forall a. (P.Eq a, P.Ord a) => a -> Set a -> Set a
+
+    empty :: forall a. Set a
+
+    fromList :: forall a. (P.Eq a, P.Ord a) => [a] -> Set a
+
+    insert :: forall a. (P.Eq a, P.Ord a) => a -> Set a -> Set a
+
+    member :: forall a. (P.Eq a, P.Ord a) => a -> Set a -> Prim.Boolean
+
+    singleton :: forall a. a -> Set a
+
+    toList :: forall a. Set a -> [a]
+
+    union :: forall a. (P.Eq a, P.Ord a) => Set a -> Set a -> Set a

bower.json

@@ -12,20 +12,23 @@
   "license": "MIT",
   "ignore": [
     "**/.*",
-    "node_modules",
     "bower_components",
-    "externs",
-    "js",
-    "tmp"
+    "node_modules",
+    "output",
+    "tests",
+    "tmp",
+    "bower.json",
+    "Gruntfile.js",
+    "package.json"
   ],
   "devDependencies": {
     "purescript-quickcheck": "*"
   },
   "dependencies": {
     "purescript-arrays": "*",
-    "purescript-maybe": "*",
-    "purescript-tuples": "*",
+    "purescript-foldable-traversable": "*",
     "purescript-math": "*",
-    "purescript-foldable-traversable": "*"
+    "purescript-maybe": "*",
+    "purescript-tuples": "*"
   }
 }

docs/Map.md

@@ -1,13 +1,9 @@
 {
-  "name": "purescript-maps",
-  "version": "0.0.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/purescript/purescript-maps.git"
-  },
-  "devDependencies": {
-    "grunt-purescript": "~0.4.0",
-    "grunt-execute": "~0.1.5",
-    "grunt-contrib-clean": "~0.5.0"
+  "private": true,
+  "dependencies": {
+    "grunt": "~0.4.4",
+    "grunt-purescript": "~0.5.1",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-execute": "~0.2.1"
   }
 }