[MLton-commit] r5437

[Matthew Fluet]

Merge trunk revisions r5323:5436 into x86_64 branch
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-data.el
U   mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-mode.el
U   mlton/branches/on-20050822-x86_64-branch/lib/mlton/basic/property-list.fun
A   mlton/branches/on-20050822-x86_64-branch/regression/size2.ok
A   mlton/branches/on-20050822-x86_64-branch/regression/size2.sml
U   mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.c

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-data.el
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-data.el	2007-03-15 22:31:18 UTC (rev 5436)
+++ mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-data.el	2007-03-15 22:33:15 UTC (rev 5437)
@@ -97,7 +97,7 @@
   (let ((buffer (get-buffer def-use-show-dus-buffer-name)))
     (when buffer
       (with-current-buffer buffer
-        (save-excursion
+        (let ((point (point)))
           (setq buffer-read-only nil)
           (goto-char 1)
           (delete-char (buffer-size))
@@ -107,7 +107,8 @@
                  (lambda (dus)
                    (insert (def-use-dus-title dus) "\n")))
                 def-use-dus-list)
-          (setq buffer-read-only t))))))
+          (setq buffer-read-only t)
+          (goto-char point))))))
 
 (defun def-use-show-dus-del ()
   "Kill the def-use source on the current line."

Modified: mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-mode.el
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-mode.el	2007-03-15 22:31:18 UTC (rev 5436)
+++ mlton/branches/on-20050822-x86_64-branch/ide/emacs/def-use-mode.el	2007-03-15 22:33:15 UTC (rev 5437)
@@ -462,7 +462,9 @@
 
 (defun def-use-highlight-current ()
   "Highlights the symbol at the point."
-  (def-use-highlight-sym (def-use-current-sym)))
+  (save-excursion
+    (save-window-excursion
+      (def-use-highlight-sym (def-use-current-sym)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Highlighting timer

Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton/basic/property-list.fun
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton/basic/property-list.fun	2007-03-15 22:31:18 UTC (rev 5436)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton/basic/property-list.fun	2007-03-15 22:33:15 UTC (rev 5437)
@@ -18,17 +18,18 @@
 
 fun clear (T hs) = hs := []
 
-val numPeeks: int ref = ref 0
-val numLinks: int ref = ref 0
+val numPeeks: Int64.int ref = ref 0
+val numLinks: Int64.int ref = ref 0
 val maxLength: int ref = ref 0
 
 fun stats () =
    let open Layout
    in align
-      [seq [str "numPeeks = ", Int.layout (!numPeeks)],
+      [seq [str "numPeeks = ", str (Int64.toString (!numPeeks))],
        seq [str "maxLength = ", Int.layout (!maxLength)],
        seq [str "average position in property list = ",
             str let open Real
+                    val fromInt = fromIntInf o Int64.toLarge
                 in format (fromInt (!numLinks) / fromInt (!numPeeks),
                            Format.fix (SOME 3))
                 end]]
@@ -42,7 +43,7 @@
             fun loop (l, n) =
                let
                   fun update () =
-                     ((numLinks := n + !numLinks
+                     ((numLinks := Int64.fromInt n + !numLinks
                        handle Overflow => Error.bug "PropertyList: numLinks overflow")
                       ; if n > !maxLength
                            then maxLength := n

Copied: mlton/branches/on-20050822-x86_64-branch/regression/size2.ok (from rev 5436, mlton/trunk/regression/size2.ok)

Copied: mlton/branches/on-20050822-x86_64-branch/regression/size2.sml (from rev 5436, mlton/trunk/regression/size2.sml)

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.c	2007-03-15 22:31:18 UTC (rev 5436)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/mingw.c	2007-03-15 22:33:15 UTC (rev 5437)
@@ -592,7 +592,7 @@
 }
 
 int nanosleep (const struct timespec *req, struct timespec *rem) {
-        Sleep (req->tv_sec * 1000 + (req->tv_nsec + 999) / 1000);
+        Sleep (req->tv_sec * 1000 + (req->tv_nsec + 999999) / 1000000);
         rem->tv_nsec = 0;
         rem->tv_sec = 0;
         return 0;