changed INDEX operator to handle multiple subscript arrays correctly

[unix-history] / usr / src / usr.bin / ex / ex_argv.h

diff --git a/usr/src/usr.bin/ex/ex_argv.h b/usr/src/usr.bin/ex/ex_argv.h
index 7ce9dba..d93fcd3 100644 (file)
--- a/usr/src/usr.bin/ex/ex_argv.h
+++ b/usr/src/usr.bin/ex/ex_argv.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 1979 Regents of the University of California */
+/* Copyright (c) 1981 Regents of the University of California */
+/* sccs id:    @(#)ex_argv.h   7.2     %G%  */

 /*
  * The current implementation of the argument list is poor,
  * using an argv even for internally done "next" commands.
 /*
  * The current implementation of the argument list is poor,
  * using an argv even for internally done "next" commands.


@@ -6,16 +7,16 @@
  * space.  The statically allocated glob structure could be replaced
  * by a dynamically allocated argument area space.
  */
  * space.  The statically allocated glob structure could be replaced
  * by a dynamically allocated argument area space.
  */

-char   **argv;
-char   **argv0;
-char   *args;
-char   *args0;
-short  argc;
-short  argc0;
-short  morargc;                /* Used with "More files to edit..." */
+var char       **argv;
+var char       **argv0;
+var char       *args;
+var char       *args0;
+var short      argc;
+var short      argc0;
+var short      morargc;                /* Used with "More files to edit..." */

 
 

-short  firstln;                /* From +lineno */
-char   *firstpat;              /* From +/pat   */
+var int        firstln;                /* From +lineno */
+var char       *firstpat;              /* From +/pat   */

 
 /* Yech... */
 struct glob {
 
 /* Yech... */
 struct glob {


@@ -23,4 +24,5 @@ struct        glob {
        short   argc0;                  /* Number of arguments in argv */
        char    *argv[NARGS + 1];       /* WHAT A WASTE! */
        char    argspac[NCARGS + sizeof (int)];
        short   argc0;                  /* Number of arguments in argv */
        char    *argv[NARGS + 1];       /* WHAT A WASTE! */
        char    argspac[NCARGS + sizeof (int)];

-} frob;
+};
+var struct     glob frob;