]> git.eshelyaron.com Git - emacs.git/commitdiff
(math-read-token): Read complement signed numbers.
authorJay Belanger <jay.p.belanger@gmail.com>
Sun, 15 Nov 2009 23:59:38 +0000 (23:59 +0000)
committerJay Belanger <jay.p.belanger@gmail.com>
Sun, 15 Nov 2009 23:59:38 +0000 (23:59 +0000)
lisp/calc/calc-aent.el

index f0a56931be83bc6db19499917e6ab6f788fe7039..17faebcef9dfb5eec1f8194911fa355c6fee99fa 100644 (file)
@@ -748,7 +748,7 @@ in Calc algebraic input.")
                                   (1- math-exp-pos))))))
             (or (and (memq calc-language calc-lang-c-type-hex)
                      (string-match "0[xX][0-9a-fA-F]+" math-exp-str math-exp-pos))
-                (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?"
+                (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#[#]?\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#[#]?\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?"
                                math-exp-str math-exp-pos))
             (setq math-exp-token 'number
                   math-expr-data (math-match-substring math-exp-str 0)