Merge branch 'master' of https://github.com/eiffelhub/json

contrib/library/text/parser/json/.gitignore

@@ -1 +1,2 @@
 *.swp
+EIFGENs

contrib/library/text/parser/json/Readme.txt

@@ -39,7 +39,7 @@ compatibility is not guranteed for changes in minor numbers!
 
 Currently the only documentation on eJSON is available at:
 
-  http://ejson.origo.ethz.ch/wiki/user_guide
+  https://github.com/eiffelhub/json/wiki/User-guide
 
 5. Requirements and installation
 --------------------------------

contrib/library/text/parser/json/library/kernel/json_object.e

@@ -161,7 +161,7 @@ feature -- Report
         do
             from
                 object.start
-                Result := object.item_for_iteration.hash_code
+                Result := object.out.hash_code
             until
                 object.off
             loop

contrib/library/text/parser/json/test/autotest/test_suite/test_json_core.e

@@ -778,6 +778,17 @@ feature -- Test
 
         end
 
+    test_json_object_hash_code
+        local
+            ht: HASH_TABLE [ANY, JSON_VALUE]
+            jo: JSON_OBJECT
+        do
+            create ht.make (1)
+            create jo.make
+            ht.force ("", jo)
+            assert ("ht.has_key (jo)", ht.has_key (jo))
+        end
+
     test_json_failed_json_conversion
             -- Test converting an Eiffel object to JSON that is based on a class
             -- for which no JSON converter has been registered.