Fix up C++20 module pseudo-keyword masking variables/members

jevinskie · jevinskie · commit 60391cbe2673 · 2024-04-02T01:33:32.000-04:00
diff --git a/src/code.l b/src/code.l
@@ -953,6 +953,7 @@ ENDQopt ("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"seale
                                         }
 <Body>"module"/{B}*[:;]?                { // 'module X' or 'module : private' or 'module;'
                                           if (yyextra->lang!=SrcLangExt::Cpp) REJECT;
+                                          if (!yyextra->type.isEmpty() || !yyextra->name.isEmpty()) REJECT;
                                           startFontClass(yyscanner,"keyword");
                                           codifyLines(yyscanner,yytext);
                                           endFontClass(yyscanner);
diff --git a/src/scanner.l b/src/scanner.l
@@ -1084,6 +1084,7 @@ NONLopt [^\n]*
                                         }
 <FindMembers>{B}*"module"{BN}*";"       { // global module section
                                           if (!yyextra->insideCpp) REJECT;
+                                          if (!yyextra->current->type.isEmpty() || !yyextra->current->name.isEmpty()) REJECT;
                                           //printf("Implementation module unit\n");
                                           lineCount(yyscanner);
                                           BEGIN( FindMembers );

Original file line number	Diff line number	Diff line change
`@@ -953,6 +953,7 @@ ENDQopt ("const"\|"volatile"\|"sealed"\|"override")({BN}+("const"\|"volatile"\|"seale`
`953`	`953`	`}`
`954`	`954`	`<Body>"module"/{B}*[:;]? { // 'module X' or 'module : private' or 'module;'`
`955`	`955`	`if (yyextra->lang!=SrcLangExt::Cpp) REJECT;`
	`956`	`+ if (!yyextra->type.isEmpty() \|\| !yyextra->name.isEmpty()) REJECT;`
`956`	`957`	`startFontClass(yyscanner,"keyword");`
`957`	`958`	`codifyLines(yyscanner,yytext);`
`958`	`959`	`endFontClass(yyscanner);`
Original file line number	Diff line number	Diff line change
`@@ -1084,6 +1084,7 @@ NONLopt [^\n]*`
`1084`	`1084`	`}`
`1085`	`1085`	`<FindMembers>{B}"module"{BN}";" { // global module section`
`1086`	`1086`	`if (!yyextra->insideCpp) REJECT;`
	`1087`	`+ if (!yyextra->current->type.isEmpty() \|\| !yyextra->current->name.isEmpty()) REJECT;`
`1087`	`1088`	`//printf("Implementation module unit\n");`
`1088`	`1089`	`lineCount(yyscanner);`
`1089`	`1090`	`BEGIN( FindMembers );`