Showing the changes to sys/src/cmd/cpp/cpp.h (1 of 10 files). Show all
Unified · Split
| @@ -33,6 +33,8 @@ enum kwtype { KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KDEFINE, · 32 unmodified lines | ||
| 33 | 33 | #define EOFC 0xFD /* sentinel for end of input file */ |
| 34 | 34 | #define XPWS 1 /* token flag: white space to assure token sep. */ |
| 35 | 35 | |
| 36 | +enum { Notinmacro, Inmacro }; | |
| 37 | + | |
| 36 | 38 | typedef struct token { |
| 37 | 39 | unsigned char type; |
| 38 | 40 | unsigned char flag; |
| @@ -109,11 +111,11 @@ void dodefine(Tokenrow *); · 70 unmodified lines | ||
| 109 | 111 | void doadefine(Tokenrow *, int); |
| 110 | 112 | void doinclude(Tokenrow *); |
| 111 | 113 | void doif(Tokenrow *, enum kwtype); |
| 112 | −void expand(Tokenrow *, Nlist *); | |
| 114 | +void expand(Tokenrow *, Nlist *, int); | |
| 113 | 115 | void builtin(Tokenrow *, int); |
| 114 | 116 | int gatherargs(Tokenrow *, Tokenrow **, int, int *); |
| 115 | 117 | void substargs(Nlist *, Tokenrow *, Tokenrow **); |
| 116 | −void expandrow(Tokenrow *, char *); | |
| 118 | +void expandrow(Tokenrow *, char *, int); | |
| 117 | 119 | void maketokenrow(int, Tokenrow *); |
| 118 | 120 | Tokenrow *copytokenrow(Tokenrow *, Tokenrow *); |
| 119 | 121 | Token *growtokenrow(Tokenrow *); |