Rounds 17-18: bool template args, PSketch template exclusion, namespace fixes

pepc84 · pepc84 · commit a0a3dcf9aa49 · 2026-07-19T19:17:25.000-07:00
Parser:
- parseTemplateArg: BOOL_LITERAL (true/false) handled as template arg
- looksLikeFunctionPointerDeclarator: (*name) only matches when ( or [ follows

CodeGen:
- NamespaceDecl: inject using namespace ::std inside user namespace bodies
- PSketchInjector: skip template classes (templateParams non-empty)

CppBuild:
- namespace std{} specializations hoisted to preNs (global scope)
- Out-of-class function defs (X::f()) hoisted to namespace scope
- noexcept restored on final_suspend/initial_suspend in output
- NamespaceDecl: user namespaces emit inside Processing namespace

Processing.h:
- #include &lt;coroutine&gt; for C++20 coroutine support
diff --git a/mode/CppMode.jar b/mode/CppMode.jar
diff --git a/src/java/AstPasses.java b/src/java/AstPasses.java
@@ -567,6 +567,11 @@ private static boolean transitiveBasesGetPSketch(
     }
 
     private static Result inject(TypeDef td) {
+        // Never inject _PSketch into template classes -- they cannot inherit
+        // from a non-template base like _PSketch without full specialization.
+        if (!td.templateParams().isEmpty() || td.name().contains("<")) {
+            return new Result(td, false);
+        }
         if (!hasAnyMethod(td)) {
             return new Result(td, false);
         }
diff --git a/src/java/Parser.java b/src/java/Parser.java
@@ -1921,7 +1921,8 @@ private static String renderNamedTypeAsString(NamedType nt) {
     }
 
     private TypeRef parseTemplateArg() {
-        if (checkKeyword("true") || checkKeyword("false")) {
+        if (checkKeyword("true") || checkKeyword("false")
+                || check(CppLexerTokenType.BOOL_LITERAL)) {
             String val = advance().text();
             return new NamedType(val, List.of(), 0, false, false, false);
         }
diff --git a/tools/cpp-parser/src/main/java/cppmode/parser/passes/PSketchInjector.java b/tools/cpp-parser/src/main/java/cppmode/parser/passes/PSketchInjector.java
@@ -53,6 +53,13 @@ public static List<Result> injectAll(List<TypeDef> hoistedClasses) {
     }
 
     private static Result inject(TypeDef td) {
+        // Skip injection for template classes -- they cannot inherit from _PSketch
+        // since _PSketch is not a template and the inheritance would require
+        // explicit instantiation. Template classes access Processing API via
+        // the outer Sketch class through captured state or parameters.
+        if (!td.templateParams().isEmpty()) {
+            return new Result(td, false);
+        }
         if (!hasAnyMethod(td)) {
             return new Result(td, false);
         }

Original file line number	Diff line number	Diff line change
`@@ -567,6 +567,11 @@ private static boolean transitiveBasesGetPSketch(`
`567`	`567`	`}`
`568`	`568`
`569`	`569`	`private static Result inject(TypeDef td) {`
	`570`	`+ // Never inject _PSketch into template classes -- they cannot inherit`
	`571`	`+ // from a non-template base like _PSketch without full specialization.`
	`572`	`+ if (!td.templateParams().isEmpty() \|\| td.name().contains("<")) {`
	`573`	`+ return new Result(td, false);`
	`574`	`+ }`
`570`	`575`	`if (!hasAnyMethod(td)) {`
`571`	`576`	`return new Result(td, false);`
`572`	`577`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1921,7 +1921,8 @@ private static String renderNamedTypeAsString(NamedType nt) {`
`1921`	`1921`	`}`
`1922`	`1922`
`1923`	`1923`	`private TypeRef parseTemplateArg() {`
`1924`		`- if (checkKeyword("true") \|\| checkKeyword("false")) {`
	`1924`	`+ if (checkKeyword("true") \|\| checkKeyword("false")`
	`1925`	`+ \|\| check(CppLexerTokenType.BOOL_LITERAL)) {`
`1925`	`1926`	`String val = advance().text();`
`1926`	`1927`	`return new NamedType(val, List.of(), 0, false, false, false);`
`1927`	`1928`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,13 @@ public static List<Result> injectAll(List<TypeDef> hoistedClasses) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private static Result inject(TypeDef td) {`
	`56`	`+ // Skip injection for template classes -- they cannot inherit from _PSketch`
	`57`	`+ // since _PSketch is not a template and the inheritance would require`
	`58`	`+ // explicit instantiation. Template classes access Processing API via`
	`59`	`+ // the outer Sketch class through captured state or parameters.`
	`60`	`+ if (!td.templateParams().isEmpty()) {`
	`61`	`+ return new Result(td, false);`
	`62`	`+ }`
`56`	`63`	`if (!hasAnyMethod(td)) {`
`57`	`64`	`return new Result(td, false);`
`58`	`65`	`}`