Round 11 CodeGen fixes + AST field additions

CodeGen:
- operator[] and operator() no longer get friend prefix (C++23 member operators)
- Template args in expression context: AutoParam<42>::value parsed correctly

AST:
- NamedType: added isRvalueRef field for && references
- IfStatement: added isConstexpr field
- Param: added isVariadic field

Parser:
- Deduction guide reconstruction now includes spaces between tokens
- Friend functions parsed via parseFunctionOrVariable instead of swallowed

Author: pepc84

mode/CppMode.jar

@@ -193,7 +193,9 @@ private static void emitTypeDef(StringBuilder sb, TypeDef td, int depth) {
             if (member instanceof FunctionDecl fd && fd.body() != null
                     && !fd.isConstructor() && !fd.isDestructor() && !fd.isStatic()
                     && fd.params().size() >= 2
-                    && fd.name().startsWith("operator")) {
+                    && fd.name().startsWith("operator")
+                    && !fd.name().equals("operator[]")
+                    && !fd.name().equals("operator()")) {
                 indent(sb, depth + 1);
                 sb.append("friend ");
                 emitFunctionDecl(sb, fd, 0);
@@ -560,7 +562,7 @@ private static void emitParamList(StringBuilder sb, List<Param> params) {
                 TypeRef base = p.type();
                 if (base instanceof NamedType nt && nt.pointerDepth() > 0) {
                     base = new NamedType(nt.baseName(), nt.templateArgs(),
-                        nt.pointerDepth() - 1, nt.isReference(), nt.isConst());
+                        nt.pointerDepth() - 1, nt.isReference(), nt.isConst(), false);
                 }
                 sb.append(renderTypeRef(base)).append(" (*").append(p.name()).append(")");
                 for (int dim : p.innerArrayDims()) {

src/java/CodeGen.java

@@ -478,8 +478,9 @@ private List<TopLevelItem> parseTopLevelItem(List<CppLexerToken> leadingComments
                 int startPos = pos;
                 while (!isAtEnd() && !checkPunct(";")) advance();
                 matchPunct(";");
+                // Reconstruct without spaces, up to but not including the ";" we consumed
                 StringBuilder raw = new StringBuilder();
-                for (int i = startPos; i < pos; i++) { if (i > startPos) raw.append(" "); raw.append(tokens.get(i).text()); }
+                for (int i = startPos; i < pos - 1; i++) { if (i > startPos) raw.append(" "); raw.append(tokens.get(i).text()); }
                 raw.append(";");
                 return List.of(new PreprocessorLine(raw.toString(), tokens.get(startPos).line(), tokens.get(startPos).col(), leadingComments));
             }
@@ -891,22 +892,17 @@ private List<TopLevelItem> parseClassMember(List<CppLexerToken> leadingComments,
         // friend declaration: "friend class Foo;" or "friend Box<U> makeBox(U v);"
         if (checkKeyword("friend")) {
             int startPos = pos; advance(); // consume friend
-            // Consume to ; skipping over <> and ()
-            int _fd = 0;
-            while (!isAtEnd()) {
-                if (checkPunct("(") || checkOp("<")) { _fd++; advance(); }
-                else if (checkPunct(")") || checkOp(">")) { _fd--; advance(); }
-                else if (checkOp(">>")) { _fd -= 2; advance(); }
-                else if (checkPunct(";") && _fd == 0) { advance(); break; }
-                else if (checkPunct("{") && _fd == 0) {
-                    // friend function with body
-                    int bd = 1; advance();
-                    while (!isAtEnd() && bd > 0) { if (checkPunct("{")) bd++; else if (checkPunct("}")) bd--; advance(); }
-                    break;
-                }
-                else advance();
+            // "friend class/struct Foo" -- forward decl, consume verbatim
+            if (checkKeyword("class") || checkKeyword("struct")) {
+                while (!isAtEnd() && !checkPunct(";")) advance();
+                matchPunct(";");
+                return List.of(new PreprocessorLine("// friend class", tokens.get(startPos).line(), tokens.get(startPos).col(), leadingComments));
             }
-            return List.of(new PreprocessorLine("// friend", tokens.get(startPos).line(), tokens.get(startPos).col(), leadingComments));
+            // "friend RetType funcName(...)" or "friend RetType operator...()" -- parse as function
+            // Consume template params if present
+            List<String> friendTemplateParams = List.of();
+            if (matchKeyword("template")) friendTemplateParams = parseTemplateParamList();
+            return parseFunctionOrVariable(leadingComments, friendTemplateParams, false);
         }
         // explicit(...): conditional explicit specifier (C++20)
         if (checkKeyword("explicit") && pos + 1 < tokens.size() && tokens.get(pos + 1).isPunct("(")) {
@@ -2293,6 +2289,27 @@ private Expr parsePostfix() {
                     expr = new Identifier("::" + member,
                         peek().line(), peek().col(), List.of());
                 }
+            // Template args in expression: "AutoParam<42>::value"
+            } else if (checkOp("<") && expr instanceof Identifier eid && looksLikeTemplateArgList()) {
+                int argStart = pos;
+                advance(); // consume <
+                int depth = 1, pd = 0, bd = 0;
+                while (!isAtEnd() && depth > 0) {
+                    if (checkPunct("(") || checkPunct("[")) pd++;
+                    else if (checkPunct(")") || checkPunct("]")) pd--;
+                    else if (checkPunct("{")) bd++;
+                    else if (checkPunct("}")) bd--;
+                    else if (pd == 0 && bd == 0) {
+                        if (checkOp("<")) depth++;
+                        else if (checkOp(">")) { depth--; if (depth == 0) { advance(); break; } }
+                        else if (checkOp(">>")) { depth -= 2; splitTrailingShiftIntoTwoCloseAngles(); if (depth <= 0) { advance(); break; } }
+                    }
+                    if (depth > 0) advance();
+                }
+                StringBuilder targs = new StringBuilder(eid.name()).append("<");
+                for (int i = argStart + 1; i < pos - 1; i++) targs.append(tokens.get(i).text());
+                targs.append(">");
+                expr = new Identifier(targs.toString(), eid.line(), eid.col(), List.of());
             } else if (checkOp("->*")) {
                 // "->*" lexed as a single token
                 CppLexerToken t = advance();