Merge pull request #3531 from kumarstack55/develop

PowerShell: parse a colon following the class name

Author: masatake

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

@@ -1,4 +1,6 @@
 MyException	input.ps1	/^class MyException : Exception {$/;"	c
+Derived	input.ps1	/^class Derived : Base {$/;"	c
+Derived2	input.ps1	/^class Derived2: Base {$/;"	c
 Foo	input.ps1	/^class Foo {$/;"	c
 GetBar	input.ps1	/^function GetBar {$/;"	f
 GetBaz	input.ps1	/^function GetBaz() {$/;"	f	signature:()

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

@@ -4,6 +4,12 @@ class MyException : Exception {
     }
 }
 
+class Derived : Base {
+}
+
+class Derived2: Base {
+}
+
 class Foo {
     $Property1
     $Property2 = 20

parsers/powershell.c

@@ -218,7 +218,12 @@ static void addToScope (tokenInfo *const token, const vString *const extra)
 
 static bool isIdentChar (const int c)
 {
-	return (isalnum (c) || c == ':' || c == '_' || c == '-' || c >= 0x80);
+	return (isalnum (c) || c == '_' || c == '-' || c >= 0x80);
+}
+
+static bool isScopeIdentifierChar (const int c)
+{
+	return (isIdentChar (c) || c == ':');
 }
 
 static void parseString (vString *const string, const int delimiter)
@@ -228,20 +233,40 @@ static void parseString (vString *const string, const int delimiter)
 		int c = getcFromInputFile ();
 
 		if (c == '\\' && (c = getcFromInputFile ()) != EOF)
-			vStringPut (string, (char) c);
+			vStringPut (string, c);
 		else if (c == EOF || c == delimiter)
 			break;
 		else
-			vStringPut (string, (char) c);
+			vStringPut (string, c);
 	}
 }
 
+/* parse a identifier that may contain scopes, such as function names and
+ * variable names.
+ *
+ * 	VariableName
+ * 	FunctionName
+ * 	local:VariableName
+ * 	private:FunctionName
+ */
+static void parseScopeIdentifier (vString *const string, const int firstChar)
+{
+	int c = firstChar;
+	do
+	{
+		vStringPut (string, c);
+		c = getcFromInputFile ();
+	} while (isScopeIdentifierChar (c));
+	ungetcToInputFile (c);
+}
+
+/* parse a identifier that do not contain scope, such as class names. */
 static void parseIdentifier (vString *const string, const int firstChar)
 {
 	int c = firstChar;
 	do
 	{
-		vStringPut (string, (char) c);
+		vStringPut (string, c);
 		c = getcFromInputFile ();
 	} while (isIdentChar (c));
 	ungetcToInputFile (c);
@@ -365,14 +390,14 @@ static void readToken (tokenInfo *const token)
 		case '$': /* variable start */
 		{
 			int d = getcFromInputFile ();
-			if (! isIdentChar (d))
+			if (! isScopeIdentifierChar (d))
 			{
 				ungetcToInputFile (d);
 				token->type = TOKEN_UNDEFINED;
 			}
 			else
 			{
-				parseIdentifier (token->string, d);
+				parseScopeIdentifier (token->string, d);
 				token->type = TOKEN_VARIABLE;
 			}
 			break;
@@ -383,7 +408,11 @@ static void readToken (tokenInfo *const token)
 				token->type = TOKEN_UNDEFINED;
 			else
 			{
-				parseIdentifier (token->string, c);
+				if (token->keyword == KEYWORD_function ||
+						token->keyword == KEYWORD_filter)
+					parseScopeIdentifier (token->string, c);
+				else
+					parseIdentifier (token->string, c);
 				token->keyword = lookupCaseKeyword (
 						vStringValue (token->string), getInputLanguage ());
 				if (token->keyword == KEYWORD_NONE)
@@ -536,6 +565,7 @@ static bool parseFunction (tokenInfo *const token, int kind)
 /* parse a class
  *
  * 	class MyClass {}
+ * 	class Derived : Base {}
  */
 static bool parseClass (tokenInfo *const token)
 {