Add parser support for internal symbol accessibility

2008-07-17  Jürg Billeter  <j@bitron.ch>

	* vala/valaparser.vala:
	* vala/valascanner.vala:
	* vala/valatokentype.vala:

	Add parser support for internal symbol accessibility

svn path=/trunk/; revision=1708

diff --git a/ChangeLog b/ChangeLog
index de25fc8..1a5ec82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-17  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaparser.vala:
+       * vala/valascanner.vala:
+       * vala/valatokentype.vala:
+
+       Add parser support for internal symbol accessibility
+
 2008-07-17  Jared Moore  <jaredm@svn.gnome.org>
 
        * vapi/glib-2.0.vapi:

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 10b1407..30ec19a 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -199,6 +199,7 @@ public class Vala.Parser : CodeVisitor {
                case TokenType.IN:
                case TokenType.INLINE:
                case TokenType.INTERFACE:
+               case TokenType.INTERNAL:
                case TokenType.IS:
                case TokenType.LOCK:
                case TokenType.NAMESPACE:
@@ -1811,6 +1812,7 @@ public class Vala.Parser : CodeVisitor {
                        case TokenType.EXTERN:
                        case TokenType.INLINE:
                        case TokenType.INTERFACE:
+                       case TokenType.INTERNAL:
                        case TokenType.NAMESPACE:
                        case TokenType.OVERRIDE:
                        case TokenType.PRIVATE:
@@ -2573,6 +2575,9 @@ public class Vala.Parser : CodeVisitor {
                case TokenType.PROTECTED:
                        next ();
                        return SymbolAccessibility.PROTECTED;
+               case TokenType.INTERNAL:
+                       next ();
+                       return SymbolAccessibility.INTERNAL;
                case TokenType.PUBLIC:
                        next ();
                        return SymbolAccessibility.PUBLIC;
@@ -2867,6 +2872,7 @@ public class Vala.Parser : CodeVisitor {
                case TokenType.EXTERN:
                case TokenType.INLINE:
                case TokenType.INTERFACE:
+               case TokenType.INTERNAL:
                case TokenType.NAMESPACE:
                case TokenType.OVERRIDE:
                case TokenType.PRIVATE:

diff --git a/vala/valascanner.vala b/vala/valascanner.vala
index 9cba014..e7e1c2c 100644 (file)
--- a/vala/valascanner.vala
+++ b/vala/valascanner.vala
@@ -279,6 +279,9 @@ public class Vala.Scanner : Object {
                        case 'd':
                                if (matches (begin, "delegate")) return TokenType.DELEGATE;
                                break;
+                       case 'i':
+                               if (matches (begin, "internal")) return TokenType.INTERNAL;
+                               break;
                        case 'o':
                                if (matches (begin, "override")) return TokenType.OVERRIDE;
                                break;

diff --git a/vala/valatokentype.vala b/vala/valatokentype.vala
index 94fc0a0..2fade60 100644 (file)
--- a/vala/valatokentype.vala
+++ b/vala/valatokentype.vala
@@ -80,6 +80,7 @@ public enum Vala.TokenType {
        INLINE,
        INTEGER_LITERAL,
        INTERFACE,
+       INTERNAL,
        INTERR,
        IS,
        LAMBDA,
@@ -195,6 +196,7 @@ public enum Vala.TokenType {
                case INLINE: return "`inline'";
                case INTEGER_LITERAL: return "integer literal";
                case INTERFACE: return "`interface'";
+               case INTERNAL: return "`internal'";
                case INTERR: return "`?'";
                case IS: return "`is'";
                case LAMBDA: return "`=>'";