From 08949d98f7d16b2e8eb60476b9bd96b123c38366 Mon Sep 17 00:00:00 2001 From: Gong Qijian Date: Wed, 10 Oct 2018 20:28:10 +0800 Subject: [PATCH] ob-core.el: Fix org-babel--string-to-number * lisp/ob-core.el (org-babel--string-to-number): Fix the regular expression. * testing/lisp/test-ob.el (test-ob/string-to-number): Test cases. If people write the data in the form `0001`, it means that he wants to treat it as a string. > #+name: TBL > | id | name | age | > |------|--------|-----| > | 0001 | Apollo | 16 | > | 0002 | Bmw | 16 | > > #+BEGIN_SRC emacs-lisp :results value pp :var tbl=TBL > (mapc 'print tbl) > #+END_SRC > > #+RESULTS: > : (("0001" "Apollo" 16) > : ("0002" "Bmw" 16)) TINYCHANGE --- lisp/ob-core.el | 2 +- testing/lisp/test-ob.el | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 19d58cd..349a761 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2923,7 +2923,7 @@ situations in which is it not appropriate." (defun org-babel--string-to-number (string) "If STRING represents a number return its value. Otherwise return nil." - (and (string-match-p "\\`-?[0-9]*\\.?[0-9]*\\'" string) + (and (string-match-p "\\`-?\\([0-9]\\|\\([1-9]\\|[0-9]*\\.\\)[0-9]*\\)\\'" string) (string-to-number string))) (defun org-babel-import-elisp-from-file (file-name &optional separator) diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index bc065d3..50af7e9 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -1985,6 +1985,16 @@ abc (let ((org-coderef-label-format "#(ref:%s)")) (org-babel-execute-src-block)))))) +(ert-deftest test-ob/string-to-number () + (should (= 0 (org-babel--string-to-number "0"))) + (should (= 1 (org-babel--string-to-number "1"))) + (should (eq nil (org-babel--string-to-number "000"))) + (should (eq nil (org-babel--string-to-number "001"))) + (should (eq nil (org-babel--string-to-number "010"))) + (should (= 100 (org-babel--string-to-number "100"))) + (should (= 0.1 (org-babel--string-to-number "0.1"))) + (should (= 1.0 (org-babel--string-to-number "1.0")))) + (provide 'test-ob) ;;; test-ob ends here -- 2.19.0