diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-07-02 11:35:30 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 11:35:30 -0300 |
| commit | eade613dc7e83646490477dc188a0cfdf75fa67a (patch) | |
| tree | acb3dad40e6d109f1bb8bf8fbe0bd4ad76f0f277 | |
| parent | 48959f0590665e9c958cafc7786a764365f4feb2 (diff) | |
| parent | 38ed5d9c7d5b3ce03e7ac5141ef0115a605e75bf (diff) | |
Merge pull request #5522 from neikeq/pr-issue-5519
Prettier str() for arrays
| -rw-r--r-- | core/variant.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 81d10f379a..31321dc0f3 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1559,72 +1559,78 @@ Variant::operator String() const { case VECTOR2_ARRAY: { DVector<Vector2> vec = operator DVector<Vector2>(); - String str; + String str("["); for(int i=0;i<vec.size();i++) { if (i>0) str+=", "; str=str+Variant( vec[i] ); } + str += "]"; return str; } break; case VECTOR3_ARRAY: { DVector<Vector3> vec = operator DVector<Vector3>(); - String str; + String str("["); for(int i=0;i<vec.size();i++) { if (i>0) str+=", "; str=str+Variant( vec[i] ); } + str += "]"; return str; } break; case STRING_ARRAY: { DVector<String> vec = operator DVector<String>(); - String str; + String str("["); for(int i=0;i<vec.size();i++) { if (i>0) str+=", "; str=str+vec[i]; } + str += "]"; return str; } break; case INT_ARRAY: { DVector<int> vec = operator DVector<int>(); - String str; + String str("["); for(int i=0;i<vec.size();i++) { if (i>0) str+=", "; str=str+itos(vec[i]); } + str += "]"; return str; } break; case REAL_ARRAY: { DVector<real_t> vec = operator DVector<real_t>(); - String str; + String str("["); for(int i=0;i<vec.size();i++) { if (i>0) str+=", "; str=str+rtos(vec[i]); } + str += "]"; return str; } break; case ARRAY: { Array arr = operator Array(); - String str; + String str("["); for (int i=0; i<arr.size(); i++) { if (i) str+=", "; str += String(arr[i]); }; + str += "]"; return str; } break; |