History

Plan 9 from Bell Labs Fourth Edition 2007-12-01

David du Colombier committed 18 years ago

Commit 05dd1641 parent 23566e010 files · +84 −28Browse files

Showing the changes to sys/src/cmd/cpp/cpp.h (1 of 10 files). Show all

Unified · Split

sys/src/cmd/cpp/cpp.h+4−2
@@ -33,6 +33,8 @@ enum kwtype { KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KDEFINE, · 32 unmodified lines
3333 #define EOFC 0xFD /* sentinel for end of input file */
3434 #define XPWS 1 /* token flag: white space to assure token sep. */
3535
36+enum { Notinmacro, Inmacro };
37+
3638 typedef struct token {
3739 unsigned char type;
3840 unsigned char flag;
@@ -109,11 +111,11 @@ void dodefine(Tokenrow *); · 70 unmodified lines
109111 void doadefine(Tokenrow *, int);
110112 void doinclude(Tokenrow *);
111113 void doif(Tokenrow *, enum kwtype);
112−void expand(Tokenrow *, Nlist *);
114+void expand(Tokenrow *, Nlist *, int);
113115 void builtin(Tokenrow *, int);
114116 int gatherargs(Tokenrow *, Tokenrow **, int, int *);
115117 void substargs(Nlist *, Tokenrow *, Tokenrow **);
116−void expandrow(Tokenrow *, char *);
118+void expandrow(Tokenrow *, char *, int);
117119 void maketokenrow(int, Tokenrow *);
118120 Tokenrow *copytokenrow(Tokenrow *, Tokenrow *);
119121 Token *growtokenrow(Tokenrow *);