comparison src/bytecode.c @ 944:6bebb86e63c2

Replaced NULL with N
author Joseph Arceneaux <jla@gnu.org>
date Thu, 06 Aug 1992 03:25:57 +0000
parents 1e2e41fd188b
children c1fc76b79275
comparison
equal deleted inserted replaced
943:e95ecc378efa 944:6bebb86e63c2
1 /* Execution of byte code produced by bytecomp.el. 1 /* Execution of byte code produced by bytecomp.el.
2 Copyright (C) 1985, 1986, 1987, 1988 Free Software Foundation, Inc. 2 Copyright (C) 1985, 1986, 1987, 1988, 1992 Free Software Foundation, Inc.
3 3
4 This file is part of GNU Emacs. 4 This file is part of GNU Emacs.
5 5
6 GNU Emacs is free software; you can redistribute it and/or modify 6 GNU Emacs is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 7 it under the terms of the GNU General Public License as published by
422 pc = XSTRING (string_saved)->data + op; 422 pc = XSTRING (string_saved)->data + op;
423 break; 423 break;
424 424
425 case Bgotoifnil: 425 case Bgotoifnil:
426 op = FETCH2; 426 op = FETCH2;
427 if (NULL (POP)) 427 if (NILP (POP))
428 { 428 {
429 QUIT; 429 QUIT;
430 pc = XSTRING (string_saved)->data + op; 430 pc = XSTRING (string_saved)->data + op;
431 } 431 }
432 break; 432 break;
433 433
434 case Bgotoifnonnil: 434 case Bgotoifnonnil:
435 op = FETCH2; 435 op = FETCH2;
436 if (!NULL (POP)) 436 if (!NILP (POP))
437 { 437 {
438 QUIT; 438 QUIT;
439 pc = XSTRING (string_saved)->data + op; 439 pc = XSTRING (string_saved)->data + op;
440 } 440 }
441 break; 441 break;
442 442
443 case Bgotoifnilelsepop: 443 case Bgotoifnilelsepop:
444 op = FETCH2; 444 op = FETCH2;
445 if (NULL (TOP)) 445 if (NILP (TOP))
446 { 446 {
447 QUIT; 447 QUIT;
448 pc = XSTRING (string_saved)->data + op; 448 pc = XSTRING (string_saved)->data + op;
449 } 449 }
450 else DISCARD(1); 450 else DISCARD(1);
451 break; 451 break;
452 452
453 case Bgotoifnonnilelsepop: 453 case Bgotoifnonnilelsepop:
454 op = FETCH2; 454 op = FETCH2;
455 if (!NULL (TOP)) 455 if (!NILP (TOP))
456 { 456 {
457 QUIT; 457 QUIT;
458 pc = XSTRING (string_saved)->data + op; 458 pc = XSTRING (string_saved)->data + op;
459 } 459 }
460 else DISCARD(1); 460 else DISCARD(1);
527 immediate_quit = 1; 527 immediate_quit = 1;
528 while (--op >= 0) 528 while (--op >= 0)
529 { 529 {
530 if (CONSP (v1)) 530 if (CONSP (v1))
531 v1 = XCONS (v1)->cdr; 531 v1 = XCONS (v1)->cdr;
532 else if (!NULL (v1)) 532 else if (!NILP (v1))
533 { 533 {
534 immediate_quit = 0; 534 immediate_quit = 0;
535 v1 = wrong_type_argument (Qlistp, v1); 535 v1 = wrong_type_argument (Qlistp, v1);
536 immediate_quit = 1; 536 immediate_quit = 1;
537 op++; 537 op++;
551 case Bstringp: 551 case Bstringp:
552 TOP = XTYPE (TOP) == Lisp_String ? Qt : Qnil; 552 TOP = XTYPE (TOP) == Lisp_String ? Qt : Qnil;
553 break; 553 break;
554 554
555 case Blistp: 555 case Blistp:
556 TOP = CONSP (TOP) || NULL (TOP) ? Qt : Qnil; 556 TOP = CONSP (TOP) || NILP (TOP) ? Qt : Qnil;
557 break; 557 break;
558 558
559 case Beq: 559 case Beq:
560 v1 = POP; 560 v1 = POP;
561 TOP = EQ (v1, TOP) ? Qt : Qnil; 561 TOP = EQ (v1, TOP) ? Qt : Qnil;
565 v1 = POP; 565 v1 = POP;
566 TOP = Fmemq (TOP, v1); 566 TOP = Fmemq (TOP, v1);
567 break; 567 break;
568 568
569 case Bnot: 569 case Bnot:
570 TOP = NULL (TOP) ? Qt : Qnil; 570 TOP = NILP (TOP) ? Qt : Qnil;
571 break; 571 break;
572 572
573 case Bcar: 573 case Bcar:
574 v1 = TOP; 574 v1 = TOP;
575 docar: 575 docar:
576 if (CONSP (v1)) TOP = XCONS (v1)->car; 576 if (CONSP (v1)) TOP = XCONS (v1)->car;
577 else if (NULL (v1)) TOP = Qnil; 577 else if (NILP (v1)) TOP = Qnil;
578 else Fcar (wrong_type_argument (Qlistp, v1)); 578 else Fcar (wrong_type_argument (Qlistp, v1));
579 break; 579 break;
580 580
581 case Bcdr: 581 case Bcdr:
582 v1 = TOP; 582 v1 = TOP;
583 if (CONSP (v1)) TOP = XCONS (v1)->cdr; 583 if (CONSP (v1)) TOP = XCONS (v1)->cdr;
584 else if (NULL (v1)) TOP = Qnil; 584 else if (NILP (v1)) TOP = Qnil;
585 else Fcdr (wrong_type_argument (Qlistp, v1)); 585 else Fcdr (wrong_type_argument (Qlistp, v1));
586 break; 586 break;
587 587
588 case Bcons: 588 case Bcons:
589 v1 = POP; 589 v1 = POP;