xemacs-beta: src/lread.c comparison

comparison src/lread.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	966663fcf606
children	90d73dddcdc4

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 Lisp_Object Qcurrent_load_list;
 Lisp_Object Qload, Qload_file_name;
 Lisp_Object Qlocate_file_hash_table;
 Lisp_Object Qfset;
-int puke_on_fsf_keys;
+int fail_on_bucky_bit_character_escapes;
 /* This symbol is also used in fns.c */
 #define FEATUREP_SYNTAX
 #ifdef FEATUREP_SYNTAX
 /* Length of actual data in saved_doc_string.  */
 static int saved_doc_string_length;
 /* This is the file position that string came from.  */
 static int saved_doc_string_position;
 #endif
+EXFUN (Fread_from_string, 3);
 /* When errors are signaled, the actual readcharfun should not be used
 as an argument if it is an lstream, so that lstreams don't escape
 to the Lisp level.  */
 #define READCHARFUN_MAYBE(x) (LSTREAMP (x)					\
 struct gcpro gcpro1, gcpro2, gcpro3;
 int reading_elc = 0;
 int message_p = NILP (nomessage);
 /*#ifdef DEBUG_XEMACS*/
 static Lisp_Object last_file_loaded;
-int pure_usage = 0;
+size_t pure_usage = 0;
 /*#endif*/
 struct stat s1, s2;
 GCPRO3 (file, newer, found);
 CHECK_STRING (file);
 /* This function can GC */
 Lisp_Object tp;
 CHECK_STRING (filename);
 if (!NILP (suffixes))
-{
+CHECK_STRING (suffixes);
-CHECK_STRING (suffixes);
+if (!NILP (mode))
-}
+CHECK_NATNUM (mode);
-if (!(NILP (mode) || (INTP (mode) && XINT (mode) >= 0)))
-mode = wrong_type_argument (Qnatnump, mode);
 locate_file (path_list, filename,
 ((NILP (suffixes)) ? "" :
 		(char *) (XSTRING_DATA (suffixes))),
 	       &tp, (NILP (mode) ? R_OK : XINT (mode)));
 return tp;
 if (esuffix == 0)
 	break;
 nsuffix += lsuffix + 1;
 }
 return Fnreverse (suffixtab);
+}
+DEFUN ("locate-file-clear-hashing", Flocate_file_clear_hashing, 1, 1, 0, /*
+Clear the hash records for the specified list of directories.
+`locate-file' uses a hashing scheme to speed lookup, and will correctly
+track the following environmental changes:
+-- changes of any sort to the list of directories to be searched.
+-- addition and deletion of non-shadowing files (see below) from the
+directories in the list.
+-- byte-compilation of a .el file into a .elc file.
+`locate-file' will primarily get confused if you add a file that shadows
+\(i.e. has the same name as) another file further down in the directory list.
+In this case, you must call `locate-file-clear-hashing'.
+*/
+(path))
+{
+Lisp_Object pathtail;
+for (pathtail = path; !NILP (pathtail); pathtail = Fcdr (pathtail))
+{
+Lisp_Object pathel = Fcar (pathtail);
+if (!purified (pathel))
+	Fput (pathel, Qlocate_file_hash_table, Qnil);
+}
+return Qnil;
 }
 /* Search for a file whose name is STR, looking in directories
 in the Lisp list PATH, and trying suffixes from SUFFIX.
 SUFFIX is a string containing possible suffixes separated by colons.
 UNGCPRO;
 return val;
 }
-DEFUN ("locate-file-clear-hashing", Flocate_file_clear_hashing, 1, 1, 0, /*
-Clear the hash records for the specified list of directories.
-`locate-file' uses a hashing scheme to speed lookup, and will correctly
-track the following environmental changes:
--- changes of any sort to the list of directories to be searched.
--- addition and deletion of non-shadowing files (see below) from the
-directories in the list.
--- byte-compilation of a .el file into a .elc file.
-`locate-file' will primarily get confused if you add a file that shadows
-\(i.e. has the same name as) another file further down in the directory list.
-In this case, you must call `locate-file-clear-hashing'.
-*/
-(path))
-{
-Lisp_Object pathtail;
-for (pathtail = path; !NILP (pathtail); pathtail = Fcdr (pathtail))
-{
-Lisp_Object pathel = Fcar (pathtail);
-if (!purified (pathel))
-	Fput (pathel, Qlocate_file_hash_table, Qnil);
-}
-return Qnil;
-}
 #ifdef LOADHIST
 /* Merge the list we've accumulated of globals from the current input source
 into the load_history variable.  The details depend on whether
 #define ctl_modifier   (0x400000)
 #define meta_modifier  (0x800000)
 */
 #define FSF_LOSSAGE(mask)							\
-if (puke_on_fsf_keys || ((c = readchar (readcharfun)) != '-'))		\
+if (fail_on_bucky_bit_character_escapes ||				\
+	  ((c = readchar (readcharfun)) != '-'))				\
 	error ("Invalid escape character syntax");				\
 c = readchar (readcharfun);						\
 if (c < 0)								\
 	signal_error (Qend_of_file, list1 (READCHARFUN_MAYBE (readcharfun)));	\
 if (c == '\\')								\
 static Lisp_Object
 parse_integer (CONST Bufbyte *buf, Bytecount len, int base)
 {
 CONST Bufbyte *lim = buf + len;
 CONST Bufbyte *p = buf;
-unsigned EMACS_INT num = 0;
+EMACS_UINT num = 0;
 int negativland = 0;
 if (*p == '-')
 {
 negativland = 1;
 goto loser;
 for (; (p < lim) && (*p != '\0'); p++)
 {
 int c = *p;
-unsigned EMACS_INT onum;
+EMACS_UINT onum;
 if (isdigit (c))
 	c = c - '0';
 else if (isupper (c))
 	c = c - 'A' + 10;
 if (num < onum)
 	goto overflow;
 }
 {
-int int_result = negativland ? -(int)num : (int)num;
+EMACS_INT int_result = negativland ? -num : num;
 Lisp_Object result = make_int (int_result);
 if (num && ((XINT (result) < 0) != negativland))
 goto overflow;
 if (XINT (result) != int_result)
 goto overflow;
 #if 0
 		  return Fsignal (Qinvalid_read_syntax,
 		       list1 (build_string ("Comma outside of backquote")));
 #else
 		  /* #### - yuck....but this is reverse compatible. */
-		  /* mostly this is required by edebug, which does it's own
+		  /* mostly this is required by edebug, which does its own
 		     annotated reading.  We need to have an annotated_read
 		     function that records (with markers) the buffer
 		     positions of the elements that make up lists, then that
 		     can be used in edebug and bytecomp and the check above
 		     can go back in. --Stig */
 	  return Fsignal (Qend_of_file, list1 (READCHARFUN_MAYBE (readcharfun)));
 	/* If purifying, and string starts with \ newline,
 	   return zero instead.  This is for doc strings
 	   that we are really going to find in lib-src/DOC.nn.nn  */
-	if (purify_flag && NILP (Vdoc_file_name) && cancel)
+	if (purify_flag && NILP (Vinternal_doc_file_name) && cancel)
 	  return Qzero;
 	Lstream_flush (XLSTREAM (Vread_buffer_stream));
 #if 0 /* FSFmacs defun hack */
 	if (read_pure)
 	  if (CONSP (holding_cons))
 	    {
 	      if (purify_flag)
 		{
-		  if (NILP (Vdoc_file_name))
+		  if (NILP (Vinternal_doc_file_name))
 		    /* We have not yet called Snarf-documentation, so
 		       assume this file is described in the DOC file
 		       and Snarf-documentation will fill in the right
 		       value later.  For now, replace the whole list
 		       with 0.  */
 	  && EQ (XCAR (make_byte_code_args[iii]), Vload_file_name_internal))
 	{
 	  if (purify_flag && iii == COMPILED_DOC_STRING)
 	    {
 	      /* same as in read_list(). */
-	      if (NILP (Vdoc_file_name))
+	      if (NILP (Vinternal_doc_file_name))
 		make_byte_code_args[iii] = Qzero;
 	      else
 		XCAR (make_byte_code_args[iii]) =
 		  concat2 (build_string ("../lisp/"),
 			   Ffile_name_nondirectory
 Directory in which XEmacs sources were found when XEmacs was built.
 You cannot count on them to still be there!
 */ );
 Vsource_directory = Qnil;
-DEFVAR_BOOL ("fail-on-bucky-bit-character-escapes", &puke_on_fsf_keys /*
+/* Used to be named `puke-on-fsf-keys' */
+DEFVAR_BOOL ("fail-on-bucky-bit-character-escapes",
+	       &fail_on_bucky_bit_character_escapes /*
 Whether `read' should signal an error when it encounters unsupported
 character escape syntaxes or just read them incorrectly.
 */ );
-puke_on_fsf_keys = 0;
+fail_on_bucky_bit_character_escapes = 0;
 /* This must be initialized in init_lread otherwise it may start out
 with values saved when the image is dumped. */
 staticpro (&Vload_descriptor_list);

Mercurial > hg > xemacs-beta

comparison src/lread.c @ 272:c5d627a313b1 r21-0b34