0005136: caml-mode: string-to-int is obsolete since emacs 22.1

View Issue Details [ Jump to Notes ]

[ Issue History ] [ Print ]

Project

Tags

No tags attached.

Attached Files

caml-types.patch [^] (4,613 bytes) 2010-08-28 21:22 [Show Content] [Hide Content]

=== modified file 'caml-types.el'
--- old/caml-types.el	2010-08-28 10:14:09 +0000
+++ new/caml-types.el	2010-08-28 19:15:58 +0000
@@ -264,13 +264,13 @@
              ((string-match def-re kind)
               (let ((var-name (match-string 1 kind))
                     (l-file (file-name-nondirectory (match-string 2 kind)))
-                    (l-line (string-to-int (match-string 4 kind)))
-                    (l-bol (string-to-int (match-string 5 kind)))
-                    (l-cnum (string-to-int (match-string 6 kind)))
+                    (l-line (string-to-number (match-string 4 kind)))
+                    (l-bol (string-to-number (match-string 5 kind)))
+                    (l-cnum (string-to-number (match-string 6 kind)))
                     (r-file (file-name-nondirectory (match-string 7 kind)))
-                    (r-line (string-to-int (match-string 9 kind)))
-                    (r-bol (string-to-int (match-string 10 kind)))
-                    (r-cnum (string-to-int (match-string 11 kind))))
+                    (r-line (string-to-number (match-string 9 kind)))
+                    (r-bol (string-to-number (match-string 10 kind)))
+                    (r-cnum (string-to-number (match-string 11 kind))))
                 (let* ((lpos (vector l-file l-line l-bol l-cnum))
                        (rpos (vector r-file r-line r-bol r-cnum))
                        (left (caml-types-get-pos target-buf lpos))
@@ -280,9 +280,9 @@
              ((string-match def-end-re kind)
               (let ((var-name (match-string 1 kind))
                     (l-file (file-name-nondirectory (match-string 2 kind)))
-                    (l-line (string-to-int (match-string 4 kind)))
-                    (l-bol (string-to-int (match-string 5 kind)))
-                    (l-cnum (string-to-int (match-string 6 kind))))
+                    (l-line (string-to-number (match-string 4 kind)))
+                    (l-bol (string-to-number (match-string 5 kind)))
+                    (l-cnum (string-to-number (match-string 6 kind))))
                 (let* ((lpos (vector l-file l-line l-bol l-cnum))
                        (left (caml-types-get-pos target-buf lpos))
                        (right (buffer-size target-buf)))
@@ -291,13 +291,13 @@
              ((string-match internal-re kind)
               (let ((var-name (match-string 1 kind))
                     (l-file (file-name-nondirectory (match-string 2 kind)))
-                    (l-line (string-to-int (match-string 4 kind)))
-                    (l-bol (string-to-int (match-string 5 kind)))
-                    (l-cnum (string-to-int (match-string 6 kind)))
+                    (l-line (string-to-number (match-string 4 kind)))
+                    (l-bol (string-to-number (match-string 5 kind)))
+                    (l-cnum (string-to-number (match-string 6 kind)))
                     (r-file (file-name-nondirectory (match-string 7 kind)))
-                    (r-line (string-to-int (match-string 9 kind)))
-                    (r-bol (string-to-int (match-string 10 kind)))
-                    (r-cnum (string-to-int (match-string 11 kind))))
+                    (r-line (string-to-number (match-string 9 kind)))
+                    (r-bol (string-to-number (match-string 10 kind)))
+                    (r-cnum (string-to-number (match-string 11 kind))))
                 (let* ((lpos (vector l-file l-line l-bol l-cnum))
                        (rpos (vector r-file r-line r-bol r-cnum))
                        (left (caml-types-get-pos target-buf lpos))
@@ -400,13 +400,13 @@
         (annotation ()))
     (while (re-search-forward caml-types-location-re () t)
       (let ((l-file (file-name-nondirectory (match-string 1)))
-            (l-line (string-to-int (match-string 3)))
-            (l-bol (string-to-int (match-string 4)))
-            (l-cnum (string-to-int (match-string 5)))
+            (l-line (string-to-number (match-string 3)))
+            (l-bol (string-to-number (match-string 4)))
+            (l-cnum (string-to-number (match-string 5)))
             (r-file (file-name-nondirectory (match-string 6)))
-            (r-line (string-to-int (match-string 8)))
-            (r-bol (string-to-int (match-string 9)))
-            (r-cnum (string-to-int (match-string 10))))
+            (r-line (string-to-number (match-string 8)))
+            (r-bol (string-to-number (match-string 9)))
+            (r-cnum (string-to-number (match-string 10))))
         (unless (caml-types-not-in-file l-file r-file target-file)
           (setq annotation ())
           (while (next-annotation)

Relationships

Notes
(0005644) doligez (manager) 2010-08-30 12:18	This is more-or-less fixed in 3.12.1+dev. The question is how to remain compatible with older versions of emacs. Currently we define caml-string-to-int to be string-to-number (if available) or string-to-int, but I don't know how to do that without triggering a warning.

(0005645) Christophe Troestler (reporter) 2010-08-30 14:17	How about this (if (fboundp 'string-to-number) (defalias 'caml-string-to-int 'string-to-number) (defalias 'caml-string-to-int 'string-to-int)) (I am not an elisp expert either!)

(0005646) doligez (manager) 2010-08-30 17:16	That seems to do the trick, thanks. I've committed it to 3.12.1+dev.

Issue History
Date Modified	Username	Field	Change
2010-08-28 21:22	Christophe Troestler	New Issue
2010-08-28 21:22	Christophe Troestler	File Added: caml-types.patch
2010-08-30 12:18	doligez	Note Added: 0005644
2010-08-30 12:18	doligez	Status	new => feedback
2010-08-30 12:18	doligez	Resolution	open => fixed
2010-08-30 12:18	doligez	Fixed in Version	=> 3.12.1+dev
2010-08-30 14:17	Christophe Troestler	Note Added: 0005645
2010-08-30 17:16	doligez	Note Added: 0005646
2010-08-30 17:16	doligez	Status	feedback => closed