1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- psgml-dtd.el.orig 2005-03-05 16:23:40 UTC
+++ psgml-dtd.el
@@ -93,12 +93,12 @@
(defmacro sgml-for-all-final-states (s dfa &rest forms)
"For all final states S in DFA do FORMS.
Syntax: var dfa-expr &body forms"
- (` (let ((L-states (sgml-some-states-of (, dfa)))
- (, s))
+ `(let ((L-states (sgml-some-states-of ,dfa))
+ ,s)
(while L-states
- (when (sgml-state-final-p (setq (, s) (car L-states)))
- (,@ forms))
- (setq L-states (cdr L-states))))))
+ (when (sgml-state-final-p (setq ,s (car L-states)))
+ ,@forms)
+ (setq L-states (cdr L-states)))))
(put 'sgml-for-all-final-states 'lisp-indent-hook 2)
(put 'sgml-for-all-final-states 'edebug-form-hook '(symbolp &rest form))
@@ -217,7 +217,7 @@ Syntax: var dfa-expr &body forms"
(defun sgml-make-pcdata ()
(sgml-make-* (sgml-make-primitive-content-token sgml-pcdata-token)))
-(defun sgml-reduce-, (l)
+(defun sgml-reduce-\, (l)
(while (cdr l)
(setcar (cdr l)
(sgml-make-conc (car l) (cadr l)))
@@ -279,7 +279,7 @@ Syntax: var dfa-expr &body forms"
(sgml-parse-delim "CRO" (digit nmstart))
(sgml-parse-delim "CRO" (digit)))
(prog1 (if (sgml-is-delim "NULL" digit)
- (string-to-int (sgml-check-nametoken))
+ (string-to-number (sgml-check-nametoken))
(let ((spec (sgml-check-name)))
(or (cdr (assoc spec '(("RE" . 10)
("RS" . 1)
@@ -336,7 +336,7 @@ Syntax: var dfa-expr &body forms"
(defsubst sgml-parse-connector ()
(sgml-skip-ps)
(cond ((sgml-parse-delim "SEQ")
- (function sgml-reduce-,))
+ (function sgml-reduce-\,))
((sgml-parse-delim "OR")
(function sgml-reduce-|))
((sgml-parse-delim "AND")
@@ -884,10 +884,10 @@ Syntax: (var seq) &body forms
FORMS should produce the binary coding of element in VAR."
(let ((var (car loop-c))
(seq (cadr loop-c)))
- (` (let ((seq (, seq)))
+ `(let ((seq ,seq))
(sgml-code-number (length seq))
- (loop for (, var) in seq
- do (,@ body))))))
+ (loop for ,var in seq
+ do ,@body))))
(put 'sgml-code-sequence 'lisp-indent-hook 1)
(put 'sgml-code-sequence 'edbug-forms-hook '(sexp &rest form))
|
