comparison lisp/calc/calc-aent.el @ 106037:2d0a21ad00df

(math-read-token): Read complement signed numbers.
author Jay Belanger <jay.p.belanger@gmail.com>
date Sun, 15 Nov 2009 23:59:38 +0000
parents 2c12fbae77c2
children 72136220d7f5
comparison
equal deleted inserted replaced
106036:20558a815b94 106037:2d0a21ad00df
746 (eq (string-match "[^])}\"a-zA-Z0-9'$]_" 746 (eq (string-match "[^])}\"a-zA-Z0-9'$]_"
747 math-exp-str (1- math-exp-pos)) 747 math-exp-str (1- math-exp-pos))
748 (1- math-exp-pos)))))) 748 (1- math-exp-pos))))))
749 (or (and (memq calc-language calc-lang-c-type-hex) 749 (or (and (memq calc-language calc-lang-c-type-hex)
750 (string-match "0[xX][0-9a-fA-F]+" math-exp-str math-exp-pos)) 750 (string-match "0[xX][0-9a-fA-F]+" math-exp-str math-exp-pos))
751 (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]+\\)?\"?\\)?" 751 (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]+\\)?\"?\\)?"
752 math-exp-str math-exp-pos)) 752 math-exp-str math-exp-pos))
753 (setq math-exp-token 'number 753 (setq math-exp-token 'number
754 math-expr-data (math-match-substring math-exp-str 0) 754 math-expr-data (math-match-substring math-exp-str 0)
755 math-exp-pos (match-end 0))) 755 math-exp-pos (match-end 0)))
756 ((and (setq adfn 756 ((and (setq adfn