[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10921: Fix 63 failures and some cra
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10921: Fix 63 failures and some crashes after asobj reorganization. |
|
Date: |
Tue, 26 May 2009 09:59:03 +0200 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 10921
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-05-26 09:59:03 +0200
message:
Fix 63 failures and some crashes after asobj reorganization.
Add test for flash package enumeration to make sure it doesn't break again.
Drop flash/fl directory, as no such package exists.
removed:
libcore/asobj/flash/fl/
libcore/asobj/flash/fl/fl_pkg.cpp
libcore/asobj/flash/fl/fl_pkg.h
libcore/asobj/flash/fl/flclasses.h
added:
testsuite/actionscript.all/flash.as
renamed:
libcore/asobj/flash/Object.cpp => libcore/asobj/Object.cpp
libcore/asobj/flash/Object.h => libcore/asobj/Object.h
modified:
libcore/asobj/Makefile.am
libcore/asobj/flash/display/display_pkg.cpp
libcore/asobj/flash/external/external_pkg.cpp
libcore/asobj/flash/filters/filters_pkg.cpp
libcore/asobj/flash/flash_pkg.cpp
libcore/asobj/flash/flashclasses.h
libcore/asobj/flash/geom/geom_pkg.cpp
libcore/asobj/flash/net/net_pkg.cpp
libcore/asobj/flash/sampler/sampler.am
libcore/asobj/flash/sampler/sampler_pkg.cpp
libcore/asobj/flash/sampler/sampler_pkg.h
libcore/asobj/flash/text/text_pkg.cpp
testsuite/actionscript.all/Makefile.am
testsuite/as3/Makefile.am
------------------------------------------------------------
revno: 10920.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-05-26 09:32:04 +0200
message:
Move Object back to where it should be.
renamed:
libcore/asobj/flash/Object.cpp => libcore/asobj/Object.cpp
libcore/asobj/flash/Object.h => libcore/asobj/Object.h
modified:
libcore/asobj/Makefile.am
testsuite/as3/Makefile.am
------------------------------------------------------------
revno: 10920.2.1
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 08:41:31 +0200
message:
Restore correct prop flags of flash package, fixing some of the testsuite
failures.
Restore correct prop flags of flash package members so that haxe SWFs will
work again.
modified:
libcore/asobj/flash/display/display_pkg.cpp
libcore/asobj/flash/external/external_pkg.cpp
libcore/asobj/flash/filters/filters_pkg.cpp
libcore/asobj/flash/flash_pkg.cpp
libcore/asobj/flash/geom/geom_pkg.cpp
libcore/asobj/flash/net/net_pkg.cpp
libcore/asobj/flash/text/text_pkg.cpp
------------------------------------------------------------
revno: 10920.2.2
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 08:45:45 +0200
message:
Fix typo, fixing some crashes in testsuite.
modified:
libcore/asobj/flash/sampler/sampler.am
libcore/asobj/flash/sampler/sampler_pkg.cpp
libcore/asobj/flash/sampler/sampler_pkg.h
------------------------------------------------------------
revno: 10920.2.3
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 09:01:32 +0200
message:
Correct more typos so it builds.
modified:
libcore/asobj/flash/flashclasses.h
libcore/asobj/flash/sampler/sampler_pkg.cpp
------------------------------------------------------------
revno: 10920.2.4
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 09:01:58 +0200
message:
Test flash package.
added:
testsuite/actionscript.all/flash.as
modified:
testsuite/actionscript.all/Makefile.am
------------------------------------------------------------
revno: 10911.1.5
committer: Benjamin Wolsey <address@hidden>
branch nick: test
timestamp: Tue 2009-05-26 09:01:03 +0200
message:
Add test for flash package enumeration.
added:
testsuite/actionscript.all/flash.as
modified:
testsuite/actionscript.all/Makefile.am
------------------------------------------------------------
revno: 10920.2.5
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 09:08:10 +0200
message:
samplerclasses.h is correct.
modified:
libcore/asobj/flash/sampler/sampler_pkg.cpp
------------------------------------------------------------
revno: 10920.2.6
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 09:22:26 +0200
message:
There are no sampler classes yet, so a do-while loop crashes. Replace with
while (why not do all of them like this?).
Initialize flash packages in correct order for enumeration.
modified:
libcore/asobj/flash/flashclasses.h
libcore/asobj/flash/sampler/sampler_pkg.cpp
------------------------------------------------------------
revno: 10920.2.7
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-05-26 09:30:12 +0200
message:
Remove fl directory.
removed:
libcore/asobj/flash/fl/
libcore/asobj/flash/fl/fl_pkg.cpp
libcore/asobj/flash/fl/fl_pkg.h
libcore/asobj/flash/fl/flclasses.h
=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2009-05-25 18:28:53 +0000
+++ b/libcore/asobj/Makefile.am 2009-05-26 07:32:04 +0000
@@ -87,7 +87,8 @@
XML_as.cpp \
XMLNode_as.cpp \
XMLSocket_as.cpp \
- LoadableObject.cpp
+ LoadableObject.cpp \
+ Object.cpp
noinst_HEADERS = \
AsBroadcaster.h \
@@ -124,10 +125,8 @@
XML_as.h \
XMLSocket_as.h \
XMLNode_as.h \
- LoadableObject.h
-
-libgnashasobjs_la_SOURCES += $(srcdir)/flash/Object.cpp
-noinst_HEADERS += $(srcdir)/flash/Object.h
+ LoadableObject.h \
+ Object.h
EXTENSIONS_API = \
Array_as.h \
=== renamed file 'libcore/asobj/flash/Object.cpp' => 'libcore/asobj/Object.cpp'
=== renamed file 'libcore/asobj/flash/Object.h' => 'libcore/asobj/Object.h'
=== modified file 'libcore/asobj/flash/display/display_pkg.cpp'
--- a/libcore/asobj/flash/display/display_pkg.cpp 2009-05-24 22:25:59
+0000
+++ b/libcore/asobj/flash/display/display_pkg.cpp 2009-05-26 06:41:31
+0000
@@ -90,7 +90,11 @@
flash_display_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("display"),
get_flash_display_package);
+
+ // TODO: this may not be correct, but it should be enumerable.
+ const int flags = 0;
+ where.init_destructive_property(st.find("display"),
+ get_flash_display_package, flags);
}
=== modified file 'libcore/asobj/flash/external/external_pkg.cpp'
--- a/libcore/asobj/flash/external/external_pkg.cpp 2009-05-25 02:00:57
+0000
+++ b/libcore/asobj/flash/external/external_pkg.cpp 2009-05-26 06:41:31
+0000
@@ -50,7 +50,11 @@
flash_external_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("external"),
get_flash_external_package);
+
+ // TODO: this may not be correct, but it should be enumerable.
+ const int flags = 0;
+ where.init_destructive_property(st.find("external"),
+ get_flash_external_package, flags);
}
=== modified file 'libcore/asobj/flash/filters/filters_pkg.cpp'
--- a/libcore/asobj/flash/filters/filters_pkg.cpp 2009-05-25 02:00:57
+0000
+++ b/libcore/asobj/flash/filters/filters_pkg.cpp 2009-05-26 06:41:31
+0000
@@ -61,7 +61,11 @@
flash_filters_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("filters"),
get_flash_filters_package);
+
+ // TODO: this may not be correct, but it should be enumerable.
+ const int flags = 0;
+ where.init_destructive_property(st.find("filters"),
+ get_flash_filters_package, flags);
}
=== removed directory 'libcore/asobj/flash/fl'
=== removed file 'libcore/asobj/flash/fl/fl_pkg.cpp'
--- a/libcore/asobj/flash/fl/fl_pkg.cpp 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/fl/fl_pkg.cpp 1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-// fl_pkg.cpp: ActionScript top level "fl" package.
-//
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "Object.h" // for getObjectInterface
-#include "as_object.h"
-
-#include "string_table.h"
-#include "VM.h"
-
-#include "MovieClip.h"
-
-#include "accessibility/fl_accessibility_pkg.h"
-#include "containers/containers_pkg.h"
-#include "controls/controls_pkg.h"
-#include "core/core_pkg.h"
-#include "managers/managers_pkg.h"
-#include "motion/motion_pkg.h"
-#include "transitions/transitions_pkg.h"
-#include "video/video_pkg.h"
-
-#include "fl_pkg.h"
-#include "flclasses.h"
-
-namespace gnash {
-
-static as_value
-get_fl_package(const fn_call& /*fn*/)
-{
- log_debug("Loading flash.flash package");
- as_object *pkg = new as_object(getObjectInterface());
-
- // Call the [objectname]_init() function for each class.
- int i = 0;
- do {
- asclasses[i](*pkg);
- } while (asclasses[++i] != 0);
-
- return pkg;
-}
-
-void
-fl_package_init(as_object& where)
-{
- string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("flash"), get_fl_package);
-}
-
-
-} // end of gnash namespace
=== removed file 'libcore/asobj/flash/fl/fl_pkg.h'
--- a/libcore/asobj/flash/fl/fl_pkg.h 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/fl/fl_pkg.h 1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-//
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifndef FLASH_FL_PACKAGE_H
-#define FLASH_FL_PACKAGE_H
-
-namespace gnash {
-
-class as_object;
-
-void fl_package_init(as_object& pkg);
-
-} // end of gnash namespace
-
-// FLASH_FL_PACKAGE_H
-#endif
-
=== removed file 'libcore/asobj/flash/fl/flclasses.h'
--- a/libcore/asobj/flash/fl/flclasses.h 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/fl/flclasses.h 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-//
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifndef GNASH_ASOBJ3_FL_H
-#define GNASH_ASOBJ3_FL_H 1
-
-#include "accessibility/fl_accessibility_pkg.h"
-#include "containers/containers_pkg.h"
-#include "controls/controls_pkg.h"
-#include "core/core_pkg.h"
-#include "managers/managers_pkg.h"
-#include "motion/motion_pkg.h"
-#include "transitions/transitions_pkg.h"
-#include "video/video_pkg.h"
-
-#include <sharedlib.h>
-
-static gnash::SharedLib::initentry *asclasses[] = {
- gnash::flash_accessibility_package_init,
- gnash::flash_containers_package_init,
- gnash::flash_controls_package_init,
- gnash::flash_core_package_init,
- gnash::flash_managers_package_init,
- gnash::flash_motion_package_init,
- gnash::flash_transitions_package_init,
- gnash::flash_video_package_init,
- 0
-};
-
-#endif // end of GNASH_ASOBJ3_FL_H
-
-// local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
=== modified file 'libcore/asobj/flash/flash_pkg.cpp'
--- a/libcore/asobj/flash/flash_pkg.cpp 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/flash_pkg.cpp 2009-05-26 06:41:31 +0000
@@ -45,10 +45,11 @@
}
void
-flash_package_init(as_object &where)
+flash_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("flash"), get_flash_package);
+ where.init_destructive_property(st.find("flash"), get_flash_package,
+ as_prop_flags::dontEnum | as_prop_flags::onlySWF8Up);
}
}
=== modified file 'libcore/asobj/flash/flashclasses.h'
--- a/libcore/asobj/flash/flashclasses.h 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/flashclasses.h 2009-05-26 07:22:26 +0000
@@ -47,24 +47,22 @@
namespace gnash {
static gnash::SharedLib::initentry *asclasses[] = {
- flash_data_package_init,
- flash_data_package_init,
+ flash_text_package_init,
+ flash_display_package_init,
+ flash_filters_package_init,
+ flash_geom_package_init,
+ flash_net_package_init,
+ flash_external_package_init,
flash_desktop_package_init,
- flash_display_package_init,
flash_errors_package_init,
flash_events_package_init,
- flash_external_package_init,
flash_filesystem_package_init,
- flash_filters_package_init,
- flash_geom_package_init,
flash_html_package_init,
flash_media_package_init,
- flash_net_package_init,
flash_printing_package_init,
- flash_samplar_package_init,
+ flash_sampler_package_init,
flash_security_package_init,
flash_data_package_init,
- flash_text_package_init,
flash_ui_package_init,
flash_utils_package_init,
flash_xml_package_init,
=== modified file 'libcore/asobj/flash/geom/geom_pkg.cpp'
--- a/libcore/asobj/flash/geom/geom_pkg.cpp 2009-05-25 02:00:57 +0000
+++ b/libcore/asobj/flash/geom/geom_pkg.cpp 2009-05-26 06:41:31 +0000
@@ -54,7 +54,11 @@
flash_geom_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("geom"),
get_flash_geom_package);
+
+ // TODO: this may not be correct, but it should be enumerable.
+ const int flags = 0;
+ where.init_destructive_property(st.find("geom"),
+ get_flash_geom_package, flags);
}
=== modified file 'libcore/asobj/flash/net/net_pkg.cpp'
--- a/libcore/asobj/flash/net/net_pkg.cpp 2009-05-25 02:00:57 +0000
+++ b/libcore/asobj/flash/net/net_pkg.cpp 2009-05-26 06:41:31 +0000
@@ -70,7 +70,11 @@
flash_net_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("net"), get_flash_net_package);
+
+ // TODO: this may not be correct, but it should be enumerable.
+ const int flags = 0;
+ where.init_destructive_property(st.find("net"),
+ get_flash_net_package, flags);
}
=== modified file 'libcore/asobj/flash/sampler/sampler.am'
--- a/libcore/asobj/flash/sampler/sampler.am 2009-05-25 15:23:32 +0000
+++ b/libcore/asobj/flash/sampler/sampler.am 2009-05-26 06:45:45 +0000
@@ -41,14 +41,14 @@
endif
libgnashasobjs_la_SOURCES += $(SAMPLER_SOURCES)
-noinst_HEADERS += $(SAMPLER_HEADERS) samplarclasses.h
+noinst_HEADERS += $(SAMPLER_HEADERS) samplerclasses.h
# Build a header file that contains a generated array of *_init()
# functions for the classes that are configured for this build, as
# that could be a subset of the entire class library for this namespace.
-samplarclasses.h: Makefile
- address@hidden "Generating header file for samplar classes..."
- address@hidden; \
+samplerclasses.h: Makefile
+ address@hidden "Generating header file for sampler classes..."
+ address@hidden; \
$(RM) $${header}; \
echo "// Generated by Makefile, don't hand edit!" > $${header}; \
echo "#ifndef GNASH_ASOBJ3_SAMPLAR_H" >> $${header}; \
@@ -66,4 +66,4 @@
echo '};' >> $${header}; \
echo "#endif // end of GNASH_ASOBJ3_SAMPLAR_H" >> $${header};
-BUILT_SOURCES += samplarclasses.h
+BUILT_SOURCES += samplerclasses.h
=== modified file 'libcore/asobj/flash/sampler/sampler_pkg.cpp'
--- a/libcore/asobj/flash/sampler/sampler_pkg.cpp 2009-05-25 02:00:57
+0000
+++ b/libcore/asobj/flash/sampler/sampler_pkg.cpp 2009-05-26 07:22:26
+0000
@@ -1,4 +1,4 @@
-// samplar_pkg.cpp: ActionScript "flash.samplar" package, for Gnash.
+// sampler_pkg.cpp: ActionScript "flash.sampler" package, for Gnash.
//
// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
@@ -29,30 +29,30 @@
#include "StackFrame_as.h"
#include "sampler_pkg.h"
-#include "samplarclasses.h"
+#include "samplerclasses.h"
namespace gnash {
static as_value
-get_flash_samplar_package(const fn_call& /*fn*/)
+get_flash_sampler_package(const fn_call& /*fn*/)
{
- log_debug("Loading flash.samplar package");
+ log_debug("Loading flash.sampler package");
as_object *pkg = new as_object(getObjectInterface());
// Call the [objectname]_init() function for each class.
int i = 0;
- do {
+ while (asclasses[++i] != 0) {
asclasses[i](*pkg);
- } while (asclasses[++i] != 0);
+ }
return pkg;
}
void
-flash_samplar_package_init(as_object& where)
+flash_sampler_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("samplar"),
get_flash_samplar_package);
+ where.init_destructive_property(st.find("sampler"),
get_flash_sampler_package);
}
=== modified file 'libcore/asobj/flash/sampler/sampler_pkg.h'
--- a/libcore/asobj/flash/sampler/sampler_pkg.h 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/sampler/sampler_pkg.h 2009-05-26 06:45:45 +0000
@@ -22,7 +22,7 @@
class as_object;
-void flash_samplar_package_init(as_object& pkg);
+void flash_sampler_package_init(as_object& pkg);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/text/text_pkg.cpp'
--- a/libcore/asobj/flash/text/text_pkg.cpp 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/flash/text/text_pkg.cpp 2009-05-26 06:41:31 +0000
@@ -66,7 +66,11 @@
flash_text_package_init(as_object& where)
{
string_table& st = where.getVM().getStringTable();
- where.init_destructive_property(st.find("text"),
get_flash_text_package);
+
+ // TODO: this may not be correct, but it should be enumerable.
+ const int flags = 0;
+ where.init_destructive_property(st.find("text"),
+ get_flash_text_package, flags);
}
=== modified file 'testsuite/actionscript.all/Makefile.am'
--- a/testsuite/actionscript.all/Makefile.am 2009-05-14 15:02:29 +0000
+++ b/testsuite/actionscript.all/Makefile.am 2009-05-26 07:01:03 +0000
@@ -90,6 +90,7 @@
Error.as \
ExternalInterface.as \
Function.as \
+ flash.as \
Global.as \
HitTest.as \
Inheritance.as \
=== added file 'testsuite/actionscript.all/flash.as'
--- a/testsuite/actionscript.all/flash.as 1970-01-01 00:00:00 +0000
+++ b/testsuite/actionscript.all/flash.as 2009-05-26 07:01:03 +0000
@@ -0,0 +1,39 @@
+//
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+//
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+#include "check.as"
+
+#if OUTPUT_VERSION < 8
+
+check_equals(typeof(flash), 'undefined');
+
+check_totals(1);
+
+#else
+
+r = "";
+for (i in flash) {
+ r += i + ",";
+};
+check_equals(r, "external,net,geom,filters,display,text,");
+
+totals(1);
+
+#endif
+
=== modified file 'testsuite/as3/Makefile.am'
--- a/testsuite/as3/Makefile.am 2009-05-21 15:57:48 +0000
+++ b/testsuite/as3/Makefile.am 2009-05-26 07:32:04 +0000
@@ -24,10 +24,11 @@
# These will get executed and parsed for test output
SANE_AS3TESTS = \
+ basic.as \
+ namespaces.as \
$(NULL)
BOGUS_AS3TESTS = \
- basic.as \
$(NULL)
AS3TESTS=$(SANE_AS3TESTS) $(BOGUS_AS3TESTS)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10921: Fix 63 failures and some crashes after asobj reorganization.,
Benjamin Wolsey <=