Mercurial > projects > ddmd

comparison dmd/CatExp.d @ 137:09c858522d55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Trass3r
date Mon, 13 Sep 2010 23:29:00 +0200
parents e8a741997ccf
children e3afd1303184
comparison
equal deleted inserted replaced
136:9d194c848e3a 137:09c858522d55
65 65
66 if ((tb1.ty == Tsarray || tb1.ty == Tarray) && 66 if ((tb1.ty == Tsarray || tb1.ty == Tarray) &&
67 e2.implicitConvTo(tb1next) >= MATCHconvert) 67 e2.implicitConvTo(tb1next) >= MATCHconvert)
68 { 68 {
69 e2 = e2.implicitCastTo(sc, tb1next); 69 e2 = e2.implicitCastTo(sc, tb1next);
70 type = tb1next.arrayOf();
70 if (tb2.ty == Tarray) 71 if (tb2.ty == Tarray)
71 { 72 {
72 // Make e2 into [e2] 73 // Make e2 into [e2]
73 e2 = new ArrayLiteralExp(e2.loc, e2); 74 e2 = new ArrayLiteralExp(e2.loc, e2);
74 e2.type = type; 75 e2.type = type;
77 } 78 }
78 else if ((tb2.ty == Tsarray || tb2.ty == Tarray) && 79 else if ((tb2.ty == Tsarray || tb2.ty == Tarray) &&
79 e1.implicitConvTo(tb2next) >= MATCHconvert) 80 e1.implicitConvTo(tb2next) >= MATCHconvert)
80 { 81 {
81 e1 = e1.implicitCastTo(sc, tb2next); 82 e1 = e1.implicitCastTo(sc, tb2next);
83 type = tb2next.arrayOf();
82 if (tb1.ty == Tarray) 84 if (tb1.ty == Tarray)
83 { 85 {
84 // Make e1 into [e1] 86 // Make e1 into [e1]
85 e1 = new ArrayLiteralExp(e1.loc, e1); 87 e1 = new ArrayLiteralExp(e1.loc, e1);
86 e1.type = type; 88 e1.type = type;