[Gnash-commit] /srv/bzr/gnash/trunk r9549: Complete implementation of string methods with SWF5 to upper/lower.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9549
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2008-07-31 10:24:14 +0200
message:
  Complete implementation of string methods with SWF5 to upper/lower.
  Improve String.toUpper and .toLower. Both need more work.
removed:
  gui/NOTES
modified:
  libcore/asobj/String_as.cpp
  testsuite/actionscript.all/ASnative.as
  testsuite/swfdec/PASSING
    ------------------------------------------------------------
    revno: 9545.1.7
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-07-30 21:30:18 +0200
    message:
      Remove ancient file.
    removed:
      gui/NOTES
    ------------------------------------------------------------
    revno: 9545.1.8
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-07-30 22:04:00 +0200
    message:
      Implement old toUpper / to Lower.
    modified:
      libcore/asobj/String_as.cpp
    ------------------------------------------------------------
    revno: 9545.1.9
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-07-30 22:04:51 +0200
    message:
      Merge in from trunk.
    modified:
      testsuite/swfdec/PASSING
    ------------------------------------------------------------
    revno: 9545.1.10
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2008-07-31 10:10:35 +0200
    message:
      Allow String.toUpper and .toLower to convert the case of extended
      characters when the user's locale isn't the POSIX / classic locale.
      It's hardly ideal - the pp seems not to depend on this - but there's
      no way of telling which locales are available.
    modified:
      libcore/asobj/String_as.cpp
    ------------------------------------------------------------
    revno: 9545.1.11
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2008-07-31 10:13:09 +0200
    message:
      Update passes in ASnative.as, disable the toString call counts until they
      stop passing by accident.
    modified:
      testsuite/actionscript.all/ASnative.as
    ------------------------------------------------------------
    revno: 9545.1.12
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2008-07-31 10:15:13 +0200
    message:
      old upper/lower tests pass for SWF6+
    modified:
      testsuite/swfdec/PASSING

=== removed file 'gui/NOTES'
--- a/gui/NOTES 2006-05-03 23:18:37 +0000
+++ b/gui/NOTES 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#include <FL/Fl.H>
-#include <FL/fl_ask.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Menu.H>
-#include <stdio.h>
-
-void handle_menu(Fl_Widget *w, void *v) {
-    if(!w || !v) return;
-    switch((int)v) {
-        case 1: fl_choice("Thing 1 happened", "OK", NULL, NULL); break;
-        case 2: fl_choice("Thing 2 happened", "OK", NULL, NULL); break;
-        case 3: fl_choice("Thing 3 happened", "OK", NULL, NULL); break;
-    }
-}
-
-void push_cb(Fl_Widget *w, void*) {
-    Fl_Menu_Item rclick_menu[] = {
-        { "Do Thing 1",  0, handle_menu, (void*)1 },
-        { "Do Thing 2",  0, handle_menu, (void*)2 },
-        { "Do Thing 3",  0, handle_menu, (void*)3 },
-        { 0 }
-    };
-    const Fl_Menu_Item *m = rclick_menu->popup(Fl::event_x(), Fl::event_y(), 
0, 0, 0);
-    if ( m ) m->do_callback(w, m->user_data());
-    return;
-}
-
-int main() {
-    Fl_Window win(140,45,"Test");
-    Fl_Button butt(10,10,120,25,"Push For Menu");
-    butt.callback(push_cb);
-    win.show();
-    return(Fl::run());
-}
-

=== modified file 'libcore/asobj/String_as.cpp'
--- a/libcore/asobj/String_as.cpp       2008-07-23 10:35:04 +0000
+++ b/libcore/asobj/String_as.cpp       2008-07-31 08:10:35 +0000
@@ -37,6 +37,7 @@
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <algorithm>
+#include <locale>
 
 #define ENSURE_FN_ARGS(min, max, rv)                                    \
     if (fn.nargs < min) {                                               \
@@ -70,6 +71,8 @@
 static as_value string_to_upper_case(const fn_call& fn);
 static as_value string_to_lower_case(const fn_call& fn);
 static as_value string_to_string(const fn_call& fn);
+static as_value string_oldToLower(const fn_call& fn);
+static as_value string_oldToUpper(const fn_call& fn);
 static as_value string_ctor(const fn_call& fn);
 
 static void
@@ -88,12 +91,14 @@
        o.init_member("toString", vm.getNative(251, 2));
 
        // ASnative(251, 3) - [String.prototype] toUpperCase
-       // TODO: register as ASnative(102, 0) for SWF5 ?
+       // ASnative(102, 0) - SWF5 to upper.
+       vm.registerNative(string_oldToUpper, 102, 0);
        vm.registerNative(string_to_upper_case, 251, 3);
        o.init_member("toUpperCase", vm.getNative(251, 3));
 
        // ASnative(251, 4) - [String.prototype] toLowerCase
-       // TODO: register as ASnative(102, 1) for SWF5 ?
+       // ASnative(102, 1) - SWF5 to lower.
+       vm.registerNative(string_oldToLower, 102, 1);
        vm.registerNative(string_to_lower_case, 251, 4);
        o.init_member("toLowerCase", vm.getNative(251, 4));
 
@@ -671,15 +676,20 @@
 {
     boost::intrusive_ptr<as_object> obj = ensureType<as_object>(fn.this_ptr);
     as_value val(fn.this_ptr);
-    
-    // Copy the string
-    std::string str = val.to_string();
 
     VM& vm = obj->getVM();
-
-    boost::to_upper(str, vm.getLocale());
-
-    return as_value(str);
+    const int version = vm.getSWFVersion();
+
+    std::wstring wstr = utf8::decodeCanonicalString(val.to_string(), version);
+
+    // If this is the C locale, the conversion will be wrong.
+    // Most other locales are correct. FIXME: get this to
+    // work regardless of user's current settings.
+    std::locale currentLocale("");
+    boost::to_upper(wstr, currentLocale);
+
+    return as_value(utf8::encodeCanonicalString(wstr, version));
+
 }
 
 static as_value
@@ -688,20 +698,50 @@
     boost::intrusive_ptr<as_object> obj = ensureType<as_object>(fn.this_ptr);
     as_value val(fn.this_ptr);
     
-    // Copy the string.
-    std::string str = val.to_string();
-
     VM& vm = obj->getVM();
-
-    boost::to_lower(str, vm.getLocale());
-
-    return as_value(str);
-}
+    const int version = vm.getSWFVersion();
+
+    std::wstring wstr = utf8::decodeCanonicalString(val.to_string(), version);
+
+    // If this the C locale, the conversion will be wrong.
+    // Most other locales are correct.
+    std::locale currentLocale("");
+    boost::to_lower(wstr, currentLocale);
+
+    return as_value(utf8::encodeCanonicalString(wstr, version));
+}
+
+static as_value
+string_oldToLower(const fn_call& fn)
+{
+    boost::intrusive_ptr<as_object> obj = ensureType<as_object>(fn.this_ptr);
+    as_value val(fn.this_ptr);
+
+    // This should use the C locale; extended characters are
+    // left alone. FIXME: SWF5 should garble the output.
+    std::string str = boost::to_lower_copy(val.to_string());
+    return as_value(str);
+}
+
+
+static as_value
+string_oldToUpper(const fn_call& fn)
+{
+    boost::intrusive_ptr<as_object> obj = ensureType<as_object>(fn.this_ptr);
+    as_value val(fn.this_ptr);
+
+    // This should use the C locale; extended characters are
+    // left alone. FIXME: SWF5 should garble the output.
+    std::string str = boost::to_upper_copy(val.to_string());
+    return as_value(str);
+}
+
 
 static as_value
 string_to_string(const fn_call& fn)
 {
-    boost::intrusive_ptr<string_as_object> obj = 
ensureType<string_as_object>(fn.this_ptr);
+    boost::intrusive_ptr<string_as_object> obj 
+          = ensureType<string_as_object>(fn.this_ptr);
     return as_value(obj->str());
 }
 

=== modified file 'testsuite/actionscript.all/ASnative.as'
--- a/testsuite/actionscript.all/ASnative.as    2008-07-23 10:35:04 +0000
+++ b/testsuite/actionscript.all/ASnative.as    2008-07-31 08:13:09 +0000
@@ -190,7 +190,7 @@
 a = ASnative(251, 3); // String.toUpperCase
 check_equals(a("Hello World"), "_LEVEL0");
 a = ASnative(102, 0); // SWF5 to upper
-xcheck_equals(a("Hello World"), "_LEVEL0");
+check_equals(a("Hello World"), "_LEVEL0");
 
 
 // SWF5 has problems with UTF-8, tested in String.as.
@@ -200,26 +200,27 @@
 
 #if OUTPUT_VERSION > 5
 func.a = ASnative(251, 3); // String.toUpperCase
-xcheck_equals(func.a(), "GNASH MUST WORK! ÖÜÄÄ€€");
+check_equals(func.a(), "GNASH MUST WORK! ÖÜÄÄ€€");
 
 func.a = ASnative(251, 4); // String.toLowerCase
-xcheck_equals(func.a(), "gnash must work! öüä䀀");
+check_equals(func.a(), "gnash must work! öüä䀀");
 
 // Check calls to toString.
-xcheck_equals (countTS, 2);
+// This is called twice as often as it should be.
+//xcheck_equals (countTS, 2);
 #endif
 
 func.a = ASnative(102, 0); // SWF5 to upper
-xcheck_equals(func.a(), "GNASH MUST WORK! öÜäÄ€€");
+check_equals(func.a(), "GNASH MUST WORK! öÜäÄ€€");
 
 func.a = ASnative(102, 1); // SWF5 to lower
-xcheck_equals(func.a(), "gnash must work! öÜäÄ€€");
+check_equals(func.a(), "gnash must work! öÜäÄ€€");
 
 // Check calls to toString.
 #if OUTPUT_VERSION > 5
-check_equals (countTS, 4);
+//check_equals (countTS, 4);
 #else
-xcheck_equals (countTS, 2);
+//xcheck_equals (countTS, 2);
 #endif
 
 // Stage
@@ -251,15 +252,15 @@
 st = ASnative(666, 9);
 
 #if OUTPUT_VERSION > 5
-check_equals (countTS, 4);
+//check_equals (countTS, 4);
 #else
-xcheck_equals (countTS, 2);
+//xcheck_equals (countTS, 2);
 #endif
 
 xcheck_equals (countVO, 25);
 
 #if OUTPUT_VERSION > 5
-check_totals(79);
-#else
 check_totals(76);
+#else
+check_totals(74);
 #endif

=== modified file 'testsuite/swfdec/PASSING'
--- a/testsuite/swfdec/PASSING  2008-07-30 18:01:25 +0000
+++ b/testsuite/swfdec/PASSING  2008-07-31 08:15:13 +0000
@@ -957,6 +957,9 @@
 string-object-tostring-6.swf:f4970a48bfb3c5d5315699263c2a15a1
 string-object-tostring-7.swf:060a8f7ba61ae1501bdcb060cd321313
 string-object-tostring-8.swf:7741a0c0d26aef26bd46749457b0357a
+string-old-upperlowercase-6.swf:f5ec15f961d343a749d0de3ede8bdd28
+string-old-upperlowercase-7.swf:a92cc1a2e55282baac6c88ddda76231d
+string-old-upperlowercase-8.swf:289295c86c0ddd89fb32e450da1b7e1d
 string-properties-5.swf:39cc1143e531659d37072534a3d3455e
 string-properties-6.swf:6e04c332f503311867082ab55f22b16b
 string-properties-7.swf:bf61a4b0a4cc67c8df63203407ac243c