X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=form.h;h=ca2a0c8433efb4e07f7e915f8a2d7146a63195af;hb=e3acbfda4f677df31695d7b2b63b7e9e854a3514;hp=f8c978836bc31bc680112f671b6d987f42e1dd71;hpb=d9d8d8de9462d72f6b4520fc11dd84dbe2c8bf1d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/form.h b/form.h
index f8c9788..ca2a0c8 100644
--- a/form.h
+++ b/form.h
@@ -1,45 +1,26 @@
-/* $Header: form.h,v 3.0.1.1 90/10/15 17:26:57 lwall Locked $
+/*    form.h
  *
- *    Copyright (c) 1989, Larry Wall
+ *    Copyright (c) 1991-2000, 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:	form.h,v $
- * Revision 3.0.1.1  90/10/15  17:26:57  lwall
- * patch29: added @###.## fields to format
- * 
- * Revision 3.0  89/10/18  15:17:39  lwall
- * 3.0 baseline
- * 
  */
 
-#define F_NULL 0
-#define F_LEFT 1
-#define F_RIGHT 2
-#define F_CENTER 3
-#define F_LINES 4
-#define F_DECIMAL 5
+#define FF_END		0
+#define FF_LINEMARK	1
+#define FF_LITERAL	2
+#define FF_SKIP		3
+#define FF_FETCH	4
+#define FF_CHECKNL	5
+#define FF_CHECKCHOP	6
+#define FF_SPACE	7
+#define FF_HALFSPACE	8
+#define FF_ITEM		9
+#define FF_CHOP		10
+#define FF_LINEGLOB	11
+#define FF_DECIMAL	12
+#define FF_NEWLINE	13
+#define FF_BLANK	14
+#define FF_MORE		15
 
-struct formcmd {
-    struct formcmd *f_next;
-    ARG *f_expr;
-    STR *f_unparsed;
-    line_t f_line;
-    char *f_pre;
-    short f_presize;
-    short f_size;
-    short f_decimals;
-    char f_type;
-    char f_flags;
-};
-
-#define FC_CHOP 1
-#define FC_NOBLANK 2
-#define FC_MORE 4
-#define FC_REPEAT 8
-#define FC_DP 16
-
-#define Nullfcmd Null(FCMD*)
-
-EXT char *chopset INIT(" \n-");