Changeset 3665

Timestamp:

04/02/05 21:02:46 (4 years ago)

Author:

miyoshi

Message:

* print.c (print_preprocess): Ditto.
(print_object): Ditto.

* alloc.c: Sync up with Emacs CVS HEAD. The codes related with
`Lisp_symbol' are merged.

* bytecode.c (Fbyte_code): Ditto.

* data.c (Fkeywordp): Ditto.
(Fmakunbound): Ditto.
(set_internal): Ditto.

* eval.c (Fdefvaralias): Ditto.
(specbind): Ditto.

* lisp.h (struct Lisp_Symbol): Ditto.

* lread.c (Fintern): Ditto.
(Funintern): Ditto.
(init_obarray): Ditto.

* regex.c (regex_compile): Temporarily invalidate the process of
whitespace.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/alloc.c (modified) (4 diffs)
• branches/2.2/src/bytecode.c (modified) (1 diff)
• branches/2.2/src/data.c (modified) (3 diffs)
• branches/2.2/src/eval.c (modified) (2 diffs)
• branches/2.2/src/lisp.h (modified) (1 diff)
• branches/2.2/src/lread.c (modified) (4 diffs)
• branches/2.2/src/print.c (modified) (5 diffs)
• branches/2.2/src/regex.c (modified) (2 diffs)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2005-04-02  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * print.c (print_preprocess): Ditto.
+        (print_object): Ditto.
+
+        * alloc.c: Sync up with Emacs CVS HEAD.  The codes related with
+        `Lisp_symbol' are merged.
+        
+        * bytecode.c (Fbyte_code): Ditto.
+
+        * data.c (Fkeywordp): Ditto.
+        (Fmakunbound): Ditto.
+        (set_internal): Ditto.
+
+        * eval.c (Fdefvaralias): Ditto.
+        (specbind): Ditto.
+
+        * lisp.h (struct Lisp_Symbol): Ditto.
+
+        * lread.c (Fintern): Ditto.
+        (Funintern): Ditto.
+        (init_obarray): Ditto.
+
+        * regex.c (regex_compile): Temporarily invalidate the process of
+        whitespace.
+
-2005-04-02  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/alloc.c

@@ -3159 +3159 @@
-  p = XSYMBOL (val);
-  p->xname = name;
-  p->obarray = Qnil;
-  p->plist = Qnil;
-  p->value = Qunbound;
@@ -6592 +6591 @@
-        pdump_add_object (ptr->function);
-        pdump_add_object (ptr->plist);
-        pdump_add_object (ptr->obarray);
-        pdump_add_object (ptr->xname);
-        if (ptr->next)
@@ -6886 +6884 @@
-      new.function = pdump_forward_object (ptr->function);
-      new.plist = pdump_forward_object (ptr->plist);
-      new.obarray = pdump_forward_object (ptr->obarray);
-      new.xname = pdump_forward_object (ptr->xname);
-      if (ptr->next)
@@ -7740 +7737 @@
-      PDUMP_RELOCATE (ptr->function, offset);
-      PDUMP_RELOCATE (ptr->plist, offset);
-      PDUMP_RELOCATE (ptr->obarray, offset);
-      PDUMP_RELOCATE (ptr->xname, offset);
-      if (ptr->next)

branches/2.2/src/bytecode.c

@@ -624 +624 @@
-                && !EQ (val, Qunbound)
-                && !XSYMBOL (sym)->indirect_variable
-
-
-
-
-
-
-
-
-
-
+
+
-              XSYMBOL (sym)->value = val;
-            else

branches/2.2/src/data.c

@@ -315 +315 @@
-  if (SYMBOLP (object)
-      && SREF (SYMBOL_NAME (object), 0) == ':'
-EQ (XSYMBOL (object)->obarray, initial_obarray
+SYMBOL_INTERNED_IN_INITIAL_OBARRAY_P (object
-    return Qt;
-  return Qnil;
@@ -637 +637 @@
-{
-  CHECK_SYMBOL (symbol);
-
-
-
+
-    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
-  Fset (symbol, Qunbound);
@@ -1205 +1203 @@
-
-  CHECK_SYMBOL (symbol);
-
-
-
-
+
+
+
-    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
-

branches/2.2/src/eval.c

@@ -745 +745 @@
-  CHECK_SYMBOL (aliased);
-
-#if 0
-  if (SYMBOL_CONSTANT_P (symbol))
-    error ("Cannot make a constant an alias");
-#endif
-
-  sym = XSYMBOL (symbol);
-  sym->indirect_variable = 1;
-  sym->value = aliased;
-#if 0
-  sym->constant = SYMBOL_CONSTANT_P (aliased);
-#endif
-  LOADHIST_ATTACH (symbol);
-  if (!NILP (docstring))
@@ -3055 +3051 @@
-     trivial value.  Make that as fast as we can.  */
-  valcontents = SYMBOL_VALUE (symbol);
-
-
-
-
-
-
+
-    {
-      specpdl_ptr->symbol = symbol;

branches/2.2/src/lisp.h

@@ -943 +943 @@
-  /* The symbol's property list.  */
-  Lisp_Object plist;
-
+
-  /* Next symbol in obarray bucket, if the symbol is interned.  */
-  struct Lisp_Symbol *next;

branches/2.2/src/lread.c

@@ -3146 +3146 @@
-    string = Fpurecopy (string);
-  sym = Fmake_symbol (string);
-
+
+
+
+
+
-
-  if ((SREF (string, 0) == ':')
-      && EQ (obarray, initial_obarray))
-
+
+
+
+
-
-  ptr = &XVECTOR (obarray)->contents[XINT (tem)];
@@ -3222 +3229 @@
-    return Qnil;
-
-
+
+
-  XSYMBOL (tem)->indirect_variable = 0;
-
@@ -3391 +3399 @@
-  staticpro (&initial_obarray);
-  /* Intern nil in the obarray */
-
+
+
+
-  /* These locals are to kludge around a pyramid compiler bug. */
-  hash = hash_string ("nil", 3);
@@ -3412 +3422 @@
-  XSYMBOL (Qnil)->plist = Qnil;
-  XSYMBOL (Qt)->value = Qt;
+  XSYMBOL (Qt)->constant = 1;
-
-  /* Qt is correct even if CANNOT_DUMP.  loadup.el will set to nil at end.  */

branches/2.2/src/print.c

@@ -1307 +1307 @@
-      || COMPILEDP (obj) || CHAR_TABLE_P (obj)
-      || (! NILP (Vprint_gensym)
-
+
+
-    {
-      /* In case print-circle is nil and print-gensym is t,
@@ -1345 +1346 @@
-             always print the gensym with a number.  This is a special for
-             the lisp function byte-compile-output-docform.  */
-
-
+
+
+
-            PRINT_NUMBER_STATUS (Vprint_number_table, print_number_index) = Qt;
-          print_number_index++;
@@ -1408 +1410 @@
-      || COMPILEDP (obj) || CHAR_TABLE_P (obj)
-      || (! NILP (Vprint_gensym)
-
+
+
-    {
-      if (NILP (Vprint_circle) && NILP (Vprint_gensym))
@@ -1633 +1636 @@
-          confusing = 0;
-
-NILP (XSYMBOL (obj)->obarray
+!SYMBOL_INTERNED_P (obj
-          {
-            PRINTCHAR ('#');
@@ -2251 +2254 @@
-  /* prin1_to_string_buffer initialized in init_buffer_once in buffer.c */
-  staticpro_nopdump (&Vprin1_to_string_buffer);
-
-  defsubr (&Sprin1);
-  defsubr (&Sprin1_to_string);

branches/2.2/src/regex.c

@@ -2524 +2524 @@
-          /* If this is the end of an included regexp,
-             pop back to the main regexp and try again.  */
+#if 0
-          if (in_subpattern)
-            {
@@ -2532 +2533 @@
-              continue;
-            }
+#endif
-          /* If this is the end of the main regexp, we are done.  */
-          break;