Merge pull request #2 from cym13/update

Update

Author: mintyfresh

source/markov/chain.d

@@ -190,7 +190,10 @@ public:
         foreach(ref state; _states)
         {
             T current = state.random;
-            if(current) return push(current), current;
+            if(current) {
+                push(current);
+                return current;
+            }
         }
 
         return null;
@@ -265,7 +268,10 @@ public:
             foreach(ref state; _states.values.sort!"a.size > b.size")
             {
                 T current = state.select(_history[$ - state.size .. $]);
-                if(current) return push(current), current;
+                if(current) {
+                    push(current);
+                    return current;
+                }
             }
         }
 

source/markov/counter.d

@@ -35,7 +35,7 @@ private:
         /++
          + Returns the hash for a token.
          ++/
-        hash_t toHash() const
+        hash_t toHash() const nothrow @safe
         {
             static if(__traits(compiles, {
                 T key = void;
@@ -46,7 +46,7 @@ private:
             }
             else
             {
-                return hashOf(_key);
+                return typeid(T).getHash(&_key);
             }
         }
 

source/markov/json/encoder.d

@@ -28,7 +28,7 @@ public:
     {
         JSONValue states = chain.states.map!(s => encodeState(s)).array;
 
-        return toJSON(&states, _pretty);
+        return toJSON(states, _pretty);
     }
 
 private: