diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-08-25 17:06:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-08-25 17:06:42 +0000 |
| commit | 9148244bd77fdb10ef4171d9a85878f0ca08ad11 (patch) | |
| tree | 236b0244ea2521d8c75d05538a17d8c861f37558 | |
| parent | 39def76c4fbc08f899d76319be7629d062869727 (diff) | |
| download | emacs-9148244bd77fdb10ef4171d9a85878f0ca08ad11.tar.gz | |
(hif-greater, hif-less, hif-greater-equal)
(hif-less-equal): New functions.
(hif-tokenize): Handle new tokens >, <, >=, <=.
(hif-eq-expr): Handle parsing these new tokens.
(hif-token-regexp): Match >, <. >=, <=
| -rw-r--r-- | lisp/progmodes/hideif.el | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 5c97d41255e..734d962dd18 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -351,7 +351,7 @@ that form should be displayed.") ; pattern to match initial identifier, !, &&, ||, (, or ). ; Added ==, + and -: garyo@avs.com 8/9/94 -(defconst hif-token-regexp "^\\(&&\\|||\\|[!=]=\\|!\\|[()+-]\\|\\w+\\)") +(defconst hif-token-regexp "^\\(&&\\|||\\|[!=]=\\|!\\|[()+-]\\|[<>]=?\\|\\w+\\)") (defconst hif-end-of-comment "\\*/") @@ -403,6 +403,10 @@ that form should be displayed.") ((string-equal token "defined") 'hif-defined) ((string-equal token "(") 'lparen) ((string-equal token ")") 'rparen) + ((string-equal token ">") 'hif-greater) + ((string-equal token "<") 'hif-less) + ((string-equal token ">=") 'hif-greater-equal) + ((string-equal token "<=") 'hif-less-equal) ((string-equal token "+") 'hif-plus) ((string-equal token "-") 'hif-minus) (t (intern token))) @@ -448,10 +452,11 @@ that form should be displayed.") result)) (defun hif-eq-expr () - "Parse an eq-expr : math | eq-expr '=='|'!=' math." + "Parse an eq-expr : math | eq-expr `=='|`!='|`<'|`>'|`>='|`<=' math." (let ((result (hif-math)) (eq-token nil)) - (while (or (eq token 'equal) (eq token 'hif-notequal)) + (while (memq token '(equal hif-notequal hif-greater hif-less + hif-greater-equal hif-less-equal)) (setq eq-token token) (hif-nexttoken) (setq result (list eq-token result (hif-math)))) @@ -524,7 +529,18 @@ that form should be displayed.") (defun hif-notequal (a b) "Like (not (equal A B)) but as one symbol." (not (equal a b))) - +(defun hif-greater (a b) + "Simple comparison." + (> (hif-mathify a) (hif-mathify b))) +(defun hif-less (a b) + "Simple comparison." + (< (hif-mathify a) (hif-mathify b))) +(defun hif-greater-equal (a b) + "Simple comparison." + (>= (hif-mathify a) (hif-mathify b))) +(defun hif-less-equal (a b) + "Simple comparison." + (<= (hif-mathify a) (hif-mathify b))) ;;;----------- end of parser ----------------------- |