diff options
Diffstat (limited to 'sys/cmd')
-rw-r--r-- | sys/cmd/cc/lex.c | 6 | ||||
-rw-r--r-- | sys/cmd/rules.mk | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/cmd/cc/lex.c b/sys/cmd/cc/lex.c index 97e19e4..1396358 100644 --- a/sys/cmd/cc/lex.c +++ b/sys/cmd/cc/lex.c @@ -32,7 +32,6 @@ Io* openio(Lexer *lx, byte *path) { string *it, *end; - Stream *f; intern(&path); @@ -441,7 +440,7 @@ Dispatch: else { r = v; b = utf8·runelen(r); - utf8·runetochar(lx->buf, &r); + utf8·runetobyte(lx->buf, &r); str·appendlen(&s, b, lx->buf); } } @@ -725,7 +724,7 @@ Dispatch: if (!utf8·isletter(r) && !utf8·isdigit(r) && r != 0xb7) { errorat(lx->pos, "invalid identifier character %d", r); } - s += utf8·runetochar(s, &r); + s += utf8·runetobyte(s, &r); } else if (!isalnum(b) && b != '_') break; else @@ -778,6 +777,7 @@ Return: Nospace: panicf("aborting compilation"); + exit(1); } #undef CASE4 diff --git a/sys/cmd/rules.mk b/sys/cmd/rules.mk index c648907..63a92df 100644 --- a/sys/cmd/rules.mk +++ b/sys/cmd/rules.mk @@ -11,7 +11,10 @@ include $(DIR)/rules.mk # DIR := $(d)/edo # include $(DIR)/rules.mk -DIR := $(d)/rc +# DIR := $(d)/rc +# include $(DIR)/rules.mk + +DIR := $(d)/term include $(DIR)/rules.mk include share/pop.mk |