Skip to content

making tests pass , trying to add basic tmux functionality to os cont… #940

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
refaktor merged 1 commit into from
Jun 15, 2026
Merged

making tests pass , trying to add basic tmux functionality to os cont… #940

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
34 changes: 17 additions & 17 deletions evaldo/builtins_base_contexts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,12 @@ var builtins_contexts = map[string]*env.Builtin{

// Tests:
// equal { c: context { x: 123 } p: context { y: 456 } cc: bind c p cc/x } 123
// equal { c: context { x: 123 } p: context { y: 456 } cc: bind c p cc/y } 456
// equal { c: context { x: 123 } p: context { y: 456 } cc: bind c p do\inside c { x:: 999 } cc/x } 123 ; clone unchanged
// equal { c: context { x: 123 } p: context { y: 456 } cc: bind c p do\inside c { x:: 999 } c/x } 999 ; original modified
// equal { c: context { x: 123 } p: context { y: 456 } cc: bind c p cc/y } 456
// equal { c: context { x:: 123 } p: context { y:: 456 } cc: bind c p do\inside c { x:: 999 } cc/x } 123 ; clone unchanged
// equal { c: context { x:: 123 } p: context { y:: 456 } cc: bind c p do\inside c { x:: 999 } c/x } 999 ; original modified
// Args:
// * child: Context object to clone and bind
// * parent: Context object to bind to as parent
// * parent: Context object to bind to as parent
// Returns:
// * a cloned child context with its parent set to the specified parent context
"bind": { // **
Expand Down Expand Up @@ -341,8 +341,8 @@ var builtins_contexts = map[string]*env.Builtin{

// Tests:
// equal { c: context { x: 123 } cc: anchor c cc/x } 123
// equal { c: context { x: 123 } cc: anchor c do\inside c { x:: 999 } cc/x } 123 ; clone unchanged
// equal { c: context { x: 123 } cc: anchor c do\inside c { x:: 999 } c/x } 999 ; original modified
// equal { c: context { x:: 123 } cc: anchor c do\inside c { x:: 999 } cc/x } 123 ; clone unchanged
// equal { c: context { x:: 123 } cc: anchor c do\inside c { x:: 999 } c/x } 999 ; original modified
// Args:
// * ctx: Context object to clone and anchor to current context
// Returns:
Expand All @@ -367,7 +367,7 @@ var builtins_contexts = map[string]*env.Builtin{

// Tests:
// equal { c: context { x: 123 } anchor! c c/x } 123
// equal { c: context { x: 123 } anchor! c do\inside c { x:: 999 } c/x } 999 ; original modified
// equal { c: context { x:: 123 } anchor! c do\inside c { x:: 999 } c/x } 999 ; original modified
// Args:
// * ctx: Context object to anchor to current context
// Returns:
Expand Down Expand Up @@ -972,8 +972,8 @@ var builtins_contexts = map[string]*env.Builtin{
},

// Tests:
// equal { c: context { x: 100 } 123 |enter c { .print x } } 123
// equal { c: context { x: 100 } 123 |enter c { add x } } 223
// equal { c: context { x: 100 } 123 |enter c { x } } 123
// equal { c: context { x: 100 } 123 |enter c { + x } } 223
// equal { pipes: context { echo: { .print } into-file: { .print } } 123 |enter pipes { .echo .into-file %data.txt } } 123
// Args:
// * value: Value to inject into the block (like with)
Expand All @@ -986,14 +986,14 @@ var builtins_contexts = map[string]*env.Builtin{
Doc: "Combines with and do\\in: takes a value to inject, a context as parent, and a block to evaluate with both.",
Fn: func(ps *env.ProgramState, arg0 env.Object, arg1 env.Object, arg2 env.Object, arg3 env.Object, arg4 env.Object) env.Object {
value := arg0 // First argument: value to inject (like with)

switch ctx := arg1.(type) { // Second argument: context (like do\in)
case *env.RyeCtx:
switch bloc := arg2.(type) { // Third argument: block to execute
case env.Block:
ser := ps.Ser
ps.Ser = bloc.Series

// First, set up the parent context like do\in does
tempCtx := ctx
for {
Expand All @@ -1009,22 +1009,22 @@ var builtins_contexts = map[string]*env.Builtin{
break
}
}

// Save current parent context
temp := ps.Ctx.Parent
// Set argument context as parent
// Set argument context as parent
ps.Ctx.Parent = ctx

// Now evaluate the block with value injection like with does
EvalBlockInj(ps, value, true)

MaybeDisplayFailureOrError(ps, ps.Idx, "enter")

// Restore original parent context
ps.Ctx.Parent = temp
ps.Ser = ser
return ps.Res

default:
return MakeArgError(ps, 3, []env.Type{env.BlockType}, "enter")
}
Expand Down
8 changes: 4 additions & 4 deletions evaldo/builtins_base_strings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,10 @@ var builtins_string = map[string]*env.Builtin{
},
},
// Tests:
// equal { contains\flag "-help -yello -ho" -h|help } true
// equal { contains\flag "hello -help ho" -h|help } true
// equal { contains\flag "hello yello -ho" -h|help } false
// equal { contains\flag "-hello yello ho" -h|help } false
// equal { contains\flag { --help --yello -h } -h|help } true
// equal { contains\flag load "hello --help ho" -h|help } true
// equal { contains\flag { hello yello --ho } -h|help } false
// equal { contains\flag { --hello yello ho } -h|help } false
// Args:
// * collection: block of strings to search in
// * value: Flag value to search for
Expand Down
Loading
Loading