aboutsummaryrefslogtreecommitdiff
path: root/src/parser.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-05-07 10:05:59 -0700
committerAndrew Kelley <superjoe30@gmail.com>2016-05-07 10:05:59 -0700
commit8c79438f6b76f1ad4b4941cdb46ae1e7aa12ce14 (patch)
tree266e5cc959092bfc6e0567916f37cd34fbd0f712 /src/parser.cpp
parentd5d5fd928c79df6e4060c7ad84068fcee28c2391 (diff)
downloadzig-8c79438f6b76f1ad4b4941cdb46ae1e7aa12ce14.tar.gz
zig-8c79438f6b76f1ad4b4941cdb46ae1e7aa12ce14.zip
better array concatenation semantics
closes #87
Diffstat (limited to 'src/parser.cpp')
-rw-r--r--src/parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/parser.cpp b/src/parser.cpp
index 2c25526ec6..5cba265ac0 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1480,7 +1480,7 @@ static BinOpType tok_to_add_op(Token *token) {
switch (token->id) {
case TokenIdPlus: return BinOpTypeAdd;
case TokenIdDash: return BinOpTypeSub;
- case TokenIdPlusPlus: return BinOpTypeStrCat;
+ case TokenIdPlusPlus: return BinOpTypeArrayCat;
default: return BinOpTypeInvalid;
}
}