[vala/staging] genie: Use TokenType.EXCEPTION instead of TokenType.ERRORDOMAIN



commit 86de38ca80248f3b47dd12a3fbada53b8847695a
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Nov 5 11:22:00 2021 +0100

    genie: Use TokenType.EXCEPTION instead of TokenType.ERRORDOMAIN

 vala/valagenieparser.vala    | 8 ++++----
 vala/valageniescanner.vala   | 2 +-
 vala/valagenietokentype.vala | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index d7f95cda9..cc8215a43 100644
--- 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 a10efdad8..ef54ae7d3 100644
--- 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 55dbcc919..08bef53fd 100644
--- 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'";


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