Improve type name handling

usiems · mrbean-bremen · commit ea43cc86f107 · 2023-11-24T14:21:05.000+01:00
diff --git a/generator/parser/parser.cpp b/generator/parser/parser.cpp
@@ -735,7 +735,7 @@ bool Parser::parseUsing(DeclarationAST *&node)
       nextToken();
     }
 
-  if (!parseName(ast->name))
+  if (!parseName(ast->name, /*acceptTemplateId=*/true))
     return false;
 
   ADVANCE(';', ";");
@@ -1151,6 +1151,10 @@ bool Parser::parseSimpleTypeSpecifier(TypeSpecifierAST *&node,
     }
   else
     {
+      if (token_stream.lookAhead() == Token_typename)
+        {
+          nextToken(); // simply skip for now
+        }
       if (!parseName(ast->name, true))
         {
           ast->name = 0;

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ bool Parser::parseUsing(DeclarationAST *&node)`
`735`	`735`	`nextToken();`
`736`	`736`	`}`
`737`	`737`
`738`		`- if (!parseName(ast->name))`
	`738`	`+ if (!parseName(ast->name, /acceptTemplateId=/true))`
`739`	`739`	`return false;`
`740`	`740`
`741`	`741`	`ADVANCE(';', ";");`
`@@ -1151,6 +1151,10 @@ bool Parser::parseSimpleTypeSpecifier(TypeSpecifierAST *&node,`
`1151`	`1151`	`}`
`1152`	`1152`	`else`
`1153`	`1153`	`{`
	`1154`	`+ if (token_stream.lookAhead() == Token_typename)`
	`1155`	`+ {`
	`1156`	`+ nextToken(); // simply skip for now`
	`1157`	`+ }`
`1154`	`1158`	`if (!parseName(ast->name, true))`
`1155`	`1159`	`{`
`1156`	`1160`	`ast->name = 0;`