comparison src/alloc.c @ 26372:f35140f031b4

Remove conditional compilation on USE_TEXT_PROPERTIES.

26371:9e9129128bef

}
#endif

/* Interval allocation.  */

#ifdef USE_TEXT_PROPERTIES
#define INTERVAL_BLOCK_SIZE \
  ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval))

struct interval_block
  {

       XUNMARK (* (Lisp_Object *) (&(i)->parent));		\
       (i) = balance_intervals (i);				\
     } 								\
}

#else  /* no interval use */

#define INIT_INTERVALS

#define UNMARK_BALANCE_INTERVALS(i)
#define MARK_INTERVAL_TREE(i)

#endif /* no interval use */

/* Floating point allocation.  */

#ifdef LISP_FLOAT_TYPE
/* Allocation of float cells, just like conses */

  bcopy (data, XSTRING (new)->data, length_byte);
  XSTRING (new)->data[length_byte] = 0;

  /* We must give strings in pure storage some kind of interval.  So we
     give them a null one.  */
#if defined (USE_TEXT_PROPERTIES)
  XSTRING (new)->intervals = NULL_INTERVAL;
#endif
  pureptr += size;
  return new;
}

Lisp_Object

		 make_number (total_free_floats)),
#else /* not LISP_FLOAT_TYPE */
		(make_number (0), make_number (0)),
#endif /* not LISP_FLOAT_TYPE */
		Fcons (Fcons
#ifdef USE_TEXT_PROPERTIES
		       (make_number (total_intervals),
			make_number (total_free_intervals)),
#else /* not USE_TEXT_PROPERTIES */
		       (make_number (0), make_number (0)),
#endif /* not USE_TEXT_PROPERTIES */
		       Qnil)))))));
}

#if 0
static void

    total_floats = num_used;
    total_free_floats = num_free;
  }
#endif /* LISP_FLOAT_TYPE */

#ifdef USE_TEXT_PROPERTIES
  /* Put all unmarked intervals on free list */
  {
    register struct interval_block *iblk;
    struct interval_block **iprev = &interval_block;
    register int lim = interval_block_index;

	  }
      }
    total_intervals = num_used;
    total_free_intervals = num_free;
  }
#endif /* USE_TEXT_PROPERTIES */

  /* Put all unmarked symbols on free list */
  {
    register struct symbol_block *sblk;
    struct symbol_block **sprev = &symbol_block;

		    XSETSTRING (*objptr, newaddr);
		}
	      /* Store the actual size in the size field.  */
	      newaddr->size = size;

#ifdef USE_TEXT_PROPERTIES
	      /* Now that the string has been relocated, rebalance its
                 interval tree, and update the tree's parent pointer. */
	      if (! NULL_INTERVAL_P (newaddr->intervals))
		{
		  UNMARK_BALANCE_INTERVALS (newaddr->intervals);
		  XSETSTRING (* (Lisp_Object *) &newaddr->intervals->parent,
			      newaddr);
		}
#endif /* USE_TEXT_PROPERTIES */
	    }
	  else if (size_byte < 0)
	    size_byte = size;

	  pos += STRING_FULLSIZE (size_byte);

26372:f35140f031b4

}
#endif

/* Interval allocation.  */

#define INTERVAL_BLOCK_SIZE \
  ((1020 - sizeof (struct interval_block *)) / sizeof (struct interval))

struct interval_block
  {

       XUNMARK (* (Lisp_Object *) (&(i)->parent));		\
       (i) = balance_intervals (i);				\
     } 								\
}


/* Floating point allocation.  */

#ifdef LISP_FLOAT_TYPE
/* Allocation of float cells, just like conses */

  bcopy (data, XSTRING (new)->data, length_byte);
  XSTRING (new)->data[length_byte] = 0;

  /* We must give strings in pure storage some kind of interval.  So we
     give them a null one.  */
  XSTRING (new)->intervals = NULL_INTERVAL;
  pureptr += size;
  return new;
}

Lisp_Object

		 make_number (total_free_floats)),
#else /* not LISP_FLOAT_TYPE */
		(make_number (0), make_number (0)),
#endif /* not LISP_FLOAT_TYPE */
		Fcons (Fcons
		       (make_number (total_intervals),
			make_number (total_free_intervals)),
		       Qnil)))))));
}

#if 0
static void

    total_floats = num_used;
    total_free_floats = num_free;
  }
#endif /* LISP_FLOAT_TYPE */

  /* Put all unmarked intervals on free list */
  {
    register struct interval_block *iblk;
    struct interval_block **iprev = &interval_block;
    register int lim = interval_block_index;

	  }
      }
    total_intervals = num_used;
    total_free_intervals = num_free;
  }

  /* Put all unmarked symbols on free list */
  {
    register struct symbol_block *sblk;
    struct symbol_block **sprev = &symbol_block;

		    XSETSTRING (*objptr, newaddr);
		}
	      /* Store the actual size in the size field.  */
	      newaddr->size = size;

	      /* Now that the string has been relocated, rebalance its
                 interval tree, and update the tree's parent pointer. */
	      if (! NULL_INTERVAL_P (newaddr->intervals))
		{
		  UNMARK_BALANCE_INTERVALS (newaddr->intervals);
		  XSETSTRING (* (Lisp_Object *) &newaddr->intervals->parent,
			      newaddr);
		}
	    }
	  else if (size_byte < 0)
	    size_byte = size;

	  pos += STRING_FULLSIZE (size_byte);