Merge pull request #4067 from masatake/dsl--dont-use-hashInthas-for-storing-EsInteger-to-htable

masatake · web-flow · commit df13338ab4bf · 2024-09-01T10:22:30.000+09:00
dsl: fix the function for hashing integer object
diff --git a/Tmain/optscript.d/dict.expected b/Tmain/optscript.d/dict.expected
@@ -20,6 +20,8 @@ false
 1
 -dict:1-
 null
+(---- store integers ----)
+45
 (---- using types other than name as key objects ----)
 (3)
 (true)
diff --git a/Tmain/optscript.d/dict.ps b/Tmain/optscript.d/dict.ps
diff --git a/Tmain/optscript.d/read-and-print.expected b/Tmain/optscript.d/read-and-print.expected
@@ -29,15 +29,13 @@ efg
 -dict:5-
 -dict:5-
 <<
-  10 /===
-  97 1
   98 /ab
   99 (efg)
   100 -dict:4-
+  10 /===
+  97 1
 >> 
 <<
-  10 /====
-  97 1
   98 /ab
   99 (efg)
   100 <<
@@ -49,20 +47,20 @@ efg
       106 /ij
     >> 
   >> 
+  10 /====
+  97 1
 >> 
 [-dict:6-]
 [-dict:6-]
 [<<
-  10 /===
-  97 1
   98 /ab
   99 (efg)
   100 -dict:4-
+  10 /===
   122 [-dict:2-]
+  97 1
 >> ]
 [<<
-  10 /====
-  97 1
   98 /ab
   99 (efg)
   100 <<
@@ -78,10 +76,12 @@ efg
       >> ]
     >> 
   >> 
+  10 /====
   122 [<<
-    65 1
     66 [0 1 2]
+    65 1
   >> ]
+  97 1
 >> ]
 char after metachar
 [97]
diff --git a/dsl/optscript.c b/dsl/optscript.c
@@ -2064,7 +2064,7 @@ opt_es_hash (const void * const key)
 	const EsObject *k = key;
 
 	if (es_integer_p (key))
-		return hashInthash (key);
+		return es_integer_get (key);
 	else if (es_boolean_p (key))
 		return es_object_equal (key, es_true)? 1: 0;
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ false`
`20`	`20`	`1`
`21`	`21`	`-dict:1-`
`22`	`22`	`null`
	`23`	`+(---- store integers ----)`
	`24`	`+45`
`23`	`25`	`(---- using types other than name as key objects ----)`
`24`	`26`	`(3)`
`25`	`27`	`(true)`