aboutsummaryrefslogtreecommitdiffstats
path: root/awkgram.y
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2017-10-21 21:04:09 +0300
committerArnold D. Robbins <arnold@skeeve.com>2017-10-21 21:04:09 +0300
commitdf1a290040df77fba975567050c4304e70d00737 (patch)
tree1aa42bfc8d332afe5a02d6b6bfa30d8560c4a4ed /awkgram.y
parentfcbfa70fc1b8d84f27ede1b95271fd489f02d27c (diff)
parent372e3bef424ad2cec3de5fbc4da30ddf88c9533e (diff)
downloadegawk-df1a290040df77fba975567050c4304e70d00737.tar.gz
egawk-df1a290040df77fba975567050c4304e70d00737.tar.bz2
egawk-df1a290040df77fba975567050c4304e70d00737.zip
Merge branch 'master' into feature/dev-5.0
Diffstat (limited to 'awkgram.y')
-rw-r--r--awkgram.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/awkgram.y b/awkgram.y
index 178c3077..cf1b7aa6 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -1589,7 +1589,8 @@ common_exp
// 1.5 "" # can't fold this if program mucks with CONVFMT.
// See test #12 in test/posix.awk.
- if ((n1->flags & (NUMBER|NUMINT)) != 0 || (n2->flags & (NUMBER|NUMINT)) != 0)
+ // Also can't fold if one or the other is translatable.
+ if ((n1->flags & (NUMBER|NUMINT|INTLSTR)) != 0 || (n2->flags & (NUMBER|NUMINT|INTLSTR)) != 0)
goto plain_concat;
n1 = force_string(n1);