[vala/wip/transform: 133/133] Merge branch 'master' into wip/transform
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/transform: 133/133] Merge branch 'master' into wip/transform
- Date: Tue, 1 Dec 2015 11:32:55 +0000 (UTC)
commit 1b717f1f76ce974f7f250138e00d74ef3f92e2f1
Merge: bcc6ae8 94efdae
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Tue Dec 1 12:27:40 2015 +0100
Merge branch 'master' into wip/transform
NEWS | 41 ++
ccode/valaccodeenum.vala | 1 -
codegen/valaccodebasemodule.vala | 8 +-
codegen/valaccodedelegatemodule.vala | 8 +-
codegen/valaccodemethodcallmodule.vala | 13 +-
codegen/valagirwriter.vala | 11 +-
codegen/valagobjectmodule.vala | 9 +-
codegen/valagsignalmodule.vala | 2 +-
codegen/valagtkmodule.vala | 8 +
compiler/valacompiler.vala | 9 +-
configure.ac | 2 +-
doc/valac.1 | 3 +
gobject-introspection/scannerlexer.l | 1 +
tests/Makefile.am | 5 +
tests/asynchronous/bug742621.vala | 15 +
tests/basic-types/bug643612.vala | 8 +
tests/methods/bug743877.vala | 9 +
tests/objects/bug751338.vala | 27 +
tests/structs/bug749952.vala | 14 +
vala/valaattribute.vala | 3 +-
vala/valabinaryexpression.vala | 10 +-
vala/valablock.vala | 4 +-
vala/valacastexpression.vala | 6 +-
vala/valacatchclause.vala | 4 +-
vala/valaclass.vala | 8 +-
vala/valacodecontext.vala | 5 +-
vala/valadeclarationstatement.vala | 6 +-
vala/valadelegate.vala | 8 +-
vala/valadostatement.vala | 8 +-
vala/valaexpressionstatement.vala | 6 +-
vala/valafield.vala | 10 +-
vala/valaforeachstatement.vala | 11 +-
vala/valaforstatement.vala | 2 +-
vala/valagenieparser.vala | 97 ++--
vala/valagirparser.vala | 2 -
vala/valaintegerliteral.vala | 4 +-
vala/valainterface.vala | 6 +-
vala/valalocalvariable.vala | 8 +-
vala/valaloop.vala | 6 +-
vala/valamethod.vala | 8 +-
vala/valaparameter.vala | 8 +-
vala/valaparser.vala | 8 +
vala/valapostfixexpression.vala | 8 +-
vala/valaproperty.vala | 12 +-
vala/valapropertyaccessor.vala | 12 +-
vala/valaregexliteral.vala | 6 +-
vala/valasignal.vala | 8 +-
vala/valasourcefile.vala | 1 -
vala/valasourcereference.vala | 8 +-
vala/valastringliteral.vala | 6 +-
vala/valastruct.vala | 2 -
vala/valatypeparameter.vala | 8 +-
vala/valaunaryexpression.vala | 2 +-
vala/valawhilestatement.vala | 8 +-
vapi/Makefile.am | 2 +-
vapi/atk.vapi | 32 +-
vapi/atspi-2.vapi | 7 +-
vapi/avahi-client.vapi | 2 +-
vapi/clutter-1.0.vapi | 331 ++++++----
vapi/clutter-gdk-1.0.vapi | 2 +
vapi/clutter-x11-1.0.vapi | 15 +-
vapi/gdk-3.0.vapi | 87 ++-
vapi/gdk-pixbuf-2.0.vapi | 3 +-
vapi/gdk-x11-3.0.vapi | 2 +-
vapi/gdl-3.0.vapi | 10 +-
vapi/geocode-glib-1.0.vapi | 2 +-
vapi/gio-2.0.vapi | 189 ++++--
vapi/gio-unix-2.0.vapi | 4 +-
vapi/glib-2.0.vapi | 50 ++-
vapi/gobject-2.0.vapi | 10 +
vapi/gobject-introspection-1.0.vapi | 4 +
vapi/gstreamer-1.0.vapi | 268 ++++++--
vapi/gstreamer-allocators-1.0.vapi | 23 +-
vapi/gstreamer-app-1.0.vapi | 2 +
vapi/gstreamer-audio-1.0.vapi | 39 +-
vapi/gstreamer-base-1.0.vapi | 26 +
vapi/gstreamer-check-1.0.vapi | 130 ++++
vapi/gstreamer-controller-1.0.vapi | 32 +-
vapi/gstreamer-net-1.0.vapi | 64 ++-
vapi/gstreamer-pbutils-1.0.vapi | 21 +-
vapi/gstreamer-rtp-1.0.vapi | 34 +-
vapi/gstreamer-rtsp-1.0.vapi | 25 +-
vapi/gstreamer-video-1.0.vapi | 431 +++++++++++--
vapi/gtk+-2.0.vapi | 32 +-
vapi/gtk+-3.0.vapi | 636 ++++++++++++------
vapi/gtksourceview-3.0.vapi | 140 +++-
vapi/json-glib-1.0.vapi | 17 +-
vapi/libgdata.vapi | 154 +++--
vapi/libnl-1.vapi | 4 +-
vapi/libnl-2.0.vapi | 4 +-
vapi/libnl-3.0.vapi | 4 +-
vapi/libpeas-1.0.vapi | 2 +
vapi/libsoup-2.4.vapi | 156 ++++-
vapi/linux.vapi | 70 ++-
vapi/metadata/Clutter-1.0-custom.vala | 15 +
vapi/metadata/Clutter-1.0.metadata | 12 +-
vapi/metadata/Gdk-3.0-custom.vala | 3 +
vapi/metadata/Gdk-3.0.metadata | 5 +
vapi/metadata/GdkPixbuf-2.0.metadata | 1 -
vapi/metadata/Gio-2.0-custom.vala | 20 +-
vapi/metadata/Gio-2.0.metadata | 29 +-
vapi/metadata/Gst-1.0-custom.vala | 8 +-
vapi/metadata/Gst-1.0.metadata | 23 +-
vapi/metadata/GstCheck-1.0.metadata | 4 +
vapi/metadata/GstController-1.0.metadata | 3 +
vapi/metadata/GstPbutils-1.0.metadata | 1 +
vapi/metadata/GstVideo-1.0.metadata | 2 +-
vapi/metadata/GtkSource-3.0.metadata | 3 -
vapi/metadata/PackageKitGlib-1.0.metadata | 63 ++
vapi/metadata/Pango-1.0.metadata | 4 +-
vapi/metadata/Poppler-0.18.metadata | 1 -
vapi/metadata/WebKit2-4.0.metadata | 10 +
vapi/packagekit-glib2.vapi | 295 ++++++---
vapi/packages/gio-unix-2.0/gio-unix-2.0.gi | 3 +
vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata | 8 +
vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala | 2 +-
vapi/packages/gtk+-2.0/gtk+-2.0.gi | 8 +-
vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 10 +-
vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala | 9 +-
vapi/packages/gtk+-3.0/gtk+-3.0.gi | 788 ++++++++++++++++++++--
vapi/packages/gtk+-3.0/gtk+-3.0.metadata | 240 ++++++-
vapi/pango.vapi | 46 +-
vapi/poppler-glib.vapi | 1 +
vapi/posix.vapi | 72 ++-
vapi/rest-0.7.vapi | 1 +
vapi/webkit2gtk-4.0.vapi | 95 +++-
vapi/webkit2gtk-web-extension-4.0.vapi | 302 +++++----
vapi/x11.vapi | 2 +-
vapigen/valagidlparser.vala | 9 +
129 files changed, 4515 insertions(+), 1162 deletions(-)
---
diff --cc compiler/valacompiler.vala
index 990e183,ee5d45b..a2327f0
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@@ -38,10 -38,9 +38,11 @@@ class Vala.Compiler
static string[] gir_directories;
[CCode (array_length = false, array_null_terminated = true)]
static string[] metadata_directories;
+ [CCode (array_length = false, array_null_terminated = true)]
+ static string[] plugin_directories;
static string vapi_filename;
static string library;
+ static string shared_library;
static string gir;
[CCode (array_length = false, array_null_terminated = true)]
static string[] packages;
diff --cc tests/Makefile.am
index c63ab42,1666826..b8c2c6e
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -191,8 -194,8 +195,9 @@@ TESTS =
asynchronous/bug654336.vala \
asynchronous/bug654337.vala \
asynchronous/bug661961.vala \
+ asynchronous/bug742621.vala \
asynchronous/closures.vala \
+ asynchronous/yield.vala \
dbus/basic-types.test \
dbus/arrays.test \
dbus/structs.test \
diff --cc vala/valaforeachstatement.vala
index 20024c6,4de3f52..aa3dcf8
--- a/vala/valaforeachstatement.vala
+++ b/vala/valaforeachstatement.vala
@@@ -88,13 -95,15 +88,14 @@@ public class Vala.ForeachStatement : Ba
/**
* Creates a new foreach statement.
*
- * @param type element type
- * @param id element variable name
- * @param col loop body
- * @param source reference to source code
- * @return newly created foreach statement
+ * @param type_reference element type
+ * @param variable_name element variable name
+ * @param collection container
+ * @param body loop body
+ * @param source_reference reference to source code
+ * @return newly created foreach statement
*/
public ForeachStatement (DataType? type_reference, string variable_name, Expression collection, Block
body, SourceReference source_reference) {
- base (source_reference);
this.variable_name = variable_name;
this.collection = collection;
this.body = body;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
