comparison src/bytecode.c @ 5473:ac37a5f7e5be

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 17 Mar 2011 23:42:59 +0100
parents 8d29f1c4bb98 d967d96ca043
children 58b38d5b32d0
comparison
equal deleted inserted replaced
5472:e79980ee5efe 5473:ac37a5f7e5be
1688 /* pop binding of standard-output */ 1688 /* pop binding of standard-output */
1689 unbind_to (specpdl_depth() - 1); 1689 unbind_to (specpdl_depth() - 1);
1690 break; 1690 break;
1691 } 1691 }
1692 1692
1693 #ifdef SUPPORT_CONFOUNDING_FUNCTIONS
1694
1693 case Bold_eq: 1695 case Bold_eq:
1694 { 1696 {
1695 Lisp_Object arg = POP; 1697 Lisp_Object arg = POP;
1696 TOP_LVALUE = HACKEQ_UNSAFE (TOP, arg) ? Qt : Qnil; 1698 TOP_LVALUE = HACKEQ_UNSAFE (TOP, arg) ? Qt : Qnil;
1697 break; 1699 break;
1722 { 1724 {
1723 Lisp_Object arg = POP; 1725 Lisp_Object arg = POP;
1724 TOP_LVALUE = Fold_assq (TOP, arg); 1726 TOP_LVALUE = Fold_assq (TOP, arg);
1725 break; 1727 break;
1726 } 1728 }
1729
1730 #endif
1727 1731
1728 case Bbind_multiple_value_limits: 1732 case Bbind_multiple_value_limits:
1729 { 1733 {
1730 Lisp_Object upper = POP, first = TOP, speccount; 1734 Lisp_Object upper = POP, first = TOP, speccount;
1731 1735
1957 val = XVECTOR_DATA (constants) [arg]; 1961 val = XVECTOR_DATA (constants) [arg];
1958 if (!SYMBOLP (val)) 1962 if (!SYMBOLP (val))
1959 wtaerror ("attempt to set non-symbol", val); 1963 wtaerror ("attempt to set non-symbol", val);
1960 if (EQ (val, Qnil) || EQ (val, Qt)) 1964 if (EQ (val, Qnil) || EQ (val, Qt))
1961 signal_error (Qsetting_constant, 0, val); 1965 signal_error (Qsetting_constant, 0, val);
1966 #ifdef NEED_TO_HANDLE_21_4_CODE
1962 /* Ignore assignments to keywords by converting to Bdiscard. 1967 /* Ignore assignments to keywords by converting to Bdiscard.
1963 For backward compatibility only - we'd like to make this an error. */ 1968 For backward compatibility only - we'd like to make this an
1969 error. */
1964 if (SYMBOL_IS_KEYWORD (val)) 1970 if (SYMBOL_IS_KEYWORD (val))
1965 REWRITE_OPCODE (Bdiscard); 1971 REWRITE_OPCODE (Bdiscard);
1966 else 1972 else
1973 #endif
1967 WRITE_NARGS (Bvarset); 1974 WRITE_NARGS (Bvarset);
1968 break; 1975 break;
1969 1976
1970 case Bvarbind+7: READ_OPERAND_2; goto do_varbind; 1977 case Bvarbind+7: READ_OPERAND_2; goto do_varbind;
1971 case Bvarbind+6: READ_OPERAND_1; goto do_varbind; 1978 case Bvarbind+6: READ_OPERAND_1; goto do_varbind;