Merge branch 'blead' of ssh://perl5.git.perl.org/gitroot/perl into blead

[perl5.git] / form.h

diff --git a/form.h b/form.h
index ee055a5..114d6d4 100644 (file)
--- a/form.h
+++ b/form.h
@@ -1,39 +1,27 @@
-/* $Header: form.h,v 3.0 89/10/18 15:17:39 lwall Locked $
+/*    form.h
  *
- *    Copyright (c) 1989, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 2000, 2004 by Larry Wall and others
  *
- *    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  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
-
-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;
-    char f_type;
-    char f_flags;
-};
-
-#define FC_CHOP 1
-#define FC_NOBLANK 2
-#define FC_MORE 4
-#define FC_REPEAT 8
-
-#define Nullfcmd Null(FCMD*)
-
-EXT char *chopset INIT(" \n-");
+#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
+#define FF_0DECIMAL     16
+#define FF_LINESNGL     17