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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
|
$NetBSD: patch-psgml-parse.el,v 1.1 2012/08/16 11:54:56 wiz Exp $
Fix build with emacs24. From FreeBSD ports.
--- psgml-parse.el.orig 2005-03-05 16:23:40.000000000 +0000
+++ psgml-parse.el
@@ -330,28 +330,28 @@ Applicable to XML.")
;;(progn (set-syntax-table xml-parser-syntax) (describe-syntax))
(defmacro sgml-with-parser-syntax (&rest body)
- (` (let ((normal-syntax-table (syntax-table))
+ `(let ((normal-syntax-table (syntax-table))
(cb (current-buffer)))
(set-syntax-table (if sgml-xml-p xml-parser-syntax sgml-parser-syntax))
(unwind-protect
- (progn (,@ body))
+ (progn ,@body)
(setq sgml-last-buffer (current-buffer))
(set-buffer cb)
- (set-syntax-table normal-syntax-table)))))
+ (set-syntax-table normal-syntax-table))))
(defmacro sgml-with-parser-syntax-ro (&rest body)
;; Should only be used for parsing ....
- (` (let ((normal-syntax-table (syntax-table))
+ `(let ((normal-syntax-table (syntax-table))
(cb (current-buffer))
(buffer-modified (buffer-modified-p)))
(set-syntax-table (if sgml-xml-p xml-parser-syntax sgml-parser-syntax))
(unwind-protect
- (progn (,@ body))
+ (progn ,@body)
(setq sgml-last-buffer (current-buffer))
(set-buffer cb)
(set-syntax-table normal-syntax-table)
(sgml-restore-buffer-modified-p buffer-modified)
- (sgml-debug "Restoring buffer mod: %s" buffer-modified)))))
+ (sgml-debug "Restoring buffer mod: %s" buffer-modified))))
(defun sgml-set-buffer-multibyte (flag)
(cond ((featurep 'xemacs)
@@ -362,7 +362,7 @@ Applicable to XML.")
default-enable-multibyte-characters
flag)))
((boundp 'MULE)
- (set 'mc-flag flag))
+ (if (boundp 'mc-flag) (set 'mc-flag flag)))
(t
flag)))
;; Probably better. -- fx
@@ -429,21 +429,21 @@ Applicable to XML.")
;;move: (token . node)
(defmacro sgml-make-move (token node)
- (` (cons (, token) (, node))))
+ `(cons ,token ,node))
(defmacro sgml-move-token (x)
- (` (car (, x))))
+ `(car ,x))
(defmacro sgml-move-dest (x)
- (` (cdr (, x))))
+ `(cdr ,x))
;; set of moves: list of moves
(defmacro sgml-add-move-to-set (token node set)
- (`(cons (cons (, token) (, node)) (, set))))
+ `(cons (cons ,token ,node) ,set))
(defmacro sgml-moves-lookup (token set)
- (` (assq (, token) (, set))))
+ `(assq ,token ,set))
;; normal-state: ('normal-state opts . reqs)
@@ -451,16 +451,16 @@ Applicable to XML.")
(cons 'normal-state (cons nil nil)))
(defmacro sgml-normal-state-p (s)
- (` (eq (car (, s)) 'normal-state)))
+ `(eq (car ,s) 'normal-state))
(defmacro sgml-state-opts (s)
- (` (cadr (, s))))
+ `(cadr ,s))
(defmacro sgml-state-reqs (s)
- (` (cddr (, s))))
+ `(cddr ,s))
(defmacro sgml-state-final-p (s)
- (`(null (sgml-state-reqs (, s)))))
+ `(null (sgml-state-reqs ,s)))
;; adding moves
;; *** Should these functions check for ambiguity?
@@ -508,10 +508,10 @@ Applicable to XML.")
(cons next dfas))
(defmacro sgml-and-node-next (n)
- (` (car (, n))))
+ `(car ,n))
(defmacro sgml-and-node-dfas (n)
- (` (cdr (, n))))
+ `(cdr ,n))
;;; Using states
@@ -904,8 +904,8 @@ If ATTSPEC is nil, nil is returned."
(cons
'progn
(loop for n in names collect
- (`(defmacro (, (intern (format "sgml-eltype-%s" n))) (et)
- (list 'get et ''(, n)))))))
+ `(defmacro ,(intern (format "sgml-eltype-%s" n)) (et)
+ (list 'get et '',n)))))
(sgml-prop-fields
;;flags ; optional tags and mixed
@@ -920,7 +920,7 @@ If ATTSPEC is nil, nil is returned."
)
(defmacro sgml-eltype-flags (et)
- (` (symbol-value (, et))))
+ `(symbol-value ,et))
(defun sgml-eltype-model (et)
(if (fboundp et)
@@ -967,7 +967,7 @@ If ATTSPEC is nil, nil is returned."
"Get application data from element type ET with name PROP.
PROP should be a symbol, reserved names are: flags, model, attlist,
includes, excludes, conref-regexp, mixed, stag-optional, etag-optional."
- (` (get (, et) (, prop))))
+ ` (get ,et ,prop))
(defun sgml-eltype-all-miscdata (et)
(loop for p on (symbol-plist et) by (function cddr)
@@ -1060,7 +1060,7 @@ a default for the element type name."
;;; Wing addition
(defmacro sgml-char-int (ch)
(if (fboundp 'char-int)
- (` (char-int (, ch)))
+ `(char-int ,ch)
ch))
(defsubst sgml-read-octet ()
@@ -1435,51 +1435,51 @@ list -- any of the contextual constraint
(setq context '(t)))
((not (listp context))
(setq context (list context))))
- (`(if (and ; This and checks that characters
+ `(if (and ; This and checks that characters
; of the delimiter
- (,@(loop for i from 0 below (length ds) collect
- (` (eq (, (aref ds i))
- (sgml-following-char (, (+ i offset)))))))
+ ,@(loop for i from 0 below (length ds) collect
+ `(eq ,(aref ds i)
+ (sgml-following-char ,(+ i offset))))
(or
- (,@(loop
+ ,@(loop
for c in context collect ; context check
(cond
((eq c 'nmstart) ; name start character
- (`(sgml-startnm-char
- (or (sgml-following-char (, (length ds))) 0))))
+ `(sgml-startnm-char
+ (or (sgml-following-char ,(length ds)) 0)))
((eq c 'stagc)
- (`(and sgml-current-shorttag
- (sgml-is-delim "TAGC" nil nil (, (length ds))))))
+ `(and sgml-current-shorttag
+ (sgml-is-delim "TAGC" nil nil ,(length ds))))
((eq c 'digit)
- (`(memq (sgml-following-char (, (length ds)))
- '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))))
+ `(memq (sgml-following-char ,(length ds))
+ '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)))
((stringp c)
- (`(sgml-is-delim (, c) nil nil (, (length ds)))))
+ `(sgml-is-delim ,c nil nil ,(length ds)))
((eq c t))
(t (error "Context type: %s" c))))
- )))
+ ))
(progn ; Do operations if delimiter found
- (,@ (if move (`((forward-char (, (length ds)))))))
- (,@ (if (not (eq move 'check))
- '(t))))
- (,@ (if (eq move 'check)
- (`((sgml-delimiter-parse-error (, delim))))))))))
+ ,@(if move `((forward-char ,(length ds))))
+ ,@(if (not (eq move 'check))
+ '(t)))
+ ,@(if (eq move 'check)
+ `((sgml-delimiter-parse-error ,delim))))))
(defmacro sgml-following-char (n)
(cond ((zerop n) '(following-char))
((= n 1) '(char-after (1+ (point))))
- (t (` (char-after (+ (, n) (point)))))))
+ (t `(char-after (+ ,n (point))))))
(defun sgml-delimiter-parse-error (delim)
(sgml-parse-error "Delimiter %s (%s) expected"
delim (sgml-get-delim-string delim)))
(defmacro sgml-parse-delim (delim &optional context)
- (`(sgml-is-delim (, delim) (, context) move)))
+ `(sgml-is-delim ,delim ,context move))
(defmacro sgml-check-delim (delim &optional context)
- (`(sgml-is-delim (, delim) (, context) check)))
+ `(sgml-is-delim ,delim ,context check))
(defmacro sgml-skip-upto (delim)
"Skip until the delimiter or first char of one of the delimiters.
@@ -1503,8 +1503,8 @@ in any of them."
(let ((ds (sgml-get-delim-string (upcase (format "%s" delim)))))
(if (= 1 (length ds))
(list 'skip-chars-forward (concat "^" ds))
- (`(and (search-forward (, ds) nil t)
- (backward-char (, (length ds))))))))))
+ `(and (search-forward ,ds nil t)
+ (backward-char ,(length ds))))))))
;;(macroexpand '(sgml-is-delim mdo))
@@ -1521,22 +1521,22 @@ in any of them."
;;; aproporiate value.
(defmacro sgml-parse-char (char)
- (` (cond ((eq (, char) (following-char))
+ `(cond ((eq ,char (following-char))
(forward-char 1)
- t))))
+ t)))
(defmacro sgml-parse-chars (char1 char2 &optional char3)
"Parse two or three chars; return nil if can't."
(if (null char3)
- (` (cond ((and (eq (, char1) (following-char))
- (eq (, char2) (char-after (1+ (point)))))
+ `(cond ((and (eq ,char1 (following-char))
+ (eq ,char2 (char-after (1+ (point)))))
(forward-char 2)
- t)))
- (` (cond ((and (eq (, char1) (following-char))
- (eq (, char2) (char-after (1+ (point))))
- (eq (, char3) (char-after (1+ (1+ (point))))))
+ t))
+ `(cond ((and (eq ,char1 (following-char))
+ (eq ,char2 (char-after (1+ (point))))
+ (eq ,char3 (char-after (1+ (1+ (point))))))
(forward-char 3)
- t)))))
+ t))))
(defun sgml-check-char (char)
(cond ((not (sgml-parse-char char))
@@ -1547,7 +1547,7 @@ in any of them."
(sgml-parse-char ?\r)))
(defmacro sgml-startnm-char (c)
- (` (eq ?w (char-syntax (, c)))))
+ `(eq ?w (char-syntax ,c)))
(defsubst sgml-startnm-char-next ()
(and (not (eobp))
@@ -1694,11 +1694,11 @@ in any of them."
(define-compiler-macro sgml-parse-name (&whole form &optional entity-name)
(cond
((memq entity-name '(nil t))
- (` (if (sgml-startnm-char-next)
- ((, (if entity-name 'sgml-entity-case 'sgml-general-case))
+ `(if (sgml-startnm-char-next)
+ (,(if entity-name 'sgml-entity-case 'sgml-general-case)
(buffer-substring-no-properties (point)
(progn (skip-syntax-forward "w_")
- (point)))))))
+ (point))))))
(t
form)))
@@ -1828,8 +1828,8 @@ Return true if not at the end of the buf
With optional NAME, RNI must be followed by NAME."
(cond
(name
- (` (if (sgml-parse-delim "RNI")
- (sgml-check-token (, name)))))
+ `(if (sgml-parse-delim "RNI")
+ (sgml-check-token ,name)))
(t '(sgml-parse-delim "RNI"))))
(defun sgml-check-token (name)
@@ -2734,11 +2734,11 @@ overrides the entity type in entity look
(let ((macs nil))
(while fields
(push
- (` (defmacro (, (intern (format "%s-%s" dest (car fields)))) (element)
- (, (format "Return %s field of ELEMENT." (car fields)))
+ `(defmacro ,(intern (format "%s-%s" dest (car fields))) (element)
+ ,(format "Return %s field of ELEMENT." (car fields))
(list
- '(, (intern (format "%s-%s" orig (car fields))))
- element)))
+ ',(intern (format "%s-%s" orig (car fields)))
+ element))
macs)
(setq fields (cdr fields)))
(cons 'progn macs)))
@@ -2776,7 +2776,7 @@ overrides the entity type in entity look
(defmacro sgml-element-stag-optional (element)
"True if start-tag of ELEMENT is omissible."
- (`(sgml-eltype-stag-optional (sgml-tree-eltype (, element)))))
+ `(sgml-eltype-stag-optional (sgml-tree-eltype ,element)))
(defsubst sgml-element-etag-optional (element)
"True if end-tag of ELEMENT is omissible."
@@ -2930,8 +2930,10 @@ overrides the entity type in entity look
(defun sgml-set-initial-state (dtd)
"Set initial state of parsing."
- (make-local-hook 'before-change-functions)
- (make-local-hook 'after-change-functions)
+ (if (fboundp 'make-local-hook)
+ (progn
+ (make-local-hook 'before-change-functions)
+ (make-local-hook 'after-change-functions)))
(add-hook 'before-change-functions 'sgml-note-change-at nil 'local)
(add-hook 'after-change-functions 'sgml-set-face-after-change nil 'local)
(sgml-set-active-dtd-indicator (sgml-dtd-doctype dtd))
@@ -3505,7 +3507,7 @@ Where PAIRS is a list of (delim . ename)
Also move point. Return nil, either if no shortref or undefined."
(macrolet
- ((delim (x) (` (aref map (, (sgml-shortref-index x))))))
+ ((delim (x) `(aref map ,(sgml-shortref-index x))))
(let ((i (if nobol 1 0)))
(while (numberp i)
(setq i
|
