perl 4.0 patch 14: patch #11, continued

[p5sagit/p5-mst-13.2.git] / str.h

diff --git a/str.h b/str.h
index cdc3d58..15c2c68 100644 (file)
--- a/str.h
+++ b/str.h
@@ -1,19 +1,19 @@
-/* $Header: str.h,v 3.0.1.2 90/08/09 05:23:24 lwall Locked $
+/* $RCSfile: str.h,v $$Revision: 4.0.1.2 $$Date: 91/06/07 11:58:33 $
  *
- *    Copyright (c) 1989, Larry Wall
+ *    Copyright (c) 1991, Larry Wall
  *
- *    You may distribute under the terms of the GNU General Public License
- *    as specified in the README file that comes with the perl 3.0 kit.
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
  *
  * $Log:       str.h,v $
- * Revision 3.0.1.2  90/08/09  05:23:24  lwall
- * patch19: various MSDOS and OS/2 patches folded in
+ * Revision 4.0.1.2  91/06/07  11:58:33  lwall
+ * patch4: new copyright notice
  * 
- * Revision 3.0.1.1  89/10/26  23:24:42  lwall
- * patch1: rearranged some structures to align doubles better on Gould
+ * Revision 4.0.1.1  91/04/12  09:16:12  lwall
+ * patch1: you may now use "die" and "caller" in a signal handler
  * 
- * Revision 3.0  89/10/18  15:23:49  lwall
- * 3.0 baseline
+ * Revision 4.0  91/03/20  01:40:04  lwall
+ * 4.0 baseline.
  * 
  */
 
@@ -27,6 +27,7 @@ struct string {
        ARG     *str_args;      /* list of args for interpreted string */
        HASH    *str_hash;      /* string represents an assoc array (stab?) */
        ARRAY   *str_array;     /* string represents an array */
+       CMD     *str_cmd;       /* command for this source line */
     } str_u;
     STRLEN     str_cur;        /* length of str_ptr as a C string */
     STR                *str_magic;     /* while free, link to next free str */
@@ -51,6 +52,7 @@ struct stab { /* should be identical, except for str_ptr */
        ARG     *str_args;      /* list of args for interpreted string */
        HASH    *str_hash;      /* string represents an assoc array (stab?) */
        ARRAY   *str_array;     /* string represents an array */
+       CMD     *str_cmd;       /* command for this source line */
     } str_u;
     STRLEN     str_cur;        /* length of str_ptr as a C string */
     STR                *str_magic;     /* while free, link to next free str */
@@ -81,6 +83,7 @@ struct lstring {
 #define SP_INTRP       16      /* string was compiled for interping */
 #define SP_TAIL                32      /* fbm string is tail anchored: /foo$/  */
 #define SP_MULTI       64      /* symbol table entry probably isn't a typo */
+#define SP_TEMP                128     /* string slated to die, so can be plundered */
 
 #define Nullstr Null(STR*)
 
@@ -94,6 +97,8 @@ struct lstring {
 #define SS_SSTRP       6       /* STR* on save stack */
 #define SS_SHPTR       7       /* HASH* on save stack */
 #define SS_SNSTAB      8       /* non-stab on save stack */
+#define SS_SCSV                9       /* callsave structure on save stack */
+#define SS_SAPTR       10      /* ARRAY* on save stack */
 #define SS_HASH                253     /* carrying an hash */
 #define SS_ARY         254     /* carrying an array */
 #define SS_FREE                255     /* in free list */
@@ -121,8 +126,8 @@ EXT int tmps_base INIT(-1);
 
 char *str_2ptr();
 double str_2num();
-STR *str_static();
-STR *str_2static();
+STR *str_mortal();
+STR *str_2mortal();
 STR *str_make();
 STR *str_nmake();
 STR *str_smake();