fix gerror_type handling pull in get_lower_case_cname from Symbol

2008-02-24  Raffaele Sandrini  <raffaele@sandrini.ch>

	* gobject/valaccodegenerator.vala: fix gerror_type handling
	* vala/valadatatype.vala: pull in get_lower_case_cname from Symbol
	* vala/valaerrortype.vala: implement get_lower_case_cname and equals
	* vala/valasemanticanalyzer.vala: use ErrorType (null) for generic
	  catch clauses

svn path=/trunk/; revision=1048

diff --git a/ChangeLog b/ChangeLog
index 09e721441ab2e37484896bca9497b50a9646de2a..12bf7dbc7348c7e85e49dec12adac6020dbfd862 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-24  Raffaele Sandrini  <raffaele@sandrini.ch>
+
+       * gobject/valaccodegenerator.vala: fix gerror_type handling
+       * vala/valadatatype.vala: pull in get_lower_case_cname from Symbol
+       * vala/valaerrortype.vala: implement get_lower_case_cname and equals
+       * vala/valasemanticanalyzer.vala: use ErrorType (null) for generic
+         catch clauses
+
 2008-02-24  Raffaele Sandrini  <raffaele@sandrini.ch>
 
        * vapi/bzlib.vapi: add bzip2 binding, patch by Maciej Piechotka

diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index 6a3aa0fb6059ed4b87be630d05c4d64e991f7671..298bd4cf7ff5e60ac4091eb28862975ab387cd08 100644 (file)
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -97,7 +97,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
        public Typesymbol gtype_type;
        public Typesymbol gtypeinstance_type;
        public Typesymbol gobject_type;
-       public Typesymbol gerror_type;
+       public ErrorType gerror_type;
        public Typesymbol glist_type;
        public Typesymbol gslist_type;
        public Typesymbol gstring_type;
@@ -223,7 +223,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
                gtype_type = (Typesymbol) glib_ns.scope.lookup ("Type");
                gtypeinstance_type = (Typesymbol) glib_ns.scope.lookup ("TypeInstance");
                gobject_type = (Typesymbol) glib_ns.scope.lookup ("Object");
-               gerror_type = (Typesymbol) glib_ns.scope.lookup ("Error");
+               gerror_type = new ErrorType (null);
                glist_type = (Typesymbol) glib_ns.scope.lookup ("List");
                gslist_type = (Typesymbol) glib_ns.scope.lookup ("SList");
                gstring_type = (Typesymbol) glib_ns.scope.lookup ("StringBuilder");
@@ -1301,9 +1301,9 @@ public class Vala.CCodeGenerator : CodeGenerator {
                        var cerror_block = new CCodeBlock ();
                        foreach (CatchClause clause in current_try.get_catch_clauses ()) {
                                // go to catch clause if error domain matches
-                               var cgoto_stmt = new CCodeGotoStatement ("__catch%d_%s".printf (current_try_id, clause.type_reference.data_type.get_lower_case_cname ()));
+                               var cgoto_stmt = new CCodeGotoStatement ("__catch%d_%s".printf (current_try_id, clause.type_reference.get_lower_case_cname ()));
 
-                               if (clause.type_reference.data_type == gerror_type) {
+                               if (clause.type_reference.equals (gerror_type)) {
                                        // general catch clause
                                        cerror_block.add_statement (cgoto_stmt);
                                } else {
@@ -2141,7 +2141,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
                clause.accept_children (this);
 
                var cfrag = new CCodeFragment ();
-               cfrag.append (new CCodeLabel ("__catch%d_%s".printf (current_try_id, clause.type_reference.data_type.get_lower_case_cname ())));
+               cfrag.append (new CCodeLabel ("__catch%d_%s".printf (current_try_id, clause.type_reference.get_lower_case_cname ())));
 
                var cblock = new CCodeBlock ();
 

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index 8286c350323e2f1898cf64829a2b1fc116915f05..db3551b2879c4c24742d2c356a02c0bc3d9415e1 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -178,6 +178,18 @@ public class Vala.DataType : CodeNode {
                return "const %s%s".printf (t.get_cname (), ptr);
        }
 
+       /**
+        * Returns the C name of this data type in lower case. Words are
+        * separated by underscores.
+        *
+        * @param infix a string to be placed between namespace and data type
+        *              name or null
+        * @return      the lower case name to be used in C code
+        */
+       public virtual string get_lower_case_cname (string infix = null) {
+               return data_type.get_lower_case_cname (infix);
+       }
+
        public override string! to_string () {
                string s;
 
@@ -250,7 +262,7 @@ public class Vala.DataType : CodeNode {
         * @return      true if this type reference is equal to type2, false
         *              otherwise
         */
-       public bool equals (DataType! type2) {
+       public virtual bool equals (DataType! type2) {
                if (type2.transfers_ownership != transfers_ownership) {
                        return false;
                }

diff --git a/vala/valaerrortype.vala b/vala/valaerrortype.vala
index 02b99b5364da9804376be515c5d985dccd5ca52f..f12cb332ece126993087e29091fe6f2bd1b4022c 100644 (file)
--- a/vala/valaerrortype.vala
+++ b/vala/valaerrortype.vala
@@ -69,4 +69,26 @@ public class Vala.ErrorType : ReferenceType {
        public override string get_cname (bool var_type = false, bool const_type = false) {
                return "GError*";
        }
+
+       public override string get_lower_case_cname (string infix = null) {
+               if (error_domain == null) {
+                       if (infix == null) {
+                               return "g_error";
+                       } else {
+                               return "g_%s_error".printf (infix);
+                       }
+               } else {
+                       return error_domain.get_lower_case_cname (infix);
+               }
+       }
+
+       public override bool equals (DataType! type2) {
+               var et = type2 as ErrorType;
+
+               if (et == null) {
+                       return false;
+               }
+
+               return error_domain == et.error_domain;
+       }
 }

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 6f8201f1be4f1af89550d7eaebe3c6539bdc9ef9..b8d4dee66e787d49c3eba9516d90586b8abc5083 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1082,6 +1082,8 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                        clause.variable_declarator.type_reference = new ClassType (gerror_type);
 
                        clause.body.scope.add (clause.variable_name, clause.variable_declarator);
+               } else {
+                       clause.type_reference = new ErrorType (null);
                }
 
                clause.accept_children (this);