Get rid of funvec.

[bpt/emacs.git] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index b30a75b..77b397a 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -2497,8 +2497,14 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
          invalid_syntax ("#&...", 5);
        }
       if (c == '[')
-       /* `function vector' objects, including byte-compiled functions.  */
-       return read_vector (readcharfun, 1);
+       {
+         /* Accept compiled functions at read-time so that we don't have to
+            build them using function calls.  */
+         Lisp_Object tmp;
+         tmp = read_vector (readcharfun, 1);
+         return Fmake_byte_code (XVECTOR (tmp)->size,
+                                 XVECTOR (tmp)->contents);
+       }
       if (c == '(')
        {
          Lisp_Object tmp;
@@ -3311,7 +3317,7 @@ isfloat_string (const char *cp, int ignore_trailing)
 
 \f
 static Lisp_Object
-read_vector (Lisp_Object readcharfun, int read_funvec)
+read_vector (Lisp_Object readcharfun, int bytecodeflag)
 {
   register int i;
   register int size;
@@ -3319,11 +3325,6 @@ read_vector (Lisp_Object readcharfun, int read_funvec)
   register Lisp_Object tem, item, vector;
   register struct Lisp_Cons *otem;
   Lisp_Object len;
-  /* If we're reading a funvec object we start out assuming it's also a
-     byte-code object (a subset of funvecs), so we can do any special
-     processing needed.  If it's just an ordinary funvec object, we'll
-     realize that as soon as we've read the first element.  */
-  int read_bytecode = read_funvec;
 
   tem = read_list (1, readcharfun);
   len = Flength (tem);
@@ -3335,18 +3336,11 @@ read_vector (Lisp_Object readcharfun, int read_funvec)
     {
       item = Fcar (tem);
 
-      /* If READ_BYTECODE is set, check whether this is really a byte-code
-        object, or just an ordinary `funvec' object -- non-byte-code
-        funvec objects use the same reader syntax.  We can tell from the
-        first element which one it is.  */
-      if (read_bytecode && i == 0 && ! FUNVEC_COMPILED_TAG_P (item))
-       read_bytecode = 0;      /* Nope. */
-
       /* If `load-force-doc-strings' is t when reading a lazily-loaded
         bytecode object, the docstring containing the bytecode and
         constants values must be treated as unibyte and passed to
         Fread, to get the actual bytecode string and constants vector.  */
-      if (read_bytecode && load_force_doc_strings)
+      if (bytecodeflag && load_force_doc_strings)
        {
          if (i == COMPILED_BYTECODE)
            {
@@ -3400,13 +3394,6 @@ read_vector (Lisp_Object readcharfun, int read_funvec)
       free_cons (otem);
     }
 
-  if (read_bytecode && size >= 4)
-    /* Convert this vector to a bytecode object.  */
-    vector = Fmake_byte_code (size, XVECTOR (vector)->contents);
-  else if (read_funvec && size >= 1)
-    /* Convert this vector to an ordinary funvec object.  */
-    XSETFUNVEC (vector, XVECTOR (vector));
-
   return vector;
 }