[vala/wip/transform: 61/61] Merge branch 'master' into wip/transform



commit 4faa301c59e2ec758b889be7bf6d353f40b9c41c
Merge: 7bc225f d9a7588
Author: Luca Bruno <lucabru src gnome org>
Date:   Sat Nov 29 16:19:22 2014 +0100

    Merge branch 'master' into wip/transform
    
    Conflicts:
        vala/Makefile.am
        vala/valapropertyaccessor.vala
        vala/valasemanticanalyzer.vala

 .gitignore                                        |    2 +
 NEWS                                              |   11 +
 codegen/valaccodeattribute.vala                   |    2 +-
 codegen/valagirwriter.vala                        |   40 +++
 compiler/valacompiler.vala                        |   23 ++-
 configure.ac                                      |    2 +-
 gee/hashmap.vala                                  |    2 +-
 tests/Makefile.am                                 |    3 +
 tests/basic-types/bug644046.vala                  |   10 +
 tests/methods/bug626783.vala                      |   22 ++
 tests/methods/bug736235.vala                      |   10 +
 vala/Makefile.am                                  |    2 +-
 vala/valaarraytype.vala                           |    9 +
 vala/valadatatype.vala                            |   18 +
 vala/valafield.vala                               |   12 +-
 vala/valagenerictype.vala                         |   10 +
 vala/valagirparser.vala                           |   13 +-
 vala/valainterface.vala                           |    7 +
 vala/valalocalvariable.vala                       |   23 ++
 vala/valamethod.vala                              |    8 +
 vala/valamethodcall.vala                          |   12 +-
 vala/valaparser.vala                              |   53 ++-
 vala/valapointertype.vala                         |    9 +
 vala/valapropertyaccessor.vala                    |   34 ++-
 vala/valareport.vala                              |  281 ++++++++++++++--
 vala/valasymbolresolver.vala                      |    4 +
 vapi/Makefile.am                                  |   21 ++-
 vapi/atk.vapi                                     |    2 +
 vapi/atspi-2.vapi                                 |    3 +-
 vapi/cairo.vapi                                   |   49 +++-
 vapi/clutter-1.0.vapi                             |    4 +-
 vapi/clutter-gdk-1.0.deps                         |    2 +
 vapi/clutter-gdk-1.0.vapi                         |   19 ++
 vapi/clutter-x11-1.0.deps                         |    2 +
 vapi/clutter-x11-1.0.vapi                         |  115 +++++++
 vapi/gdk-3.0.vapi                                 |   46 +++-
 vapi/gdk-pixbuf-2.0.vapi                          |    6 +
 vapi/gio-2.0.vapi                                 |   52 ++--
 vapi/glib-2.0.vapi                                |    4 +-
 vapi/gobject-2.0.vapi                             |    1 +
 vapi/gstreamer-1.0.vapi                           |   14 +-
 vapi/gtk+-2.0.vapi                                |   18 +-
 vapi/gtk+-3.0.vapi                                |  273 +++++++++++-----
 vapi/gtksourceview-3.0.vapi                       |    2 +-
 vapi/libgdata.vapi                                |   36 ++-
 vapi/libpeas-1.0.vapi                             |    6 +-
 vapi/libsoup-2.4.vapi                             |   66 ++--
 vapi/metadata/ClutterGdk-1.0.metadata             |    1 +
 vapi/metadata/ClutterX11-1.0.metadata             |    6 +
 vapi/metadata/Gio-2.0-custom.vala                 |    6 -
 vapi/metadata/Gio-2.0.metadata                    |    7 +
 vapi/metadata/Gst-1.0-custom.vala                 |    4 +-
 vapi/metadata/Gst-1.0.metadata                    |    9 +-
 vapi/metadata/RestExtras-0.7.metadata             |   10 +
 vapi/metadata/WebKit2WebExtension-4.0-custom.vala |    5 +
 vapi/metadata/WebKit2WebExtension-4.0.metadata    |    6 +
 vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala       |    6 +
 vapi/packages/gtk+-2.0/gtk+-2.0.metadata          |    7 +
 vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala       |   12 +
 vapi/packages/gtk+-3.0/gtk+-3.0.gi                |  359 ++++++++++++++++++++-
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata          |  129 ++++----
 vapi/pango.vapi                                   |   60 ++--
 vapi/pangocairo.vapi                              |   14 +-
 vapi/posix.vapi                                   |   28 ++
 vapi/rest-0.7.deps                                |    1 +
 vapi/rest-0.7.vapi                                |    1 +
 vapi/rest-extras-0.7.deps                         |    1 +
 vapi/rest-extras-0.7.vapi                         |   91 ++++++
 vapi/webkit2gtk-4.0.vapi                          |   27 ++-
 vapi/webkit2gtk-web-extension-4.0.deps            |    1 +
 vapi/webkit2gtk-web-extension-4.0.vapi            |  132 ++++++++-
 vapi/x11.vapi                                     |    1 +
 vapigen/Makefile.am                               |    2 -
 vapigen/valagidlparser.vala                       |    6 +-
 74 files changed, 1928 insertions(+), 367 deletions(-)
---
diff --cc vala/valapropertyaccessor.vala
index 2761c5a,f29a046..8be312d
--- a/vala/valapropertyaccessor.vala
+++ b/vala/valapropertyaccessor.vala
@@@ -126,6 -150,14 +150,10 @@@ public class Vala.PropertyAccessor : Su
                        return false;
                }
  
 -              var old_symbol = context.analyzer.current_symbol;
 -
 -              context.analyzer.current_symbol = this;
 -
+               if (writable || construction) {
+                       value_parameter = new Parameter ("value", value_type, source_reference);
+               }
+ 
                if (prop.source_type == SourceFileType.SOURCE) {
                        if (body == null && !prop.interface_only && !prop.is_abstract) {
                                /* no accessor body specified, insert default body */
diff --cc vala/valasymbolresolver.vala
index 3bb974e,32c84e4..f22221b
--- a/vala/valasymbolresolver.vala
+++ b/vala/valasymbolresolver.vala
@@@ -658,10 -508,11 +658,14 @@@ public class Vala.SymbolResolver : Code
        }
  
        public override void visit_cast_expression (CastExpression expr) {
 +              if (expr.checked) {
 +                      return;
 +              }
                expr.accept_children (this);
+       }
+ 
+       public override void visit_named_argument (NamedArgument expr) {
+               expr.accept_children (this);
        }
  
        public override void visit_addressof_expression (AddressofExpression expr) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]