Skip to content

feat: make include an expression returning the declared package value #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fuseraft merged 1 commit into from
May 21, 2026
Merged

feat: make include an expression returning the declared package value #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Parsing/AST/IncludeNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace kiwi.Parsing.AST;

public class IncludeNode(ASTNode path) : ASTNode(ASTNodeType.Include)
public class IncludeNode(ASTNode path) : ASTNode(ASTNodeType.Include) // expression yields package
{
public ASTNode Path { get; } = path;

Expand Down
4 changes: 2 additions & 2 deletions src/VM/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ private bool CompileNode(ASTNode node)
case ASTNodeType.Import: CompileImport ((ImportNode)node, ln); return true;
case ASTNodeType.Require: CompileRequire ((RequireNode)node, ln); return false;
case ASTNodeType.Eval: CompileEval ((EvalNode)node, ln); return true;
case ASTNodeType.Include: CompileInclude ((IncludeNode)node, ln); return false;
case ASTNodeType.Include: CompileInclude ((IncludeNode)node, ln); return true;
case ASTNodeType.Enum: CompileEnum ((EnumNode)node, ln); return false;
case ASTNodeType.DecoratedFunction: CompileDecoratedFunction((DecoratedFunctionNode)node, ln); return false;
case ASTNodeType.Lambda: CompileLambdaDef ((LambdaNode)node, ln); return true;
Expand Down Expand Up @@ -1761,7 +1761,7 @@ private void CompileEval(EvalNode node, int ln)
private void CompileInclude(IncludeNode node, int ln)
{
CompileNode(node.Path);
Emit(Opcode.Include, 0, 0, ln);
Emit(Opcode.Include, 0, 0, ln); // now leaves package Value on stack
}

// -- Enum definition -------------------------------------------------------
Expand Down
11 changes: 9 additions & 2 deletions src/VM/KiwiVM.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,8 @@ private Value RunLoop(int stopAt)
var path = Pop();
if (!path.IsString())
throw new InvalidOperationError(frame.GetToken(), "Include path must be a string.");
IncludeFile(frame.GetToken(), path.GetString());
var pkg = IncludeFile(frame.GetToken(), path.GetString());
Push(pkg);
break;
}

Expand Down Expand Up @@ -2526,8 +2527,14 @@ public Value IncludeFile(Token token, string filePath)
{
using var lexer = new Lexer(fullPath);
var ast = new Parser(true).ParseTokenStream(lexer.GetTokenStream(), true);
var chunk = Compiler.CompileProgram((ProgramNode)ast);
var prog = (ProgramNode)ast;
var pkgNode = prog.Statements.OfType<PackageNode>().FirstOrDefault();
string pkgName = "";
if (pkgNode?.PackageName is IdentifierNode id) pkgName = id.Name;
else if (pkgNode?.PackageName is LiteralNode lit && lit.Value.IsString()) pkgName = lit.Value.GetString();
var chunk = Compiler.CompileProgram(prog);
new KiwiVM(this).Execute(chunk);
return string.IsNullOrEmpty(pkgName) ? Value.Default : Value.CreatePackage(pkgName);
}
finally
{
Expand Down
Loading