Mercurial > hg > xemacs-beta

comparison src/symbols.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 38fb9ae12edd
children b39c14581166
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
355 oblookup_last_bucket_number = hash; 355 oblookup_last_bucket_number = hash;
356 bucket = XVECTOR_DATA (obarray)[hash]; 356 bucket = XVECTOR_DATA (obarray)[hash];
357 if (ZEROP (bucket)) 357 if (ZEROP (bucket))
358 ; 358 ;
359 else if (!SYMBOLP (bucket)) 359 else if (!SYMBOLP (bucket))
360 error ("Bad data in guts of obarray"); /* Like CADR error message */ 360 signal_error (Qinvalid_state, "Bad data in guts of obarray", Qunbound); /* Like CADR error message */
361 else 361 else
362 for (tail = XSYMBOL (bucket); ;) 362 for (tail = XSYMBOL (bucket); ;)
363 { 363 {
364 if (string_length (tail->name) == size && 364 if (string_length (tail->name) == size &&
365 !memcmp (string_data (tail->name), ptr, size)) 365 !memcmp (string_data (tail->name), ptr, size))
573 (function_p ? XSYMBOL (sym)->function 573 (function_p ? XSYMBOL (sym)->function
574 : fetch_value_maybe_past_magic (sym, follow_past_lisp_magic)); 574 : fetch_value_maybe_past_magic (sym, follow_past_lisp_magic));
575 575
576 if (SYMBOL_VALUE_MAGIC_P (val) && 576 if (SYMBOL_VALUE_MAGIC_P (val) &&
577 XSYMBOL_VALUE_MAGIC_TYPE (val) == SYMVAL_CONST_SPECIFIER_FORWARD) 577 XSYMBOL_VALUE_MAGIC_TYPE (val) == SYMVAL_CONST_SPECIFIER_FORWARD)
578 signal_simple_error ("Use `set-specifier' to change a specifier's value", 578 invalid_change ("Use `set-specifier' to change a specifier's value",
579 sym); 579 sym);
580 580
581 if (symbol_is_constant (sym, val) 581 if (symbol_is_constant (sym, val)
582 || (SYMBOL_IS_KEYWORD (sym) && !EQ (newval, sym))) 582 || (SYMBOL_IS_KEYWORD (sym) && !EQ (newval, sym)))
583 signal_error (Qsetting_constant, 583 signal_error_1 (Qsetting_constant,
584 UNBOUNDP (newval) ? list1 (sym) : list2 (sym, newval)); 584 UNBOUNDP (newval) ? list1 (sym) : list2 (sym, newval));
585 } 585 }
586 586
587 /* Verify that it's ok to make SYM buffer-local. This rejects 587 /* Verify that it's ok to make SYM buffer-local. This rejects
588 constants and default-buffer-local variables. FOLLOW_PAST_LISP_MAGIC 588 constants and default-buffer-local variables. FOLLOW_PAST_LISP_MAGIC
589 specifies whether we delve into symbol-value-lisp-magic objects. 589 specifies whether we delve into symbol-value-lisp-magic objects.
612 } 612 }
613 613
614 return; 614 return;
615 615
616 not_ok: 616 not_ok:
617 signal_error (Qerror, 617 invalid_change ("Symbol may not be buffer-local", sym);
618 list2 (build_string ("Symbol may not be buffer-local"), sym));
619 } 618 }
620 619
621 DEFUN ("makunbound", Fmakunbound, 1, 1, 0, /* 620 DEFUN ("makunbound", Fmakunbound, 1, 1, 0, /*
622 Make SYMBOL's value be void. 621 Make SYMBOL's value be void.
623 */ 622 */
1755 case SYMVAL_BOOLEAN_FORWARD: 1754 case SYMVAL_BOOLEAN_FORWARD:
1756 case SYMVAL_OBJECT_FORWARD: 1755 case SYMVAL_OBJECT_FORWARD:
1757 case SYMVAL_DEFAULT_BUFFER_FORWARD: 1756 case SYMVAL_DEFAULT_BUFFER_FORWARD:
1758 case SYMVAL_DEFAULT_CONSOLE_FORWARD: 1757 case SYMVAL_DEFAULT_CONSOLE_FORWARD:
1759 if (UNBOUNDP (newval)) 1758 if (UNBOUNDP (newval))
1760 signal_error (Qerror, 1759 invalid_change ("Cannot makunbound", symbol);
1761 list2 (build_string ("Cannot makunbound"), symbol));
1762 break; 1760 break;
1763 1761
1764 /* case SYMVAL_UNBOUND_MARKER: break; */ 1762 /* case SYMVAL_UNBOUND_MARKER: break; */
1765 1763
1766 case SYMVAL_CURRENT_BUFFER_FORWARD: 1764 case SYMVAL_CURRENT_BUFFER_FORWARD:
2837 if (EQ (symbol, Qbound_predicate)) return MAGIC_HANDLER_BOUND_PREDICATE; 2835 if (EQ (symbol, Qbound_predicate)) return MAGIC_HANDLER_BOUND_PREDICATE;
2838 if (EQ (symbol, Qmake_unbound)) return MAGIC_HANDLER_MAKE_UNBOUND; 2836 if (EQ (symbol, Qmake_unbound)) return MAGIC_HANDLER_MAKE_UNBOUND;
2839 if (EQ (symbol, Qlocal_predicate)) return MAGIC_HANDLER_LOCAL_PREDICATE; 2837 if (EQ (symbol, Qlocal_predicate)) return MAGIC_HANDLER_LOCAL_PREDICATE;
2840 if (EQ (symbol, Qmake_local)) return MAGIC_HANDLER_MAKE_LOCAL; 2838 if (EQ (symbol, Qmake_local)) return MAGIC_HANDLER_MAKE_LOCAL;
2841 2839
2842 signal_simple_error ("Unrecognized symbol value handler type", symbol); 2840 invalid_constant ("Unrecognized symbol value handler type", symbol);
2843 abort (); 2841 abort ();
2844 return MAGIC_HANDLER_MAX; 2842 return MAGIC_HANDLER_MAX;
2845 } 2843 }
2846 2844
2847 static enum lisp_magic_handler 2845 static enum lisp_magic_handler
2872 || EQ (funsym, Qmake_local_variable)) 2870 || EQ (funsym, Qmake_local_variable))
2873 return MAGIC_HANDLER_MAKE_LOCAL; 2871 return MAGIC_HANDLER_MAKE_LOCAL;
2874 2872
2875 if (abort_if_not_found) 2873 if (abort_if_not_found)
2876 abort (); 2874 abort ();
2877 signal_simple_error ("Unrecognized symbol-value function", funsym); 2875 invalid_argument ("Unrecognized symbol-value function", funsym);
2878 return MAGIC_HANDLER_MAX; 2876 return MAGIC_HANDLER_MAX;
2879 } 2877 }
2880 2878
2881 static int 2879 static int
2882 would_be_magic_handled (Lisp_Object sym, Lisp_Object funsym) 2880 would_be_magic_handled (Lisp_Object sym, Lisp_Object funsym)
3107 return Qnil; 3105 return Qnil;
3108 } 3106 }
3109 3107
3110 if (SYMBOL_VALUE_MAGIC_P (valcontents) 3108 if (SYMBOL_VALUE_MAGIC_P (valcontents)
3111 && !UNBOUNDP (valcontents)) 3109 && !UNBOUNDP (valcontents))
3112 signal_simple_error ("Variable is magic and cannot be aliased", variable); 3110 invalid_change ("Variable is magic and cannot be aliased", variable);
3113 reject_constant_symbols (variable, Qunbound, 0, Qt); 3111 reject_constant_symbols (variable, Qunbound, 0, Qt);
3114 3112
3115 bfwd = alloc_lcrecord_type (struct symbol_value_varalias, 3113 bfwd = alloc_lcrecord_type (struct symbol_value_varalias,
3116 &lrecord_symbol_value_varalias); 3114 &lrecord_symbol_value_varalias);
3117 zero_lcrecord (&bfwd->magic); 3115 zero_lcrecord (&bfwd->magic);
3242 XSETSYMBOL_VALUE_MAGIC (Qunbound, tem); 3240 XSETSYMBOL_VALUE_MAGIC (Qunbound, tem);
3243 } 3241 }
3244 3242
3245 XSYMBOL (Qnil)->function = Qunbound; 3243 XSYMBOL (Qnil)->function = Qunbound;
3246 3244
3247 defsymbol (&Qt, "t"); 3245 DEFSYMBOL (Qt);
3248 XSYMBOL (Qt)->value = Qt; /* Veritas aeterna */ 3246 XSYMBOL (Qt)->value = Qt; /* Veritas aeterna */
3249 Vquit_flag = Qnil; 3247 Vquit_flag = Qnil;
3250 3248
3251 dump_add_root_object (&Qnil); 3249 dump_add_root_object (&Qnil);
3252 dump_add_root_object (&Qunbound); 3250 dump_add_root_object (&Qunbound);