aboutsummaryrefslogtreecommitdiff
path: root/src/c_tokenizer.cpp
diff options
context:
space:
mode:
authordimenus <ryan.saunderson88@gmail.com>2017-11-03 16:25:00 -0500
committerdimenus <ryan.saunderson88@gmail.com>2017-11-03 16:29:49 -0500
commit1ef6cb1b64e926a74db562401ebef3c673c3d7cf (patch)
treea3075ba6b2c5a48357271d4bd4f4eb98ba8f84ea /src/c_tokenizer.cpp
parent795703a39cfe0d59fcd9fff7a605a7efe9c5bdb2 (diff)
downloadzig-1ef6cb1b64e926a74db562401ebef3c673c3d7cf.tar.gz
zig-1ef6cb1b64e926a74db562401ebef3c673c3d7cf.zip
Add support for windows line endings with c macros
Diffstat (limited to 'src/c_tokenizer.cpp')
-rw-r--r--src/c_tokenizer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/c_tokenizer.cpp b/src/c_tokenizer.cpp
index 00977e0f32..044831f72e 100644
--- a/src/c_tokenizer.cpp
+++ b/src/c_tokenizer.cpp
@@ -91,6 +91,9 @@
IDENT_START: \
case DIGIT
+#define LINE_ENDING \
+ '\r': \
+ case '\n'
static void begin_token(CTokenize *ctok, CTokId id) {
assert(ctok->cur_tok == nullptr);
@@ -191,7 +194,7 @@ void tokenize_c_macro(CTokenize *ctok, const uint8_t *c) {
case '\\':
ctok->state = CTokStateBackslash;
break;
- case '\n':
+ case LINE_ENDING:
goto found_end_of_macro;
case IDENT_START:
ctok->state = CTokStateIdentifier;