[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog server/array.cpp
From: |
Michael Carlson |
Subject: |
[Gnash-commit] gnash ./ChangeLog server/array.cpp |
Date: |
Tue, 14 Feb 2006 07:09:10 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Michael Carlson <address@hidden> 06/02/14 07:09:10
Modified files:
. : ChangeLog
server : array.cpp
Log message:
Make tostring() and join() not output any enclosing parentheses as Rob
suggested in a previous e-mail, and handle empty array case much better - that
is, unsigned int(0 - 1) is not -1!
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/array.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.132 gnash/ChangeLog:1.133
--- gnash/ChangeLog:1.132 Mon Feb 13 17:48:28 2006
+++ gnash/ChangeLog Tue Feb 14 07:09:10 2006
@@ -1,3 +1,8 @@
+2006-02-14 Michael Carlson <address@hidden>
+
+ * server/array.cpp: Make tostring() and join() not output any
+ enclosing parentheses, and handle empty array case better
+
2006-02-13 Rob Savoye <address@hidden>
* libamf/amf.cpp: Default to not using log_msg().
@@ -19,7 +24,7 @@
'prototype' based inheritance. Implemented Function.call
-2006-02-09 Michael Carlson <address@hidden>
+2006-02-12 Michael Carlson <address@hidden>
* server/action.cpp: Fix silly '!' that breaks _global.isfinite
Index: gnash/server/array.cpp
diff -u gnash/server/array.cpp:1.10 gnash/server/array.cpp:1.11
--- gnash/server/array.cpp:1.10 Mon Feb 13 10:44:12 2006
+++ gnash/server/array.cpp Tue Feb 14 07:09:10 2006
@@ -207,24 +207,26 @@
{
as_array_object* array = (as_array_object*) (as_object*)
fn.this_ptr;
- unsigned int i;
- std::string temp = "(",separator = ",";
+ // TODO - confirm this is the right format!
+ // Reportedly, flash version 7 on linux, and Flash 8 on IE look
like
+ // "(1,2,3)" and "1,2,3" respectively - which should we mimic?
+ // Using no parentheses until confirmed for sure
+// std::string temp = "(";
+ std::string temp;
+ std::string separator = ",";
+ int i;
if (fn.nargs > 0)
separator = fn.arg(0).to_string();
- // TODO - confirm this is the right format!
- // Reportedly, flash version 7 on linux, and Flash 8 on IE look
like
- // "(1,2,3)" and "1,2,3" respectively - which should we mimic?
- // I've chosen the former for now, because the parentheses help
clarity
- for (i=0;i<array->elements.size() - 1;i++)
+ for (i=0;i<int(array->elements.size()) - 1;i++)
temp = temp + array->elements[i].to_string() +
separator;
// Add the last element without a trailing separator
if (array->elements.size() > 0)
temp = temp + array->elements[i].to_string();
- temp = temp + ")";
+// temp = temp + ")";
fn.result->set_string(temp.c_str());
}
@@ -234,21 +236,22 @@
{
as_array_object* array = (as_array_object*) (as_object*)
fn.this_ptr;
- unsigned int i;
- std::string temp = "(";
-
// TODO - confirm this is the right format!
// Reportedly, flash version 7 on linux, and Flash 8 on IE look
like
// "(1,2,3)" and "1,2,3" respectively - which should we mimic?
- // I've chosen the former for now, because the parentheses help
clarity
- for (i=0;i<array->elements.size() - 1;i++)
+ // Using no parentheses until confirmed for sure
+// std::string temp = "(";
+ std::string temp;
+ int i;
+
+ for (i=0;i<int(array->elements.size()) - 1;i++)
temp = temp + array->elements[i].to_string() + ',';
// Add the last element without a trailing comma
if (array->elements.size() > 0)
temp = temp + array->elements[i].to_string();
- temp = temp + ")";
+// temp = temp + ")";
fn.result->set_string(temp.c_str());
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog server/array.cpp,
Michael Carlson <=