Mercurial > emacs
comparison src/bytecode.c @ 25645:a14111a2a100
Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Sun, 12 Sep 1999 05:07:01 +0000 |
| parents | c69d612b0819 |
| children | efb608f1cb10 |
comparison
equal
deleted
inserted
replaced
| 25644:2ae0f7963ccc | 25645:a14111a2a100 |
|---|---|
| 627 op = XINT (v2); | 627 op = XINT (v2); |
| 628 immediate_quit = 1; | 628 immediate_quit = 1; |
| 629 while (--op >= 0) | 629 while (--op >= 0) |
| 630 { | 630 { |
| 631 if (CONSP (v1)) | 631 if (CONSP (v1)) |
| 632 v1 = XCONS (v1)->cdr; | 632 v1 = XCDR (v1); |
| 633 else if (!NILP (v1)) | 633 else if (!NILP (v1)) |
| 634 { | 634 { |
| 635 immediate_quit = 0; | 635 immediate_quit = 0; |
| 636 v1 = wrong_type_argument (Qlistp, v1); | 636 v1 = wrong_type_argument (Qlistp, v1); |
| 637 immediate_quit = 1; | 637 immediate_quit = 1; |
| 672 break; | 672 break; |
| 673 | 673 |
| 674 case Bcar: | 674 case Bcar: |
| 675 v1 = TOP; | 675 v1 = TOP; |
| 676 docar: | 676 docar: |
| 677 if (CONSP (v1)) TOP = XCONS (v1)->car; | 677 if (CONSP (v1)) TOP = XCAR (v1); |
| 678 else if (NILP (v1)) TOP = Qnil; | 678 else if (NILP (v1)) TOP = Qnil; |
| 679 else Fcar (wrong_type_argument (Qlistp, v1)); | 679 else Fcar (wrong_type_argument (Qlistp, v1)); |
| 680 break; | 680 break; |
| 681 | 681 |
| 682 case Bcdr: | 682 case Bcdr: |
| 683 v1 = TOP; | 683 v1 = TOP; |
| 684 if (CONSP (v1)) TOP = XCONS (v1)->cdr; | 684 if (CONSP (v1)) TOP = XCDR (v1); |
| 685 else if (NILP (v1)) TOP = Qnil; | 685 else if (NILP (v1)) TOP = Qnil; |
| 686 else Fcdr (wrong_type_argument (Qlistp, v1)); | 686 else Fcdr (wrong_type_argument (Qlistp, v1)); |
| 687 break; | 687 break; |
| 688 | 688 |
| 689 case Bcons: | 689 case Bcons: |
| 808 #ifdef LISP_FLOAT_TYPE | 808 #ifdef LISP_FLOAT_TYPE |
| 809 if (FLOATP (v1) || FLOATP (v2)) | 809 if (FLOATP (v1) || FLOATP (v2)) |
| 810 { | 810 { |
| 811 double f1, f2; | 811 double f1, f2; |
| 812 | 812 |
| 813 f1 = (FLOATP (v1) ? XFLOAT (v1)->data : XINT (v1)); | 813 f1 = (FLOATP (v1) ? XFLOAT_DATA (v1) : XINT (v1)); |
| 814 f2 = (FLOATP (v2) ? XFLOAT (v2)->data : XINT (v2)); | 814 f2 = (FLOATP (v2) ? XFLOAT_DATA (v2) : XINT (v2)); |
| 815 TOP = (f1 == f2 ? Qt : Qnil); | 815 TOP = (f1 == f2 ? Qt : Qnil); |
| 816 } | 816 } |
| 817 else | 817 else |
| 818 #endif | 818 #endif |
| 819 TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil); | 819 TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil); |
| 1095 break; | 1095 break; |
| 1096 | 1096 |
| 1097 case Bcar_safe: | 1097 case Bcar_safe: |
| 1098 v1 = TOP; | 1098 v1 = TOP; |
| 1099 if (CONSP (v1)) | 1099 if (CONSP (v1)) |
| 1100 TOP = XCONS (v1)->car; | 1100 TOP = XCAR (v1); |
| 1101 else | 1101 else |
| 1102 TOP = Qnil; | 1102 TOP = Qnil; |
| 1103 break; | 1103 break; |
| 1104 | 1104 |
| 1105 case Bcdr_safe: | 1105 case Bcdr_safe: |
| 1106 v1 = TOP; | 1106 v1 = TOP; |
| 1107 if (CONSP (v1)) | 1107 if (CONSP (v1)) |
| 1108 TOP = XCONS (v1)->cdr; | 1108 TOP = XCDR (v1); |
| 1109 else | 1109 else |
| 1110 TOP = Qnil; | 1110 TOP = Qnil; |
| 1111 break; | 1111 break; |
| 1112 | 1112 |
| 1113 case Bnconc: | 1113 case Bnconc: |
