genie: Use TokenType.EXCEPTION instead of TokenType.ERRORDOMAIN

diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index d7f95cda9a1aa9bac30ad684ca59faeaf498b7b4..cc8215a4399f8a784a4f0c7db8e715760d4ae4aa 100644 (file)
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -267,9 +267,9 @@ public class Vala.Genie.Parser : CodeVisitor {
                case TokenType.EOL:
                case TokenType.ENUM:
                case TokenType.ENSURES:
-               case TokenType.ERRORDOMAIN:
                case TokenType.EVENT:
                case TokenType.EXCEPT:
+               case TokenType.EXCEPTION:
                case TokenType.EXTERN:
                case TokenType.FALSE:
                case TokenType.FINAL:
@@ -2447,7 +2447,7 @@ public class Vala.Genie.Parser : CodeVisitor {
                        return parse_method_declaration (attrs);
                case TokenType.ENUM:
                        return parse_enum_declaration (attrs);
-               case TokenType.ERRORDOMAIN:
+               case TokenType.EXCEPTION:
                        return parse_errordomain_declaration (attrs);
                case TokenType.FINAL:
                        return parse_destructor_declaration (attrs);
@@ -2539,7 +2539,7 @@ public class Vala.Genie.Parser : CodeVisitor {
                        case TokenType.DEF:
                        case TokenType.DELEGATE:
                        case TokenType.ENUM:
-                       case TokenType.ERRORDOMAIN:
+                       case TokenType.EXCEPTION:
                        case TokenType.FINAL:
                        case TokenType.INTERFACE:
                        case TokenType.NAMESPACE:
@@ -3494,7 +3494,7 @@ public class Vala.Genie.Parser : CodeVisitor {
 
        Symbol parse_errordomain_declaration (List<Attribute>? attrs) throws ParseError {
                var begin = get_location ();
-               expect (TokenType.ERRORDOMAIN);
+               expect (TokenType.EXCEPTION);
                var flags = parse_type_declaration_modifiers ();
 
                var sym = parse_symbol_name ();

diff --git a/vala/valageniescanner.vala b/vala/valageniescanner.vala
index a10efdad8eae0fadd681384c29abbdf660bed906..ef54ae7d38306ca74e831ee6e2135afdf85a0bed 100644 (file)
--- a/vala/valageniescanner.vala
+++ b/vala/valageniescanner.vala
@@ -669,7 +669,7 @@ public class Vala.Genie.Scanner {
                                if (matches (begin, "construct")) return TokenType.CONSTRUCT;
                                break;
                        case 'e':
-                               if (matches (begin, "exception")) return TokenType.ERRORDOMAIN;
+                               if (matches (begin, "exception")) return TokenType.EXCEPTION;
                                break;
                        case 'i':
                                if (matches (begin, "interface")) return TokenType.INTERFACE;

diff --git a/vala/valagenietokentype.vala b/vala/valagenietokentype.vala
index 55dbcc919988108d946b9c1a304eb8879e70b146..08bef53fddd3c814cc0bca59ea64509b6c33a288 100644 (file)
--- a/vala/valagenietokentype.vala
+++ b/vala/valagenietokentype.vala
@@ -72,11 +72,11 @@ public enum Vala.Genie.TokenType {
        ELSE,
        ENUM,
        ENSURES,
-       ERRORDOMAIN,
        EOF,
        EOL,
        EVENT,
        EXCEPT,
+       EXCEPTION,
        EXTERN,
        FALSE,
        FINAL,
@@ -220,11 +220,11 @@ public enum Vala.Genie.TokenType {
                case ELSE: return "`else'";
                case ENUM: return "`enum'";
                case ENSURES: return "`ensures'";
-               case ERRORDOMAIN: return "`errordomain'";
                case EOF: return "end of file";
                case EOL: return "end of line";
                case EVENT: return "event";
                case EXCEPT: return "`except'";
+               case EXCEPTION: return "`exception'";
                case EXTERN: return "`extern'";
                case FALSE: return "`false'";
                case FINAL: return "`final'";