vala r1205 - in trunk: . vala vapi

[juergbi svn gnome org]

Author: juergbi
Date: Sun Apr 13 14:34:42 2008
New Revision: 1205
URL: http://svn.gnome.org/viewvc/vala?rev=1205&view=rev

Log:
2008-04-13  Juerg Billeter  <j bitron ch>

	* vala/valaerrortype.vala, vala/valasemanticanalyzer.vala: never use
	  ClassType for ErrorType instances

	* vapi/glib-2.0.vapi: use errordomains instead of enums with
	  [ErrorDomain] attribute


Modified:
   trunk/ChangeLog
   trunk/vala/valaerrortype.vala
   trunk/vala/valasemanticanalyzer.vala
   trunk/vapi/glib-2.0.vapi

Modified: trunk/vala/valaerrortype.vala
==============================================================================
--- trunk/vala/valaerrortype.vala	(original)
+++ trunk/vala/valaerrortype.vala	Sun Apr 13 14:34:42 2008
@@ -39,6 +39,11 @@
 	}
 
 	public override bool compatible (DataType! target_type, bool enable_non_null = true) {
+		/* temporarily ignore type parameters */
+		if (target_type.type_parameter != null) {
+			return true;
+		}
+
 		var et = target_type as ErrorType;
 
 		/* error types are only compatible to error types */

Modified: trunk/vala/valasemanticanalyzer.vala
==============================================================================
--- trunk/vala/valasemanticanalyzer.vala	(original)
+++ trunk/vala/valasemanticanalyzer.vala	Sun Apr 13 14:34:42 2008
@@ -1166,7 +1166,7 @@
 			current_source_file.add_type_dependency (clause.type_reference, SourceFileDependencyType.SOURCE);
 
 			clause.variable_declarator = new VariableDeclarator (clause.variable_name);
-			clause.variable_declarator.type_reference = new ClassType (gerror_type);
+			clause.variable_declarator.type_reference = clause.type_reference.copy ();
 
 			clause.body.scope.add (clause.variable_name, clause.variable_declarator);
 		} else {

Modified: trunk/vapi/glib-2.0.vapi
==============================================================================
--- trunk/vapi/glib-2.0.vapi	(original)
+++ trunk/vapi/glib-2.0.vapi	Sun Apr 13 14:34:42 2008
@@ -1182,8 +1182,7 @@
 	
 	public delegate bool SourceFunc ();
 
-	[ErrorDomain]
-	public enum ThreadError {
+	public errordomain ThreadError {
 		AGAIN
 	}
 
@@ -1500,8 +1499,7 @@
 		public static string display_basename (string! filename);
 	}
 
-	[ErrorDomain]
-	public enum ConvertError {
+	public errordomain ConvertError {
 		NO_CONVERSION,
 		ILLEGAL_SEQUENCE,
 		FAILED,
@@ -1917,8 +1915,7 @@
 
 	/* Spawning Processes */
 
-	[ErrorDomain]
-	public enum SpawnError {
+	public errordomain SpawnError {
 		FORK,
 		READ,
 		CHDIR,
@@ -2013,8 +2010,7 @@
 	
 	/* File Utilities */
 
-	[ErrorDomain]
-	public enum FileError {
+	public errordomain FileError {
 		EXIST,
 		ISDIR,
 		ACCES,
@@ -2153,8 +2149,7 @@
 
 	/* Shell-related Utilities */
 
-	[ErrorDomain]
-	public enum ShellError {
+	public errordomain ShellError {
 		BAD_QUOTING,
 		EMPTY_STRING,
 		FAILED
@@ -2168,8 +2163,7 @@
 
 	/* Commandline option parser */
 
-	[ErrorDomain]
-	public enum OptionError {
+	public errordomain OptionError {
 		UNKNOWN_OPTION,
 		BAD_VALUE,
 		FAILED
@@ -2251,8 +2245,7 @@
 
 	/* Perl-compatible regular expressions */
 
-	[ErrorDomain]
-	public enum RegexError {
+	public errordomain RegexError {
 		COMPILE,
 		OPTIMIZE,
 		REPLACE,
@@ -2336,8 +2329,7 @@
 
 	/* Simple XML Subset Parser */
 
-	[ErrorDomain]
-	public enum MarkupError {
+	public errordomain MarkupError {
 		BAD_UTF8,
 		EMPTY,
 		PARSE,
@@ -2386,8 +2378,7 @@
 
 	/* Key-value file parser */
 
-	[ErrorDomain]
-	public enum KeyFileError {
+	public errordomain KeyFileError {
 		UNKNOWN_ENCODING,
 		PARSE,
 		NOT_FOUND,
@@ -2496,8 +2487,7 @@
 		public bool move_item (string! old_uri, string! new_uri) throws BookmarkFileError;
 	}
 
-	[ErrorDomain]
-	public enum BookmarkFileError {
+	public errordomain BookmarkFileError {
 		INVALID_URI,
 		INVALID_VALUE,
 		APP_NOT_REGISTERED,