Skip to content
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

Jump to bottom

Adding list and block functionality for Contains function #89

Merged
merged 3 commits into from
Jan 1, 2024
Merged

Adding list and block functionality for Contains function #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab61cdd
adding code for contains block
pratikmota Jan 1, 2024
dfae2aa
contains with list logic
pratikmota Jan 1, 2024
6e1880b
contains test cases added
pratikmota Jan 1, 2024
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
35 changes: 33 additions & 2 deletions evaldo/builtins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4709,6 +4709,7 @@ var builtins = map[string]*env.Builtin{
Pure: true,
Fn: func(ps *env.ProgramState, arg0 env.Object, arg1 env.Object, arg2 env.Object, arg3 env.Object, arg4 env.Object) env.Object {
switch s1 := arg0.(type) {
//contains with string
case env.String:
switch s2 := arg1.(type) {
case env.String:
Expand All @@ -4720,9 +4721,39 @@ var builtins = map[string]*env.Builtin{
default:
return MakeArgError(ps, 2, []env.Type{env.StringType}, "contains")
}
// TODO-FIX1 .. add for block and list (use util.containsVal for block)
//contains block
case env.Block:
switch value := arg1.(type) {
case env.Integer:
if util.ContainsVal(ps, s1.Series.S, value) {
return *env.NewInteger(1)
} else {
return *env.NewInteger(0)
}
default:
return MakeArgError(ps, 2, []env.Type{env.IntegerType}, "contains")
}
// contains list
case env.List:
switch value := arg1.(type) {
case env.Integer:
isListContains := false
for i := 0; i < len(s1.Data); i++ {
if s1.Data[i] == value.Value {
isListContains = true
break
}
}
if isListContains {
return *env.NewInteger(1)
} else {
return *env.NewInteger(0)
}
default:
return MakeArgError(ps, 2, []env.Type{env.IntegerType}, "contains")
}
default:
return MakeArgError(ps, 1, []env.Type{env.StringType}, "contains")
return MakeArgError(ps, 1, []env.Type{env.StringType, env.BlockType, env.ListType}, "contains")
}
},
},
Expand Down
8 changes: 8 additions & 0 deletions tests/builtins.rye
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,14 @@ section "Working with blocks and lists"
equal { { 3 2 3 5 3 2 } .list .unique .length? } 3 ; result order is not deterministic list { 3 2 5 }
}

group "contains"
mold\nowrap ?contains
{ { block string list } }
{
equal { contains "abbaca" "b" } 1
equal { contains { 1 2 3 } 2 } 1
equal { contains list { 1 2 3 } 2 } 1
}
}


Expand Down