...

compiler/Compiler/Generator.cs

@@ -23,16 +23,16 @@ public sealed class Generator(List<NodeDefinition> nodes)
 
         foreach (var node in nodes.OfType<NodeDefinitionFunc>())
         {
-            var parameters = node.Parameters.Select(x => $"{CType(x.Type)} {x.Name.Ident}");
-            writer.WriteLine($"{CType(node.ReturnType)} {node.Name.Ident}({string.Join(", ", parameters)});");
+            var parameters = node.Parameters.Select(x => CType(x.Type, x.Name.Ident));
+            writer.WriteLine($"{CType(node.ReturnType, node.Name.Ident)}({string.Join(", ", parameters)});");
         }
 
         writer.WriteLine();
 
         foreach (var node in nodes.OfType<NodeDefinitionFunc>())
         {
-            var parameters = node.Parameters.Select(x => $"{CType(x.Type)} {x.Name.Ident}");
-            writer.WriteLine($"{CType(node.ReturnType)} {node.Name.Ident}({string.Join(", ", parameters)})");
+            var parameters = node.Parameters.Select(x => CType(x.Type, x.Name.Ident));
+            writer.WriteLine($"{CType(node.ReturnType, node.Name.Ident)}({string.Join(", ", parameters)})");
             writer.WriteLine("{");
             using (writer.Indent())
             {
@@ -56,6 +56,9 @@ public sealed class Generator(List<NodeDefinition> nodes)
             case NodeStatementFuncCall statement:
                 EmitStatementFuncCall(statement);
                 break;
+            case NodeStatementReturn statement:
+                EmitStatementReturn(statement);
+                break;
         }
     }
 
@@ -78,6 +81,12 @@ public sealed class Generator(List<NodeDefinition> nodes)
         writer.WriteLine($"{name}({string.Join(", ", parameterValues)});");
     }
 
+    private void EmitStatementReturn(NodeStatementReturn statement)
+    {
+        var value = EmitExpression(statement.Value);
+        writer.WriteLine($"return {value};");
+    }
+
     private string EmitExpression(NodeExpression node)
     {
         return node switch
@@ -109,36 +118,63 @@ public sealed class Generator(List<NodeDefinition> nodes)
         return expression.Value.Ident;
     }
 
-    private static string CType(NodeType node)
+    private static string CType(NodeType type, string? variableName = null)
     {
-        return node switch
+        return type switch
         {
-            NodeTypeCustom type => $"struct {type.Name.Ident}",
-            NodeTypeFloat type => type.Width switch
-            {
-                32 => "float",
-                64 => "double",
-            },
-            NodeTypePointer type => $"{CType(type.To)}*",
-            NodeTypeSInt type => type.Width switch
-            {
-                8 => "byte",
-                16 => "short",
-                32 => "int",
-                64 => "long",
-            },
-            NodeTypeUInt type => type.Width switch
-            {
-                8 => "unsigned byte",
-                16 => "unsigned short",
-                32 => "unsigned int",
-                64 => "unsigned long",
-            },
-            NodeTypeString => "struct string",
-            NubTypeVoid => "void",
-            _ => throw new ArgumentOutOfRangeException(nameof(node))
+            NodeTypeVoid => "void" + (variableName != null ? $" {variableName}" : ""),
+            NodeTypeBool => "bool" + (variableName != null ? $" {variableName}" : ""),
+            NodeTypeSInt intType => CTypeSInt(intType, variableName),
+            NodeTypeUInt intType => CTypeUInt(intType, variableName),
+            NodeTypePointer ptr => CType(ptr.To) + "*" + (variableName != null ? $" {variableName}" : ""),
+            NodeTypeString => "struct string" + (variableName != null ? $" {variableName}" : ""),
+            NodeTypeFunc fn => CTypeFunc(fn, variableName),
         };
     }
+
+    private static string CTypeSInt(NodeTypeSInt intType, string? varName)
+    {
+        var cType = intType.Width switch
+        {
+            8 => "char",
+            16 => "short",
+            32 => "int",
+            64 => "long long",
+        };
+
+        return cType + (varName != null ? $" {varName}" : "");
+    }
+
+    private static string CTypeUInt(NodeTypeUInt intType, string? varName)
+    {
+        var cType = intType.Width switch
+        {
+            8 => "unsigned char",
+            16 => "unsigned short",
+            32 => "unsigned int",
+            64 => "unsigned long long",
+        };
+
+        return cType + (varName != null ? $" {varName}" : "");
+    }
+
+    private static string CTypeFunc(NodeTypeFunc fn, string? varName)
+    {
+        var returnType = CType(fn.ReturnType);
+        var parameters = string.Join(", ", fn.Parameters.Select(p => CType(p)));
+
+        if (string.IsNullOrEmpty(parameters))
+        {
+            parameters = "void";
+        }
+
+        if (varName != null)
+        {
+            return $"{returnType} (*{varName})({parameters})";
+        }
+
+        return $"{returnType} (*)({parameters})";
+    }
 }
 
 internal class IndentedTextWriter