Step 150: add Rust parser and generator

editor/CMakeLists.txt

@@ -842,6 +842,13 @@ target_link_libraries(step149_test PRIVATE
     unofficial::tree-sitter::tree-sitter
     tree_sitter_java)
 
+add_executable(step150_test tests/step150_test.cpp)
+target_include_directories(step150_test PRIVATE src)
+target_link_libraries(step150_test PRIVATE
+    nlohmann_json::nlohmann_json
+    unofficial::tree-sitter::tree-sitter
+    tree_sitter_rust)
+
 find_package(SDL2 CONFIG REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(glad CONFIG REQUIRED)

editor/src/APIDocGenerator.h

@@ -16,13 +16,14 @@ public:
         return {
             // Parsers
             {"TreeSitterParser", "parser",
-             "Parses source code (Python, C++, Elisp, JavaScript, TypeScript, Java) into Whetstone AST using tree-sitter grammars",
+             "Parses source code (Python, C++, Elisp, JavaScript, TypeScript, Java, Rust) into Whetstone AST using tree-sitter grammars",
              {"parsePython(source)", "parsePythonWithDiagnostics(source)",
               "parseCpp(source)", "parseCppWithDiagnostics(source)",
               "parseElisp(source)", "parseElispWithDiagnostics(source)",
               "parseJavaScript(source)", "parseJavaScriptWithDiagnostics(source)",
               "parseTypeScript(source)", "parseTypeScriptWithDiagnostics(source)",
-              "parseJava(source)", "parseJavaWithDiagnostics(source)"}},
+              "parseJava(source)", "parseJavaWithDiagnostics(source)",
+              "parseRust(source)", "parseRustWithDiagnostics(source)"}},
 
             // Generators
             {"PythonGenerator", "generator",
@@ -49,6 +50,10 @@ public:
              "Generates Java source code from Whetstone AST",
              {"generate(node)"}},
 
+            {"RustGenerator", "generator",
+             "Generates Rust source code from Whetstone AST",
+             {"generate(node)"}},
+
             // Validators
             {"AnnotationValidator", "validator",
              "Validates memory annotations for correctness: missing intent, aliasing, conflicts",

editor/src/EditorUtils.h

@@ -54,6 +54,10 @@ static std::string generateForLanguage(const Module* ast, const std::string& lan
         JavaGenerator gen;
         return gen.generate(ast);
     }
+    if (language == "rust") {
+        RustGenerator gen;
+        return gen.generate(ast);
+    }
     PythonGenerator gen;
     return gen.generate(ast);
 }

editor/src/Orchestrator.h

@@ -404,6 +404,8 @@ public:
             targetLanguage = "typescript";
         } else if (path.substr(path.find_last_of(".") + 1) == "java") {
             targetLanguage = "java";
+        } else if (path.substr(path.find_last_of(".") + 1) == "rs") {
+            targetLanguage = "rust";
         }
         
         // Parse the content using the appropriate tree-sitter parser
@@ -420,6 +422,8 @@ public:
             module = TreeSitterParser::parseTypeScript(content);
         } else if (targetLanguage == "java") {
             module = TreeSitterParser::parseJava(content);
+        } else if (targetLanguage == "rust") {
+            module = TreeSitterParser::parseRust(content);
         } else {
             // For unknown languages, create a basic module with the content
             module = std::make_unique<Module>();
@@ -457,6 +461,8 @@ public:
                 targetLanguage = "typescript";
             } else if (path.substr(path.find_last_of(".") + 1) == "java") {
                 targetLanguage = "java";
+            } else if (path.substr(path.find_last_of(".") + 1) == "rs") {
+                targetLanguage = "rust";
             }
         }
         
@@ -480,6 +486,9 @@ public:
         } else if (targetLanguage == "java") {
             JavaGenerator gen;
             content = gen.generate(ast);
+        } else if (targetLanguage == "rust") {
+            RustGenerator gen;
+            content = gen.generate(ast);
         } else {
             // Default to Python generator for unknown languages
             PythonGenerator gen;

editor/src/Pipeline.h

@@ -102,6 +102,10 @@ public:
             auto pr = TreeSitterParser::parseJavaWithDiagnostics(source);
             diags = std::move(pr.diagnostics);
             return std::move(pr.module);
+        } else if (language == "rust") {
+            auto pr = TreeSitterParser::parseRustWithDiagnostics(source);
+            diags = std::move(pr.diagnostics);
+            return std::move(pr.module);
         }
         return nullptr;
     }
@@ -127,6 +131,9 @@ public:
         } else if (language == "java") {
             JavaGenerator gen;
             return gen.generate(ast);
+        } else if (language == "rust") {
+            RustGenerator gen;
+            return gen.generate(ast);
         }
         return "";
     }

editor/src/TextASTSync.h

@@ -50,6 +50,9 @@ public:
         } else if (language_ == "java") {
             JavaGenerator gen;
             return gen.generate(module_.get());
+        } else if (language_ == "rust") {
+            RustGenerator gen;
+            return gen.generate(module_.get());
         }
         return text_;
     }
@@ -68,6 +71,8 @@ public:
             module_ = TreeSitterParser::parseTypeScript(text_);
         } else if (language_ == "java") {
             module_ = TreeSitterParser::parseJava(text_);
+        } else if (language_ == "rust") {
+            module_ = TreeSitterParser::parseRust(text_);
         }
         parsePending_ = false;
     }

editor/src/ast/Generator.h

@@ -7,3 +7,4 @@
 #include "CppGenerator.h"
 #include "JavaScriptGenerator.h"
 #include "JavaGenerator.h"
+#include "RustGenerator.h"

editor/src/ast/Parser.h

@@ -25,6 +25,7 @@ extern "C" {
     const TSLanguage* tree_sitter_javascript();
     const TSLanguage* tree_sitter_typescript();
     const TSLanguage* tree_sitter_java();
+    const TSLanguage* tree_sitter_rust();
 }
 
 // Unique ID generator for AST nodes
@@ -316,6 +317,49 @@ public:
         return result;
     }
 
+    // ---------------------------------------------------------------
+    //  Rust
+    // ---------------------------------------------------------------
+    static std::unique_ptr<Module> parseRust(const std::string& source) {
+        TSParser* parser = ts_parser_new();
+        ts_parser_set_language(parser, tree_sitter_rust());
+        TSTree* tree = ts_parser_parse_string(parser, nullptr, source.c_str(), (uint32_t)source.size());
+        TSNode root = ts_tree_root_node(tree);
+
+        auto module = std::make_unique<Module>();
+        module->id = IdGenerator::next("mod");
+        module->name = "parsed_rust_module";
+        module->targetLanguage = "rust";
+        applySpan(module.get(), root);
+
+        convertRustCrate(root, source, module.get());
+
+        ts_tree_delete(tree);
+        ts_parser_delete(parser);
+        return module;
+    }
+
+    static ParseResult parseRustWithDiagnostics(const std::string& source) {
+        ParseResult result;
+        TSParser* parser = ts_parser_new();
+        ts_parser_set_language(parser, tree_sitter_rust());
+        TSTree* tree = ts_parser_parse_string(parser, nullptr, source.c_str(), (uint32_t)source.size());
+        TSNode root = ts_tree_root_node(tree);
+
+        result.module = std::make_unique<Module>();
+        result.module->id = IdGenerator::next("mod");
+        result.module->name = "parsed_rust_module";
+        result.module->targetLanguage = "rust";
+        applySpan(result.module.get(), root);
+
+        convertRustCrate(root, source, result.module.get());
+        collectDiagnostics(root, source, result.diagnostics);
+
+        ts_tree_delete(tree);
+        ts_parser_delete(parser);
+        return result;
+    }
+
 private:
     // ---------------------------------------------------------------
     //  Helpers
@@ -2193,4 +2237,422 @@ private:
         }
         return TSNode{};
     }
+
+    // ---------------------------------------------------------------
+    //  Rust CST -> AST
+    // ---------------------------------------------------------------
+    static void convertRustCrate(TSNode root,
+                                 const std::string& source,
+                                 Module* module) {
+        uint32_t count = ts_node_named_child_count(root);
+        for (uint32_t i = 0; i < count; ++i) {
+            TSNode child = ts_node_named_child(root, i);
+            std::string type = nodeType(child);
+            if (type == "use_declaration") {
+                TSNode arg = childByFieldName(child, "argument");
+                std::string importName = nodeText(arg, source);
+                if (importName.empty()) importName = nodeText(child, source);
+                if (!importName.empty()) {
+                    auto* imp = new Import(IdGenerator::next("imp"), importName, "module");
+                    module->addChild("imports", imp);
+                }
+            } else if (type == "function_item") {
+                auto* fn = convertRustFunction(child, source, "");
+                if (fn) module->addChild("functions", fn);
+            } else if (type == "impl_item") {
+                convertRustImpl(child, source, module);
+            } else if (type == "struct_item" || type == "enum_item" || type == "trait_item") {
+                // Record type name as a custom type variable for visibility.
+                TSNode nameNode = childByFieldName(child, "name");
+                if (!ts_node_is_null(nameNode)) {
+                    auto* var = new Variable(IdGenerator::next("var"), nodeText(nameNode, source));
+                    module->addChild("variables", var);
+                }
+            }
+        }
+    }
+
+    static void convertRustImpl(TSNode node,
+                                const std::string& source,
+                                Module* module) {
+        TSNode typeNode = childByFieldName(node, "type");
+        std::string typeName = nodeText(typeNode, source);
+        TSNode bodyNode = childByFieldName(node, "body");
+        if (ts_node_is_null(bodyNode)) return;
+        uint32_t count = ts_node_named_child_count(bodyNode);
+        for (uint32_t i = 0; i < count; ++i) {
+            TSNode child = ts_node_named_child(bodyNode, i);
+            if (nodeType(child) == "function_item" || nodeType(child) == "function_signature_item") {
+                auto* fn = convertRustFunction(child, source, typeName);
+                if (fn) module->addChild("functions", fn);
+            }
+        }
+    }
+
+    static Function* convertRustFunction(TSNode node,
+                                         const std::string& source,
+                                         const std::string& receiverType) {
+        TSNode nameNode = childByFieldName(node, "name");
+        if (ts_node_is_null(nameNode)) return nullptr;
+        auto* fn = new Function();
+        fn->id = IdGenerator::next("fn");
+        applySpan(fn, node);
+        std::string name = nodeText(nameNode, source);
+        if (!receiverType.empty()) {
+            fn->name = receiverType + "." + name;
+        } else {
+            fn->name = name;
+        }
+
+        TSNode paramsNode = childByFieldName(node, "parameters");
+        if (!ts_node_is_null(paramsNode)) {
+            convertRustParameters(paramsNode, source, fn);
+        }
+
+        TSNode retNode = childByFieldName(node, "return_type");
+        if (!ts_node_is_null(retNode)) {
+            if (auto* t = convertRustType(retNode, source)) fn->setChild("returnType", t);
+        }
+
+        TSNode bodyNode = childByFieldName(node, "body");
+        if (!ts_node_is_null(bodyNode)) {
+            convertRustBlock(bodyNode, source, fn);
+        }
+
+        auto* lifetime = new LifetimeAnnotation(IdGenerator::next("anno"), "RAII");
+        fn->addChild("annotations", lifetime);
+        return fn;
+    }
+
+    static void convertRustParameters(TSNode paramsNode,
+                                      const std::string& source,
+                                      Function* fn) {
+        uint32_t count = ts_node_named_child_count(paramsNode);
+        for (uint32_t i = 0; i < count; ++i) {
+            TSNode child = ts_node_named_child(paramsNode, i);
+            std::string type = nodeType(child);
+            if (type == "self_parameter") {
+                auto* param = new Parameter(IdGenerator::next("param"), "self");
+                applySpan(param, child);
+                fn->addChild("parameters", param);
+            } else if (type == "parameter") {
+                TSNode patternNode = childByFieldName(child, "pattern");
+                TSNode typeNode = childByFieldName(child, "type");
+                if (ts_node_is_null(patternNode)) continue;
+                auto* param = new Parameter(IdGenerator::next("param"), nodeText(patternNode, source));
+                applySpan(param, child);
+                if (!ts_node_is_null(typeNode)) {
+                    if (auto* t = convertRustType(typeNode, source)) param->setChild("type", t);
+                }
+                fn->addChild("parameters", param);
+            }
+        }
+    }
+
+    static void convertRustBlock(TSNode blockNode,
+                                 const std::string& source,
+                                 Function* fn) {
+        uint32_t count = ts_node_named_child_count(blockNode);
+        for (uint32_t i = 0; i < count; ++i) {
+            ASTNode* stmt = convertRustStatement(ts_node_named_child(blockNode, i), source);
+            if (stmt) fn->addChild("body", stmt);
+        }
+    }
+
+    static ASTNode* convertRustStatement(TSNode node,
+                                         const std::string& source) {
+        std::string type = nodeType(node);
+        if (type == "return_expression") {
+            auto* ret = new Return();
+            ret->id = IdGenerator::next("ret");
+            applySpan(ret, node);
+            if (ts_node_named_child_count(node) > 0) {
+                ASTNode* val = convertRustExpression(ts_node_named_child(node, 0), source);
+                if (val) ret->setChild("value", val);
+            }
+            return ret;
+        } else if (type == "let_declaration") {
+            auto* assign = new Assignment();
+            assign->id = IdGenerator::next("assign");
+            applySpan(assign, node);
+            TSNode patternNode = childByFieldName(node, "pattern");
+            TSNode valueNode = childByFieldName(node, "value");
+            if (!ts_node_is_null(patternNode)) {
+                auto* target = new VariableReference(IdGenerator::next("var"), nodeText(patternNode, source));
+                assign->setChild("target", target);
+            }
+            if (!ts_node_is_null(valueNode)) {
+                ASTNode* val = convertRustExpression(valueNode, source);
+                if (val) assign->setChild("value", val);
+            }
+            return assign;
+        } else if (type == "expression_statement") {
+            auto* exprStmt = new ExpressionStatement();
+            exprStmt->id = IdGenerator::next("exprstmt");
+            applySpan(exprStmt, node);
+            if (ts_node_named_child_count(node) > 0) {
+                ASTNode* expr = convertRustExpression(ts_node_named_child(node, 0), source);
+                if (expr) exprStmt->setChild("expression", expr);
+            }
+            return exprStmt;
+        } else if (type == "if_expression") {
+            auto* ifStmt = new IfStatement();
+            ifStmt->id = IdGenerator::next("if");
+            applySpan(ifStmt, node);
+            TSNode condNode = childByFieldName(node, "condition");
+            if (!ts_node_is_null(condNode)) {
+                ASTNode* cond = convertRustExpression(condNode, source);
+                if (cond) ifStmt->setChild("condition", cond);
+            }
+            TSNode consNode = childByFieldName(node, "consequence");
+            if (!ts_node_is_null(consNode)) {
+                uint32_t cc = ts_node_named_child_count(consNode);
+                for (uint32_t i = 0; i < cc; ++i) {
+                    ASTNode* s = convertRustStatement(ts_node_named_child(consNode, i), source);
+                    if (s) ifStmt->addChild("thenBranch", s);
+                }
+            }
+            TSNode altNode = childByFieldName(node, "alternative");
+            if (!ts_node_is_null(altNode)) {
+                uint32_t ac = ts_node_named_child_count(altNode);
+                for (uint32_t i = 0; i < ac; ++i) {
+                    ASTNode* s = convertRustStatement(ts_node_named_child(altNode, i), source);
+                    if (s) ifStmt->addChild("elseBranch", s);
+                }
+            }
+            return ifStmt;
+        } else if (type == "while_expression") {
+            auto* loop = new WhileLoop();
+            loop->id = IdGenerator::next("while");
+            applySpan(loop, node);
+            TSNode condNode = childByFieldName(node, "condition");
+            if (!ts_node_is_null(condNode)) {
+                ASTNode* cond = convertRustExpression(condNode, source);
+                if (cond) loop->setChild("condition", cond);
+            }
+            TSNode bodyNode = childByFieldName(node, "body");
+            if (!ts_node_is_null(bodyNode)) {
+                uint32_t bc = ts_node_named_child_count(bodyNode);
+                for (uint32_t i = 0; i < bc; ++i) {
+                    ASTNode* s = convertRustStatement(ts_node_named_child(bodyNode, i), source);
+                    if (s) loop->addChild("body", s);
+                }
+            }
+            return loop;
+        } else if (type == "for_expression") {
+            auto* loop = new ForLoop();
+            loop->id = IdGenerator::next("for");
+            applySpan(loop, node);
+            TSNode patternNode = childByFieldName(node, "pattern");
+            if (!ts_node_is_null(patternNode)) {
+                loop->iteratorName = nodeText(patternNode, source);
+            }
+            TSNode valueNode = childByFieldName(node, "value");
+            if (!ts_node_is_null(valueNode)) {
+                ASTNode* iter = convertRustExpression(valueNode, source);
+                if (iter) loop->setChild("iterable", iter);
+            }
+            TSNode bodyNode = childByFieldName(node, "body");
+            if (!ts_node_is_null(bodyNode)) {
+                uint32_t bc = ts_node_named_child_count(bodyNode);
+                for (uint32_t i = 0; i < bc; ++i) {
+                    ASTNode* s = convertRustStatement(ts_node_named_child(bodyNode, i), source);
+                    if (s) loop->addChild("body", s);
+                }
+            }
+            return loop;
+        } else if (type == "block") {
+            auto* block = new Block();
+            block->id = IdGenerator::next("block");
+            applySpan(block, node);
+            uint32_t bc = ts_node_named_child_count(node);
+            for (uint32_t i = 0; i < bc; ++i) {
+                ASTNode* s = convertRustStatement(ts_node_named_child(node, i), source);
+                if (s) block->addChild("statements", s);
+            }
+            return block;
+        }
+
+        ASTNode* expr = convertRustExpression(node, source);
+        if (expr) {
+            auto* exprStmt = new ExpressionStatement();
+            exprStmt->id = IdGenerator::next("exprstmt");
+            applySpan(exprStmt, node);
+            exprStmt->setChild("expression", expr);
+            return exprStmt;
+        }
+        return nullptr;
+    }
+
+    static ASTNode* convertRustExpression(TSNode node,
+                                          const std::string& source) {
+        std::string type = nodeType(node);
+        if (type == "binary_expression") {
+            auto* binOp = new BinaryOperation();
+            binOp->id = IdGenerator::next("binop");
+            applySpan(binOp, node);
+            TSNode leftNode = childByFieldName(node, "left");
+            TSNode rightNode = childByFieldName(node, "right");
+            TSNode opNode = childByFieldName(node, "operator");
+            if (!ts_node_is_null(opNode)) binOp->op = nodeText(opNode, source);
+            if (!ts_node_is_null(leftNode)) {
+                ASTNode* left = convertRustExpression(leftNode, source);
+                if (left) binOp->setChild("left", left);
+            }
+            if (!ts_node_is_null(rightNode)) {
+                ASTNode* right = convertRustExpression(rightNode, source);
+                if (right) binOp->setChild("right", right);
+            }
+            return binOp;
+        } else if (type == "assignment_expression" || type == "compound_assignment_expr") {
+            auto* assign = new Assignment();
+            assign->id = IdGenerator::next("assign");
+            applySpan(assign, node);
+            TSNode leftNode = childByFieldName(node, "left");
+            TSNode rightNode = childByFieldName(node, "right");
+            if (!ts_node_is_null(leftNode)) {
+                ASTNode* target = convertRustExpression(leftNode, source);
+                if (target) assign->setChild("target", target);
+            }
+            if (!ts_node_is_null(rightNode)) {
+                ASTNode* value = convertRustExpression(rightNode, source);
+                if (value) assign->setChild("value", value);
+            }
+            return assign;
+        } else if (type == "call_expression") {
+            auto* call = new FunctionCall();
+            call->id = IdGenerator::next("call");
+            applySpan(call, node);
+            TSNode funcNode = childByFieldName(node, "function");
+            if (!ts_node_is_null(funcNode)) {
+                call->functionName = nodeText(funcNode, source);
+            }
+            TSNode argsNode = childByFieldName(node, "arguments");
+            if (!ts_node_is_null(argsNode)) {
+                uint32_t count = ts_node_named_child_count(argsNode);
+                for (uint32_t i = 0; i < count; ++i) {
+                    ASTNode* arg = convertRustExpression(ts_node_named_child(argsNode, i), source);
+                    if (arg) call->addChild("arguments", arg);
+                }
+            }
+            return call;
+        } else if (type == "field_expression") {
+            auto* mem = new MemberAccess();
+            mem->id = IdGenerator::next("member");
+            applySpan(mem, node);
+            TSNode valueNode = childByFieldName(node, "value");
+            TSNode fieldNode = childByFieldName(node, "field");
+            if (!ts_node_is_null(fieldNode)) {
+                mem->memberName = nodeText(fieldNode, source);
+            }
+            if (!ts_node_is_null(valueNode)) {
+                ASTNode* target = convertRustExpression(valueNode, source);
+                if (target) mem->setChild("target", target);
+            }
+            return mem;
+        } else if (type == "index_expression") {
+            auto* access = new IndexAccess();
+            access->id = IdGenerator::next("index");
+            applySpan(access, node);
+            if (ts_node_named_child_count(node) >= 2) {
+                ASTNode* target = convertRustExpression(ts_node_named_child(node, 0), source);
+                ASTNode* idx = convertRustExpression(ts_node_named_child(node, 1), source);
+                if (target) access->setChild("target", target);
+                if (idx) access->setChild("index", idx);
+            }
+            return access;
+        } else if (type == "identifier") {
+            auto* ref = new VariableReference(IdGenerator::next("var"), nodeText(node, source));
+            applySpan(ref, node);
+            return ref;
+        } else if (type == "integer_literal") {
+            std::string text = nodeText(node, source);
+            int val = 0;
+            try { val = std::stoi(text); } catch (...) {}
+            auto* lit = new IntegerLiteral(IdGenerator::next("int"), val);
+            applySpan(lit, node);
+            return lit;
+        } else if (type == "float_literal") {
+            auto* lit = new FloatLiteral(IdGenerator::next("float"), nodeText(node, source));
+            applySpan(lit, node);
+            return lit;
+        } else if (type == "string_literal" || type == "char_literal") {
+            auto* lit = new StringLiteral(IdGenerator::next("str"), nodeText(node, source));
+            applySpan(lit, node);
+            return lit;
+        } else if (type == "true" || type == "false") {
+            auto* lit = new BooleanLiteral(IdGenerator::next("bool"), type == "true");
+            applySpan(lit, node);
+            return lit;
+        } else if (type == "unit_expression") {
+            auto* lit = new NullLiteral();
+            lit->id = IdGenerator::next("null");
+            applySpan(lit, node);
+            return lit;
+        } else if (type == "parenthesized_expression") {
+            if (ts_node_named_child_count(node) > 0) {
+                return convertRustExpression(ts_node_named_child(node, 0), source);
+            }
+        } else if (type == "array_expression") {
+            auto* list = new ListLiteral();
+            list->id = IdGenerator::next("list");
+            applySpan(list, node);
+            uint32_t count = ts_node_named_child_count(node);
+            for (uint32_t i = 0; i < count; ++i) {
+                ASTNode* elem = convertRustExpression(ts_node_named_child(node, i), source);
+                if (elem) list->addChild("elements", elem);
+            }
+            return list;
+        }
+
+        std::string text = nodeText(node, source);
+        if (!text.empty()) {
+            auto* ref = new VariableReference(IdGenerator::next("var"), text);
+            applySpan(ref, node);
+            return ref;
+        }
+        return nullptr;
+    }
+
+    static Type* convertRustType(TSNode node, const std::string& source) {
+        std::string type = nodeType(node);
+        if (type == "primitive_type") {
+            auto* prim = new PrimitiveType();
+            prim->id = IdGenerator::next("type");
+            prim->kind = nodeText(node, source);
+            return prim;
+        } else if (type == "reference_type") {
+            TSNode valueNode = childByFieldName(node, "value");
+            if (!ts_node_is_null(valueNode)) {
+                if (auto* inner = convertRustType(valueNode, source)) {
+                    auto* opt = new OptionalType();
+                    opt->id = IdGenerator::next("type");
+                    opt->setChild("innerType", inner);
+                    return opt;
+                }
+            }
+        } else if (type == "array_type") {
+            auto* arr = new ArrayType();
+            arr->id = IdGenerator::next("type");
+            TSNode elemNode = childByFieldName(node, "element");
+            if (!ts_node_is_null(elemNode)) {
+                if (auto* et = convertRustType(elemNode, source)) arr->setChild("elementType", et);
+            }
+            return arr;
+        } else if (type == "tuple_type") {
+            auto* tuple = new TupleType();
+            tuple->id = IdGenerator::next("type");
+            uint32_t count = ts_node_named_child_count(node);
+            for (uint32_t i = 0; i < count; ++i) {
+                if (auto* t = convertRustType(ts_node_named_child(node, i), source)) {
+                    tuple->addChild("elementTypes", t);
+                }
+            }
+            return tuple;
+        }
+        auto* custom = new CustomType();
+        custom->id = IdGenerator::next("type");
+        custom->typeName = nodeText(node, source);
+        return custom;
+    }
 };

editor/src/ast/RustGenerator.h

@@ -0,0 +1,547 @@
+#pragma once
+#include "ProjectionGenerator.h"
+#include "Import.h"
+
+class RustGenerator : public ProjectionGenerator {
+public:
+    std::string generate(const ASTNode* node) override {
+        return dispatchGenerate(this, node, "// Unknown concept: ");
+    }
+
+    std::string visitModule(const Module* module) override {
+        std::ostringstream oss;
+        auto imports = module->getChildren("imports");
+        for (const auto* impNode : imports) {
+            if (impNode->conceptType != "Import") continue;
+            oss << emitImport(static_cast<const Import*>(impNode)) << "\n";
+        }
+        if (!imports.empty()) oss << "\n";
+
+        auto variables = module->getChildren("variables");
+        for (const auto* var : variables) {
+            oss << visitVariable(static_cast<const Variable*>(var)) << "\n";
+        }
+        if (!variables.empty()) oss << "\n";
+
+        auto functions = module->getChildren("functions");
+        for (size_t i = 0; i < functions.size(); ++i) {
+            if (i > 0) oss << "\n";
+            oss << visitFunction(static_cast<const Function*>(functions[i]));
+        }
+        return oss.str();
+    }
+
+    std::string visitFunction(const Function* function) override {
+        std::ostringstream oss;
+        emitAnnotations(oss, function->getChildren("annotations"), "");
+
+        std::string name = function->name;
+        std::string implReceiver;
+        auto pos = name.find('.');
+        if (pos != std::string::npos && pos > 0 && pos + 1 < name.size()) {
+            implReceiver = name.substr(0, pos);
+            name = name.substr(pos + 1);
+        }
+
+        if (!implReceiver.empty()) {
+            oss << "impl " << implReceiver << " {\n";
+            oss << "    ";
+        }
+
+        oss << "fn " << name << "(";
+        emitParameters(oss, function->getChildren("parameters"));
+        oss << ")";
+        auto retType = function->getChild("returnType");
+        if (retType) {
+            oss << " -> " << generate(retType);
+        }
+        oss << " {\n";
+        emitBody(oss, function->getChildren("body"), implReceiver.empty() ? "    " : "        ");
+        oss << (implReceiver.empty() ? "}" : "    }\n}") << "\n";
+
+        return oss.str();
+    }
+
+    std::string visitVariable(const Variable* variable) override {
+        std::ostringstream oss;
+        emitAnnotations(oss, variable->getChildren("annotations"), "");
+        std::string typeStr;
+        auto type = variable->getChild("type");
+        if (type) typeStr = generate(type);
+        oss << "let " << variable->name;
+        if (!typeStr.empty()) {
+            oss << ": " << typeStr;
+        }
+        auto initializer = variable->getChild("initializer");
+        if (initializer) {
+            oss << " = " << generate(initializer);
+        }
+        oss << ";";
+        return oss.str();
+    }
+
+    std::string visitParameter(const Parameter* parameter) override {
+        std::ostringstream oss;
+        oss << parameter->name;
+        auto type = parameter->getChild("type");
+        if (type) {
+            oss << ": " << generate(type);
+        }
+        auto defaultValue = parameter->getChild("defaultValue");
+        if (defaultValue) {
+            oss << " = " << generate(defaultValue);
+        }
+        return oss.str();
+    }
+
+    std::string visitAssignment(const Assignment* assignment) override {
+        std::ostringstream oss;
+        auto target = assignment->getChild("target");
+        auto value = assignment->getChild("value");
+        if (target) {
+            oss << generate(target);
+        } else {
+            oss << "/* missing target */";
+        }
+        oss << " = ";
+        if (value) {
+            oss << generate(value);
+        } else {
+            oss << "()";
+        }
+        oss << ";";
+        return oss.str();
+    }
+
+    std::string visitReturn(const Return* ret) override {
+        std::ostringstream oss;
+        oss << "return";
+        auto value = ret->getChild("value");
+        if (value) {
+            oss << " " << generate(value);
+        }
+        oss << ";";
+        return oss.str();
+    }
+
+    std::string visitBinaryOperation(const BinaryOperation* binOp) override {
+        std::ostringstream oss;
+        auto left = binOp->getChild("left");
+        auto right = binOp->getChild("right");
+        if (left) {
+            oss << generate(left);
+        } else {
+            oss << "/* missing left */";
+        }
+        oss << " " << binOp->op << " ";
+        if (right) {
+            oss << generate(right);
+        } else {
+            oss << "/* missing right */";
+        }
+        return oss.str();
+    }
+
+    std::string visitVariableReference(const VariableReference* varRef) override {
+        return varRef->variableName;
+    }
+
+    std::string visitIntegerLiteral(const IntegerLiteral* lit) override {
+        return std::to_string(lit->value);
+    }
+
+    std::string visitFloatLiteral(const FloatLiteral* lit) override {
+        return lit->value;
+    }
+
+    std::string visitStringLiteral(const StringLiteral* lit) override {
+        if (isQuotedLiteral(lit->value)) return lit->value;
+        return "\"" + lit->value + "\"";
+    }
+
+    std::string visitBooleanLiteral(const BooleanLiteral* lit) override {
+        return lit->value ? "true" : "false";
+    }
+
+    std::string visitNullLiteral(const NullLiteral*) override {
+        return "()";
+    }
+
+    std::string visitIfStatement(const IfStatement* stmt) override {
+        std::ostringstream oss;
+        auto condition = stmt->getChild("condition");
+        auto thenBranch = stmt->getChildren("thenBranch");
+        auto elseBranch = stmt->getChildren("elseBranch");
+
+        oss << "if ";
+        if (condition) {
+            oss << generate(condition);
+        } else {
+            oss << "true";
+        }
+        oss << " {\n";
+        emitBody(oss, thenBranch, "    ");
+        oss << "}";
+        if (!elseBranch.empty()) {
+            oss << " else {\n";
+            emitBody(oss, elseBranch, "    ");
+            oss << "}";
+        }
+        return oss.str();
+    }
+
+    std::string visitWhileLoop(const WhileLoop* loop) override {
+        std::ostringstream oss;
+        auto condition = loop->getChild("condition");
+        auto body = loop->getChildren("body");
+        oss << "while ";
+        if (condition) {
+            oss << generate(condition);
+        } else {
+            oss << "true";
+        }
+        oss << " {\n";
+        emitBody(oss, body, "    ");
+        oss << "}";
+        return oss.str();
+    }
+
+    std::string visitForLoop(const ForLoop* loop) override {
+        std::ostringstream oss;
+        auto iterable = loop->getChild("iterable");
+        auto body = loop->getChildren("body");
+        std::string iterName = loop->iteratorName.empty() ? "item" : loop->iteratorName;
+        oss << "for " << iterName << " in ";
+        if (iterable) {
+            oss << generate(iterable);
+        } else {
+            oss << "std::iter::empty()";
+        }
+        oss << " {\n";
+        emitBody(oss, body, "    ");
+        oss << "}";
+        return oss.str();
+    }
+
+    std::string visitExpressionStatement(const ExpressionStatement* stmt) override {
+        std::ostringstream oss;
+        auto expr = stmt->getChild("expression");
+        if (expr) {
+            oss << generate(expr);
+        }
+        oss << ";";
+        return oss.str();
+    }
+
+    std::string visitUnaryOperation(const UnaryOperation* unOp) override {
+        std::ostringstream oss;
+        std::string op = unOp->op;
+        bool wordOp = !op.empty() && std::isalpha(static_cast<unsigned char>(op[0]));
+        oss << op;
+        if (wordOp) oss << " ";
+        auto operand = unOp->getChild("operand");
+        if (operand) {
+            oss << generate(operand);
+        } else {
+            oss << "()";
+        }
+        return oss.str();
+    }
+
+    std::string visitFunctionCall(const FunctionCall* call) override {
+        std::ostringstream oss;
+        oss << call->functionName << "(";
+        auto arguments = call->getChildren("arguments");
+        for (size_t i = 0; i < arguments.size(); ++i) {
+            if (i > 0) oss << ", ";
+            oss << generate(arguments[i]);
+        }
+        oss << ")";
+        return oss.str();
+    }
+
+    std::string visitBlock(const Block* block) override {
+        std::ostringstream oss;
+        auto statements = block->getChildren("statements");
+        oss << "{\n";
+        emitBody(oss, statements, "    ");
+        oss << "}";
+        return oss.str();
+    }
+
+    std::string visitListLiteral(const ListLiteral* lit) override {
+        std::ostringstream oss;
+        oss << "vec![";
+        auto elements = lit->getChildren("elements");
+        for (size_t i = 0; i < elements.size(); ++i) {
+            if (i > 0) oss << ", ";
+            oss << generate(elements[i]);
+        }
+        oss << "]";
+        return oss.str();
+    }
+
+    std::string visitIndexAccess(const IndexAccess* access) override {
+        std::ostringstream oss;
+        auto target = access->getChild("target");
+        auto index = access->getChild("index");
+        if (target) {
+            oss << generate(target);
+        } else {
+            oss << "/* missing target */";
+        }
+        oss << "[";
+        if (index) {
+            oss << generate(index);
+        } else {
+            oss << "0";
+        }
+        oss << "]";
+        return oss.str();
+    }
+
+    std::string visitMemberAccess(const MemberAccess* access) override {
+        std::ostringstream oss;
+        auto target = access->getChild("target");
+        if (target) {
+            oss << generate(target);
+        } else {
+            oss << "/* missing target */";
+        }
+        oss << "." << access->memberName;
+        return oss.str();
+    }
+
+    std::string visitPrimitiveType(const PrimitiveType* type) override {
+        std::string kind = type->kind;
+        if (kind == "int") return "i32";
+        if (kind == "long") return "i64";
+        if (kind == "short") return "i16";
+        if (kind == "byte") return "u8";
+        if (kind == "float") return "f32";
+        if (kind == "double") return "f64";
+        if (kind == "string") return "String";
+        if (kind == "bool") return "bool";
+        if (kind == "char") return "char";
+        if (kind == "void") return "()";
+        return kind;
+    }
+
+    std::string visitListType(const ListType* type) override {
+        std::ostringstream oss;
+        oss << "Vec<";
+        auto elementType = type->getChild("elementType");
+        if (elementType) {
+            oss << generate(elementType);
+        } else {
+            oss << "()";
+        }
+        oss << ">";
+        return oss.str();
+    }
+
+    std::string visitSetType(const SetType* type) override {
+        std::ostringstream oss;
+        oss << "std::collections::HashSet<";
+        auto elementType = type->getChild("elementType");
+        if (elementType) {
+            oss << generate(elementType);
+        } else {
+            oss << "()";
+        }
+        oss << ">";
+        return oss.str();
+    }
+
+    std::string visitMapType(const MapType* type) override {
+        std::ostringstream oss;
+        oss << "std::collections::HashMap<";
+        auto keyType = type->getChild("keyType");
+        auto valueType = type->getChild("valueType");
+        if (keyType) {
+            oss << generate(keyType);
+        } else {
+            oss << "()";
+        }
+        oss << ", ";
+        if (valueType) {
+            oss << generate(valueType);
+        } else {
+            oss << "()";
+        }
+        oss << ">";
+        return oss.str();
+    }
+
+    std::string visitTupleType(const TupleType* type) override {
+        std::ostringstream oss;
+        oss << "(";
+        auto elementTypes = type->getChildren("elementTypes");
+        for (size_t i = 0; i < elementTypes.size(); ++i) {
+            if (i > 0) oss << ", ";
+            oss << generate(elementTypes[i]);
+        }
+        if (elementTypes.size() == 1) oss << ",";
+        oss << ")";
+        return oss.str();
+    }
+
+    std::string visitArrayType(const ArrayType* type) override {
+        std::ostringstream oss;
+        auto elementType = type->getChild("elementType");
+        oss << "[";
+        if (elementType) {
+            oss << generate(elementType);
+        } else {
+            oss << "()";
+        }
+        oss << "; 0]";
+        return oss.str();
+    }
+
+    std::string visitOptionalType(const OptionalType* type) override {
+        std::ostringstream oss;
+        oss << "Option<";
+        auto inner = type->getChild("innerType");
+        if (inner) {
+            oss << generate(inner);
+        } else {
+            oss << "()";
+        }
+        oss << ">";
+        return oss.str();
+    }
+
+    std::string visitCustomType(const CustomType* type) override {
+        return type->typeName;
+    }
+
+    std::string visitDerefStrategy(const DerefStrategy* annotation) override {
+        return "// @deref(" + annotation->strategy + ")";
+    }
+
+    std::string visitOptimizationLock(const OptimizationLock* annotation) override {
+        return "// @lock(" + annotation->lockedBy + ") - " + annotation->lockReason;
+    }
+
+    std::string visitLangSpecific(const LangSpecific* annotation) override {
+        return "// @lang_specific(" + annotation->language + ", " + annotation->idiomType + ")";
+    }
+
+    std::string visitDeallocateAnnotation(const DeallocateAnnotation* annotation) override {
+        return "// @dealloc(" + annotation->strategy + ")";
+    }
+
+    std::string visitLifetimeAnnotation(const LifetimeAnnotation* annotation) override {
+        if (annotation->strategy == "RAII") {
+            return "// @lifetime(RAII) - Drop/RAII";
+        }
+        return "// @lifetime(" + annotation->strategy + ")";
+    }
+
+    std::string visitReclaimAnnotation(const ReclaimAnnotation* annotation) override {
+        return "// @reclaim(" + annotation->strategy + ")";
+    }
+
+    std::string visitOwnerAnnotation(const OwnerAnnotation* annotation) override {
+        if (annotation->strategy == "Shared_ARC") {
+            return "// @owner(Shared_ARC) - Arc<T>";
+        }
+        if (annotation->strategy == "Single") {
+            return "// @owner(Single) - owned values";
+        }
+        return "// @owner(" + annotation->strategy + ")";
+    }
+
+    std::string visitAllocateAnnotation(const AllocateAnnotation* annotation) override {
+        return "// @allocate(" + annotation->strategy + ")";
+    }
+
+    std::string visitHotColdAnnotation(const HotColdAnnotation* annotation) override {
+        return "// @" + annotation->hint;
+    }
+
+    std::string visitInlineAnnotation(const InlineAnnotation* annotation) override {
+        return "// @inline(" + annotation->mode + ")";
+    }
+
+    std::string visitPureAnnotation(const PureAnnotation*) override {
+        return "// @pure";
+    }
+
+    std::string visitConstExprAnnotation(const ConstExprAnnotation*) override {
+        return "// @constexpr";
+    }
+
+private:
+    static std::string emitImport(const Import* imp) {
+        std::string moduleName = imp->moduleName.empty() ? "crate" : imp->moduleName;
+        if (imp->importKind == "require") {
+            return "// require " + moduleName;
+        }
+        return "use " + moduleName + ";";
+    }
+
+    static void emitAnnotations(std::ostringstream& oss,
+                                const std::vector<ASTNode*>& annotations,
+                                const std::string& indent) {
+        for (const auto* annotation : annotations) {
+            std::string code;
+            if (annotation) {
+                RustGenerator gen;
+                code = gen.generate(annotation);
+            }
+            if (!code.empty()) {
+                oss << indent << code << "\n";
+            }
+        }
+    }
+
+    void emitParameters(std::ostringstream& oss,
+                        const std::vector<ASTNode*>& params) {
+        for (size_t i = 0; i < params.size(); ++i) {
+            if (i > 0) oss << ", ";
+            oss << visitParameter(static_cast<const Parameter*>(params[i]));
+        }
+    }
+
+    void emitBody(std::ostringstream& oss,
+                  const std::vector<ASTNode*>& body,
+                  const std::string& indent) {
+        if (body.empty()) {
+            oss << indent << "// TODO: implement\n";
+            return;
+        }
+        for (const auto* stmt : body) {
+            std::string stmtCode = generate(stmt);
+            appendIndented(oss, stmtCode, indent);
+            oss << "\n";
+        }
+    }
+
+    static void appendIndented(std::ostringstream& oss,
+                               const std::string& code,
+                               const std::string& indent) {
+        size_t pos = 0;
+        while (pos < code.length()) {
+            size_t newlinePos = code.find('\n', pos);
+            if (newlinePos == std::string::npos) {
+                oss << indent << code.substr(pos);
+                break;
+            }
+            oss << indent << code.substr(pos, newlinePos - pos) << "\n";
+            pos = newlinePos + 1;
+            if (pos >= code.length()) break;
+        }
+    }
+
+    static bool isQuotedLiteral(const std::string& text) {
+        if (text.size() < 2) return false;
+        char first = text.front();
+        char last = text.back();
+        if ((first == '\'' && last == '\'') || (first == '"' && last == '"')) {
+            return true;
+        }
+        return false;
+    }
+};

editor/tests/step150_test.cpp

@@ -0,0 +1,63 @@
+// Step 150 TDD Test: Rust CST-to-AST + generator
+#include "ast/Parser.h"
+#include "ast/Generator.h"
+#include <iostream>
+
+static void expect(bool cond, const std::string& name, int& passed, int& failed) {
+    if (cond) {
+        std::cout << "Test " << (passed + failed + 1) << " PASS: " << name << "\n";
+        ++passed;
+    } else {
+        std::cout << "Test " << (passed + failed + 1) << " FAIL: " << name << "\n";
+        ++failed;
+    }
+}
+
+int main() {
+    int passed = 0;
+    int failed = 0;
+
+    std::string rust = R"(
+use std::collections::HashMap;
+
+struct Boxy { value: i32 }
+
+impl Boxy {
+  fn size(&self, n: i32) -> i32 { return n + 1; }
+}
+
+fn add(a: i32, b: i32) -> i32 {
+  let c = a + b;
+  return c;
+}
+)";
+
+    auto mod = TreeSitterParser::parseRust(rust);
+    expect(mod != nullptr, "rust module created", passed, failed);
+    auto funcs = mod->getChildren("functions");
+    expect(funcs.size() >= 2, "rust functions discovered", passed, failed);
+
+    bool foundAdd = false;
+    bool foundImpl = false;
+    for (const auto* fnNode : funcs) {
+        if (fnNode->conceptType != "Function") continue;
+        auto* fn = static_cast<const Function*>(fnNode);
+        if (fn->name == "add") foundAdd = true;
+        if (fn->name == "Boxy.size") foundImpl = true;
+    }
+    expect(foundAdd, "rust top-level function name", passed, failed);
+    expect(foundImpl, "rust impl method name", passed, failed);
+
+    RustGenerator gen;
+    std::string out = gen.generate(mod.get());
+    expect(out.find("use std::collections::HashMap;") != std::string::npos,
+           "rust imports generated", passed, failed);
+    expect(out.find("fn add") != std::string::npos,
+           "rust function signature generated", passed, failed);
+    expect(out.find("impl Boxy") != std::string::npos,
+           "rust impl block generated", passed, failed);
+
+    std::cout << "\n=== Step 150 Results: " << passed << " passed, "
+              << failed << " failed ===\n";
+    return failed == 0 ? 0 : 1;
+}