clean up a little bit

Author: bobzhang

jscomp/runtime/caml_hash.ml

@@ -60,19 +60,19 @@ let is_empty_queue q = q . length  = 0
 
 (* pop from front *)
 
+
 let unsafe_pop (q : 'a t) =        
   let cell = (Obj.magic (q . first) : 'a cell) in 
-  let  content, next_cell = cell.content , cell.next in 
-  match next_cell with 
-  | None -> 
+  let next =cell.next in 
+  if next = None then (
     q . length <- 0 ; 
     q . first <- None;
     q . last<- None;
-    content
-  | Some next -> 
+  ) else (
     q . length <- q . length - 1;
-    q . first <- next_cell ;
-    content
+    q . first <- next;
+  );
+  cell.content
 
 
 

lib/js/caml_hash.js

@@ -24,18 +24,16 @@ function push_back(q, v) {
 
 function unsafe_pop(q) {
   var cell = q.first;
-  var content = cell.content;
-  var next_cell = cell.next;
-  if (next_cell !== undefined) {
-    q.length = q.length - 1 | 0;
-    q.first = next_cell;
-    return content;
-  } else {
+  var next = cell.next;
+  if (next === undefined) {
     q.length = 0;
     q.first = undefined;
     q.last = undefined;
-    return content;
+  } else {
+    q.length = q.length - 1 | 0;
+    q.first = next;
   }
+  return cell.content;
 }
 
 function caml_hash(count, _limit, seed, obj) {