Mercurial > emacs
diff src/lread.c @ 25663:a5eaace0fa01
Use XCAR and XCDR instead of explicit member access.
author | Ken Raeburn <raeburn@raeburn.org> |
---|---|
date | Mon, 13 Sep 1999 03:35:33 +0000 |
parents | 301ce7f0b398 |
children | 3d1138357287 |
line wrap: on
line diff
--- a/src/lread.c Mon Sep 13 02:23:04 1999 +0000 +++ b/src/lread.c Mon Sep 13 03:35:33 1999 +0000 @@ -748,8 +748,8 @@ GCPRO1 (file); lispstream = Fcons (Qnil, Qnil); - XSETFASTINT (XCONS (lispstream)->car, (EMACS_UINT)stream >> 16); - XSETFASTINT (XCONS (lispstream)->cdr, (EMACS_UINT)stream & 0xffff); + XSETFASTINT (XCAR (lispstream), (EMACS_UINT)stream >> 16); + XSETFASTINT (XCDR (lispstream), (EMACS_UINT)stream & 0xffff); record_unwind_protect (load_unwind, lispstream); record_unwind_protect (load_descriptor_unwind, load_descriptor_list); specbind (Qload_file_name, found); @@ -793,8 +793,8 @@ load_unwind (stream) /* used as unwind-protect function in load */ Lisp_Object stream; { - fclose ((FILE *) (XFASTINT (XCONS (stream)->car) << 16 - | XFASTINT (XCONS (stream)->cdr))); + fclose ((FILE *) (XFASTINT (XCAR (stream)) << 16 + | XFASTINT (XCDR (stream)))); if (--load_in_progress < 0) load_in_progress = 0; return Qnil; } @@ -815,8 +815,8 @@ { #ifndef WINDOWSNT Lisp_Object tail; - for (tail = load_descriptor_list; !NILP (tail); tail = XCONS (tail)->cdr) - close (XFASTINT (XCONS (tail)->car)); + for (tail = load_descriptor_list; !NILP (tail); tail = XCDR (tail)) + close (XFASTINT (XCAR (tail))); #endif } @@ -2454,8 +2454,8 @@ error ("invalid byte code"); otem = XCONS (item); - bytestr = XCONS (item)->car; - item = XCONS (item)->cdr; + bytestr = XCAR (item); + item = XCDR (item); free_cons (otem); } @@ -2547,7 +2547,7 @@ { GCPRO2 (val, tail); if (!NILP (tail)) - XCONS (tail)->cdr = read0 (readcharfun); + XCDR (tail) = read0 (readcharfun); else val = read0 (readcharfun); read1 (readcharfun, &ch, 0); @@ -2560,7 +2560,7 @@ { /* Get a doc string from the file we are loading. If it's in saved_doc_string, get it from there. */ - int pos = XINT (XCONS (val)->cdr); + int pos = XINT (XCDR (val)); /* Position is negative for user variables. */ if (pos < 0) pos = -pos; if (pos >= saved_doc_string_position @@ -2640,7 +2640,7 @@ ? pure_cons (elt, Qnil) : Fcons (elt, Qnil)); if (!NILP (tail)) - XCONS (tail)->cdr = tem; + XCDR (tail) = tem; else val = tem; tail = tem; @@ -3265,7 +3265,7 @@ for (path_tail = Vload_path; !NILP (path_tail); - path_tail = XCONS (path_tail)->cdr) + path_tail = XCDR (path_tail)) { Lisp_Object dirfile; dirfile = Fcar (path_tail); @@ -3274,7 +3274,7 @@ dirfile = Fdirectory_file_name (dirfile); if (access (XSTRING (dirfile)->data, 0) < 0) dir_warning ("Warning: Lisp directory `%s' does not exist.\n", - XCONS (path_tail)->car); + XCAR (path_tail)); } } }