Vala: tag methods defined as parts of an enum

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Units/parser-vala.r/enum.vala.d/expected.tags

@@ -22,4 +22,9 @@ RELEASE_MASK	input.vala	/^        RELEASE_MASK = 1 << 30$/;"	v	enum:Skk.Modifier
 ModifierType2	input.vala	/^	public enum ModifierType2 {$/;"	e	namespace:Skk
 ULTRA_MASK	input.vala	/^        ULTRA_MASK = 1 << 20,$/;"	v	enum:Skk.ModifierType2
 MIRACLE_MASK	input.vala	/^        MIRACLE_MASK = 1 << 21,	\/\/ valac accept this.$/;"	v	enum:Skk.ModifierType2
+ModifierType3	input.vala	/^	public enum ModifierType3 {$/;"	e	namespace:Skk
+A_MASK	input.vala	/^        A_MASK = 1 << 29,$/;"	v	enum:Skk.ModifierType3
+B_MASK	input.vala	/^        B_MASK = 1 << 31;$/;"	v	enum:Skk.ModifierType3
+to_string0	input.vala	/^		string to_string0() {$/;"	m	enum:Skk.ModifierType3
+to_string1	input.vala	/^		string to_string1() {$/;"	m	enum:Skk.ModifierType3
 KeyEvent	input.vala	/^    public class KeyEvent : Object {$/;"	c	namespace:Skk

Units/parser-vala.r/enum.vala.d/input.vala

@@ -58,6 +58,17 @@ namespace Skk {
         MIRACLE_MASK = 1 << 21,	// valac accept this.
 	}
 
+	public enum ModifierType3 {
+        A_MASK = 1 << 29,
+        B_MASK = 1 << 31;
+		string to_string0() {
+			return "";
+		}
+		string to_string1() {
+			return "";
+		}
+	}
+
     /**
      * Object representing a key event.
      */

parsers/vala.c

@@ -282,6 +282,7 @@ static void parseInterface (tokenInfo *const token, int corkIndex);
 static void parseClass (tokenInfo *const token, int kindIndex, int corkIndex);
 static void parseStatement (tokenInfo *const token, int corkIndex);
 static void parseEnum (tokenInfo *const token, int kindIndex, int elementKindIndex, int corkIndex);
+static void recurseValaTags (tokenInfo *token, int parentIndex);
 
 
 /*
@@ -575,7 +576,7 @@ static void parseEnumBody (tokenInfo *const token, int kindIndex, int corkIndex)
 		if (tokenIsType (token, IDENTIFIER))
 		{
 			makeSimpleTagFromToken (token, kindIndex, corkIndex);
-			tokenType endMakers [] = {',', '}'};
+			tokenType endMakers [] = {',', ';', '}'};
 			if (tokenSkipToTypesOverPairs (token, endMakers, ARRAY_SIZE(endMakers)))
 			{
 				if (tokenIsTypeVal (token, ','))
@@ -590,6 +591,19 @@ static void parseEnumBody (tokenInfo *const token, int kindIndex, int corkIndex)
 
 				if (tokenIsTypeVal (token, '}'))
 					break;
+				else if (tokenIsTypeVal (token, ';'))
+				{
+					bool t = trianglePairState;
+					do
+					{
+						tokenRead (token);
+						if (tokenIsTypeVal (token, '}'))
+							break;
+						recurseValaTags (token, corkIndex);
+					} while (!tokenIsEOF (token));
+					trianglePairState = t;
+					break;
+				}
 			}
 			else
 				break;