xemacs-beta: lisp/bytecomp.el comparison

comparison lisp/bytecomp.el @ 4623:a9f83990e6bf

Fix a byte compiler bug with characters above ?\xFF. lisp/ChangeLog addition: 2009-02-22 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el (byte-compile-force-escape-quoted): New variable, used to force `byte-compile-insert-header' to treat the output as having characters above ?\xFF. (byte-compile-from-buffer): If the compiled output contains characters above ?\xFF, and byte-compile-dynamic-docstrings or byte-compile-dynamic is non-nil (or we're using an inappropriate coding system) recompile the file, turning off the dynamic features and using a more appropriate header. (byte-compile-insert-header): Pay attention to byte-compile-force-escape-quoted. tests/ChangeLog addition: 2009-02-22 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Use more realistic tests for the escape-quoted mule encoding checks; update a comment, change a Known-Bug-Expect-Failure to a normal test now that we've addressed an old bug.

author	Aidan Kehoe <kehoea@parhasard.net>
date	Sun, 22 Feb 2009 19:57:28 +0000
parents	061e030e3270
children	7757334005ae

comparison

equal deleted inserted replaced

-:8cbca852bcd4
+:a9f83990e6bf
 "list of all variables encountered during compilation of this form")
 (defvar byte-compile-bound-variables nil
 "Alist of variables bound in the context of the current form,
 that is, the current lexical environment.  This list lives partly
 on the specbind stack.  The cdr of each cell is an integer bitmask.")
+(defvar byte-compile-force-escape-quoted nil
+"If non-nil, `byte-compile-insert-header' always adds a coding cookie.
+This is for situations where the byte compiler output file needs to be
+able to encode character values above ?\\xFF, but this cannot be
+easily determined from the input file.")
 (defconst byte-compile-referenced-bit 1)
 (defconst byte-compile-assigned-bit 2)
 (defconst byte-compile-arglist-bit 4)
 (defconst byte-compile-global-bit 8)
 	(byte-compile-output nil)
 	;;	  #### This is bound in b-c-close-variables.
 	;;	  (byte-compile-warnings (if (eq byte-compile-warnings t)
 	;;				     byte-compile-warning-types
 	;;				   byte-compile-warnings))
+(byte-compile-force-escape-quoted byte-compile-force-escape-quoted)
+(byte-compile-using-dynamic nil)
+(byte-compile-using-escape-quoted nil)
 	)
 (byte-compile-close-variables
 (save-excursion
 (setq byte-compile-outbuffer
 	     (set-buffer (get-buffer-create " *Compiler Output*")))
 (and filename
 	    (not eval)
 	    (byte-compile-insert-header filename
 					byte-compile-inbuffer
 					byte-compile-outbuffer))
+(setq byte-compile-using-dynamic
+(or (symbol-value-in-buffer 'byte-compile-dynamic
+byte-compile-inbuffer)
+(symbol-value-in-buffer 'byte-compile-dynamic-docstrings
+byte-compile-inbuffer)))
 ;; This is a kludge.  Some operating systems (OS/2, DOS) need to
 ;; write files containing binary information specially.
 ;; Under most circumstances, such files will be in binary
 ;; overwrite mode, so those OS's use that flag to guess how
 ;; they should write their data.  Advise them that .elc files
 ;; need to be written carefully.
 (setq overwrite-mode 'overwrite-mode-binary))
 (displaying-byte-compile-warnings
 (save-excursion
+	;; All our save-excursions may have led to a less-than-useful
+	;; value for point in the outbuffer:
+	(goto-char (point-max byte-compile-outbuffer) byte-compile-outbuffer)
 	(set-buffer byte-compile-inbuffer)
 	(goto-char 1)
 	;; Compile the forms from the input buffer.
 	(while (progn
 	;; would be useful to delay this warning until all have
 	;; been compiled.
 	(setq byte-compile-unresolved-functions nil)))
 (save-excursion
 (set-buffer byte-compile-outbuffer)
-(goto-char (point-min))))
+(goto-char (point-min))
+(when (and (or byte-compile-using-dynamic
+(eq buffer-file-coding-system 'raw-text-unix))
+(re-search-forward "[^\x00-\xff]" nil t))
+	 (when (or noninteractive byte-compile-verbose)
+	   (message
+	    "%s: includes char above ?\\xFF, recompiling sans dynamic features."
+	    filename))
+(set-symbol-value-in-buffer 'byte-compile-dynamic nil
+byte-compile-inbuffer)
+(set-symbol-value-in-buffer 'byte-compile-dynamic-docstrings nil
+byte-compile-inbuffer)
+(setq byte-compile-force-escape-quoted t
+byte-compile-outbuffer
+(byte-compile-from-buffer byte-compile-inbuffer
+filename eval)))))
 (if (not eval)
 	byte-compile-outbuffer
 (let (form)
 	(while (condition-case nil
 		   (progn (setq form (read byte-compile-outbuffer))
 ;; input file, use `escape-quoted' to make sure that both binary and
 ;; extended characters are output properly and distinguished properly.
 ;; Otherwise, use `raw-text' for maximum portability with non-Mule
 ;; Emacsen.
 (if (or (featurep '(not mule)) ;; Don't scan buffer if we are not muleized
-	  (save-excursion
+(and
-	    (set-buffer byte-compile-inbuffer)
+	   (not byte-compile-force-escape-quoted)
-	    (goto-char (point-min))
+	   (save-excursion
-;; Look for any non-Latin-1 literals or Unicode character
+	     (set-buffer byte-compile-inbuffer)
-;; escapes. Any such occurrences in a @#COUNT comment will lead
+	     (goto-char (point-min))
-;; to an escape-quoted coding cookie being inserted, but this is
+	     ;; Look for any non-Latin-1 literals or Unicode character
-;; not true of ordinary comments.
+	     ;; escapes. Any such occurrences in a @#COUNT comment will lead
-(let ((non-latin-1-re
+	     ;; to an escape-quoted coding cookie being inserted, but this is
-(concat "[^\000-\377]"
+	     ;; not true of ordinary comments.
-#r"\|\\u[0-9a-fA-F]\{4,4\}\|\\U[0-9a-fA-F]\{8,8\}"))
+	     (let ((non-latin-1-re
-(case-fold-search nil))
+		    (concat "[^\000-\377]"
-(catch 'need-to-escape-quote
+			    #r"\|\\u[0-9a-fA-F]\{4,4\}\|\\U[0-9a-fA-F]\{8,8\}"))
-(while (re-search-forward non-latin-1-re nil t)
+		   (case-fold-search nil))
-(skip-chars-backward "^;" (point-at-bol))
+	       (catch 'need-to-escape-quote
-(if (bolp) (throw 'need-to-escape-quote nil))
+		 (while (re-search-forward non-latin-1-re nil t)
-(forward-line 1))
+		   (skip-chars-backward "^;" (point-at-bol))
-t))))
+		   (if (bolp) (throw 'need-to-escape-quote nil))
+		   (forward-line 1))
+		 t)))))
 (setq buffer-file-coding-system 'raw-text-unix)
 (insert "(or (featurep 'mule) (error \"Loading this file requires Mule support\"))
 ;;;###coding system: escape-quoted\n")
 (setq buffer-file-coding-system 'escape-quoted)
 ;; #### Lazy loading not yet implemented for MULE files

Mercurial > hg > xemacs-beta

comparison lisp/bytecomp.el @ 4623:a9f83990e6bf