Merge pull request #4337 from masatake/typescript--optional-prop

TypeScript: extract optional property in class

Author: masatake

Units/parser-typescript.r/ts-class.d/expected.tags

@@ -69,3 +69,6 @@ tasks	input.ts	/^  private tasks: string[] = [];$/;"	p	class:TasksService
 taskObj	input.ts	/^  private taskObj: object = {};$/;"	p	class:TasksService
 getAllTasks	input.ts	/^  getAllTasks(): string[] {$/;"	m	class:TasksService
 getTaskObj	input.ts	/^  getTaskObj(): object {$/;"	m	class:TasksService
+Test	input-0.ts	/^export class Test {$/;"	c
+var	input-0.ts	/^    public var?: string;$/;"	p	class:Test
+foo	input-0.ts	/^    public foo() {$/;"	m	class:Test

Units/parser-typescript.r/ts-class.d/input-0.ts

@@ -0,0 +1,8 @@
+// Taken from the #4336 reported by @zeerd
+export class Test {
+    public var?: string;
+
+    public foo() {
+        return 'hello';
+    }
+}

parsers/typescript.c

@@ -1652,9 +1652,9 @@ static void parseConstructorParams (const int classScope, const int constrScope,
 }
 
 MULTI_CHAR_PARSER_DEF (ClassBodyChars, "\n,{", TOKEN_NL, TOKEN_COMMA, TOKEN_OPEN_CURLY)
-MULTI_CHAR_PARSER_DEF (ClassBodyAfterCurlyChars, "\n}*@(:;=-+/^<>.,|&",
+MULTI_CHAR_PARSER_DEF (ClassBodyAfterCurlyChars, "\n}*@(?:;=-+/^<>.,|&",
 		TOKEN_NL, TOKEN_CLOSE_CURLY, TOKEN_STAR, TOKEN_AT, TOKEN_OPEN_PAREN,
-		TOKEN_COLON, TOKEN_SEMICOLON, TOKEN_EQUAL_SIGN,
+		TOKEN_QUESTION_MARK, TOKEN_COLON, TOKEN_SEMICOLON, TOKEN_EQUAL_SIGN,
 		TOKEN_MINUS, TOKEN_PLUS, TOKEN_DIV, TOKEN_POWER,
 		TOKEN_GREATER, TOKEN_LOWER, TOKEN_PERIOD, TOKEN_COMMA,
 		TOKEN_PIPE, TOKEN_AMPERSAND)
@@ -1808,6 +1808,8 @@ static void parseClassBody (const int scope, tokenInfo *const token)
 					}
 					parsingValue = true;
 					break;
+				case TOKEN_QUESTION_MARK:
+					break;		/* Just consuming the token */
 				case TOKEN_COLON:
 					uwiUngetC (':');
 					parsePropertyType (token);