Merge pull request #3571 from kumarstack55/develop

PowerShell: introduce enum kind

Author: masatake

Units/parser-powershell.r/enum-powershell.d/args.ctags

@@ -0,0 +1,4 @@
+--sort=no
+# "qualified" extra doesn't work.
+# --extras=+q
+--fields=+S

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

@@ -0,0 +1,4 @@
+EnumName1	input.ps1	/^enum EnumName1 {$/;"	g
+EnumName2	input.ps1	/^enum EnumName2 {$/;"	g
+EnumName3	input.ps1	/^Enum EnumName3 {$/;"	g
+EnumName4	input.ps1	/^[Flags()] enum EnumName4 {$/;"	g

Units/parser-powershell.r/enum-powershell.d/input.ps1

@@ -0,0 +1,23 @@
+# EnumName1
+enum EnumName1 {
+    Label11
+    Label12 = 10
+}
+
+# EnumName2
+enum EnumName2 {
+    Label21
+    Label22 = 20
+}
+
+# EnumName3
+Enum EnumName3 {
+    Label31
+    Label32 = 30
+}
+
+# EnumName4
+[Flags()] enum EnumName4 {
+    Label41
+    Label42 = 40
+}

parsers/powershell.c

@@ -41,6 +41,7 @@ typedef enum {
 	K_VARIABLE,
 	K_CLASS,
 	K_FILTER,
+	K_ENUM,
 	COUNT_KIND
 } powerShellKind;
 
@@ -49,6 +50,7 @@ static kindDefinition PowerShellKinds[COUNT_KIND] = {
 	{ true, 'v', "variable",	"variables" },
 	{ true, 'c', "class",		"classes" },
 	{ true, 'i', "filter",		"filter" },
+	{ true, 'g', "enum",		"enum names" },
 };
 
 
@@ -77,6 +79,7 @@ enum {
 	KEYWORD_function,
 	KEYWORD_filter,
 	KEYWORD_class,
+	KEYWORD_enum,
 };
 
 /* We need an integer that is not an unsigned to allow KEYWORD_NONE. */
@@ -86,6 +89,7 @@ static const keywordTable PowerShellKeywordTable[] = {
 	{ "function",	KEYWORD_function },
 	{ "filter",		KEYWORD_filter },
 	{ "class",		KEYWORD_class },
+	{ "enum",		KEYWORD_enum },
 };
 
 typedef struct {
@@ -175,6 +179,18 @@ static void makeClassTag (const tokenInfo *const token)
 	}
 }
 
+static void makeEnumTag (const tokenInfo *const token)
+{
+	if (PowerShellKinds[K_ENUM].enabled)
+	{
+		tagEntryInfo e;
+
+		initPowerShellEntry (&e, token, K_ENUM, NULL);
+
+		makeTagEntry (&e);
+	}
+}
+
 static tokenInfo *newToken (void)
 {
 	tokenInfo *const token = xMalloc (1, tokenInfo);
@@ -574,30 +590,61 @@ static bool parseFunction (tokenInfo *const token, int kind)
 static bool parseClass (tokenInfo *const token)
 {
 	bool readNext = true;
-	tokenInfo *nameFree = NULL;
+	vString *nameFree = NULL;
 
 	readToken (token);
 
 	if (token->type != TOKEN_IDENTIFIER)
 		return false;
 
-	nameFree = newToken ();
-	copyToken (nameFree, token, true);
+	makeClassTag (token);
+	nameFree = vStringNewCopy (token->string);
 	readToken (token);
 
-	makeClassTag (nameFree);
+	while (token->type != TOKEN_OPEN_CURLY && token->type != TOKEN_EOF)
+	{
+		readToken (token);
+	}
+
+	if (token->type == TOKEN_OPEN_CURLY)
+		enterScope (token, nameFree, K_CLASS);
+	else
+		readNext = false;
+
+	vStringDelete (nameFree);
+
+	return readNext;
+}
+
+/* parse a enum
+ *
+ * 	enum EnumName {}
+ */
+static bool parseEnum (tokenInfo *const token)
+{
+	bool readNext = true;
+	vString *nameFree = NULL;
+
+	readToken (token);
+
+	if (token->type != TOKEN_IDENTIFIER)
+		return false;
+
+	makeEnumTag (token);
+	nameFree = vStringNewCopy (token->string);
+	readToken (token);
 
 	while (token->type != TOKEN_OPEN_CURLY && token->type != TOKEN_EOF)
 	{
 		readToken (token);
 	}
 
 	if (token->type == TOKEN_OPEN_CURLY)
-		enterScope (token, nameFree->string, K_CLASS);
+		enterScope (token, nameFree, K_ENUM);
 	else
 		readNext = false;
 
-	deleteToken (nameFree);
+	vStringDelete (nameFree);
 
 	return readNext;
 }
@@ -677,6 +724,10 @@ static void enterScope (tokenInfo *const parentToken,
 						readNext = parseClass (token);
 						break;
 
+					case KEYWORD_enum:
+						readNext = parseEnum (token);
+						break;
+
 					default: break;
 				}
 				break;