comparison src/lread.c @ 31534:0bfeb94864e2

(Vloads_in_progress): New variable. (record_load_unwind): New function. (Fload): Check for recursive loads. (syms_of_lread): Initialize Vloads_in_progress. (read_integer, read1): Avoid some compiler warnings.

31533:3898245f639a

/* Nonzero means inside a new-style backquote
   with no surrounding parentheses.
   Fread initializes this to zero, so we need not specbind it
   or worry about what happens to it when there is an error.  */
static int new_backquote_flag;

/* Handle unreading and rereading of characters.
   Write READCHAR to read a character,
   UNREAD(c) to unread c to be read again.

	safe_p = 0;
    }

  lseek (fd, 0, SEEK_SET);
  return safe_p;
}


DEFUN ("load", Fload, Sload, 1, 5, 0,
  "Execute a file of Lisp code named FILE.\n\

	handler = Ffind_file_name_handler (found, Qload);
      if (! NILP (handler))
	return call5 (handler, Qload, found, noerror, nomessage, Qt);
    }

  /* Load .elc files directly, but not when they are
     remote and have no handler!  */
  if (!bcmp (&(XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 4]),
	     ".elc", 4)
      && fd != 0)

    load_source:

      /* We are loading a source file (*.el).  */
      if (!NILP (Vload_source_file_function))
	{
	  if (fd != 0)
	    emacs_close (fd);
	  return call4 (Vload_source_file_function, found, file,
			NILP (noerror) ? Qnil : Qt,
			NILP (nomessage) ? Qnil : Qt);
	}
    }

#ifdef WINDOWSNT
  emacs_close (fd);

	message_with_string ("Loading %s (compiled; note, source file is newer)...done",
		 file, 1);
      else /* The typical case; compiled file newer than source file.  */
	message_with_string ("Loading %s...done", file, 1);
    }
  return Qt;
}

static Lisp_Object
load_unwind (stream)  /* used as unwind-protect function in load */

static Lisp_Object
read_integer (readcharfun, radix)
     Lisp_Object readcharfun;
     int radix;
{
  int number, ndigits, invalid_p, c, sign;

  if (radix < 2 || radix > 36)
    invalid_p = 1;
  else
    {

	  while (1)
	    {
	      Lisp_Object beg, end, plist;

	      beg = read1 (readcharfun, &ch, 0);
	      if (ch == ')')
		break;
	      if (ch == 0)
		end = read1 (readcharfun, &ch, 0);
	      if (ch == 0)

  staticpro (&read_objects);
  read_objects = Qnil;
  staticpro (&seen_list);
  
}

31534:0bfeb94864e2

/* Nonzero means inside a new-style backquote
   with no surrounding parentheses.
   Fread initializes this to zero, so we need not specbind it
   or worry about what happens to it when there is an error.  */
static int new_backquote_flag;

/* A list of file names for files being loaded in Fload.  Used to
   check for recursive loads.  */

static Lisp_Object Vloads_in_progress;


/* Handle unreading and rereading of characters.
   Write READCHAR to read a character,
   UNREAD(c) to unread c to be read again.

	safe_p = 0;
    }

  lseek (fd, 0, SEEK_SET);
  return safe_p;
}


/* Callback for record_unwind_protect.  Restore the old load list OLD,
   after loading a file successfully.  */

static Lisp_Object
record_load_unwind (old)
     Lisp_Object old;
{
  return Vloads_in_progress = old;
}


DEFUN ("load", Fload, Sload, 1, 5, 0,
  "Execute a file of Lisp code named FILE.\n\

	handler = Ffind_file_name_handler (found, Qload);
      if (! NILP (handler))
	return call5 (handler, Qload, found, noerror, nomessage, Qt);
    }

  /* Check if we're loading this file again while another load
     of the same file is already in progress.  */
  if (!NILP (Fmember (found, Vloads_in_progress)))
    error ("Recursive load of file `%s'", XSTRING (file)->data);
  record_unwind_protect (record_load_unwind, Vloads_in_progress);
  Vloads_in_progress = Fcons (found, Vloads_in_progress);

  /* Load .elc files directly, but not when they are
     remote and have no handler!  */
  if (!bcmp (&(XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 4]),
	     ".elc", 4)
      && fd != 0)

    load_source:

      /* We are loading a source file (*.el).  */
      if (!NILP (Vload_source_file_function))
	{
	  Lisp_Object val;
	  
	  if (fd != 0)
	    emacs_close (fd);
	  val = call4 (Vload_source_file_function, found, file,
		       NILP (noerror) ? Qnil : Qt,
		       NILP (nomessage) ? Qnil : Qt);
	  return unbind_to (count, val);
	}
    }

#ifdef WINDOWSNT
  emacs_close (fd);

	message_with_string ("Loading %s (compiled; note, source file is newer)...done",
		 file, 1);
      else /* The typical case; compiled file newer than source file.  */
	message_with_string ("Loading %s...done", file, 1);
    }

  return Qt;
}

static Lisp_Object
load_unwind (stream)  /* used as unwind-protect function in load */

static Lisp_Object
read_integer (readcharfun, radix)
     Lisp_Object readcharfun;
     int radix;
{
  int number = 0, ndigits = 0, invalid_p, c, sign = 0;

  if (radix < 2 || radix > 36)
    invalid_p = 1;
  else
    {

	  while (1)
	    {
	      Lisp_Object beg, end, plist;

	      beg = read1 (readcharfun, &ch, 0);
	      end = plist = Qnil;
	      if (ch == ')')
		break;
	      if (ch == 0)
		end = read1 (readcharfun, &ch, 0);
	      if (ch == 0)

  staticpro (&read_objects);
  read_objects = Qnil;
  staticpro (&seen_list);
  
  Vloads_in_progress = Qnil;
  staticpro (&Vloads_in_progress);
}