luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

d2ir: Make suffix globs case insensitive too

Browse source
This commit is contained in:
Anmol Sethi 2023-07-29 21:33:41 -07:00
parent 63efa12160
commit bd2c94f7a8
No known key found for this signature in database
GPG key ID: 8CEF1878FF10ADEB
4 changed files with 312 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2ir/pattern.go
View file

@ -39,7 +39,7 @@ func matchPattern(s string, pattern []string) bool {
if pattern[i] == "*" { if pattern[i] == "*" {
// * so match next. // * so match next.
if i != len(pattern)-1 { if i != len(pattern)-1 {
j := strings.Index(s, pattern[i+1]) j := strings.Index(strings.ToLower(s), strings.ToLower(pattern[i+1]))
if j == -1 { if j == -1 {
return false return false
} }

14
d2ir/pattern_test.go
View file

@ -36,7 +36,7 @@ a*: globbed`)
}, },
}, },
{ {
name: "case", name: "case/1",
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `animal: meow m, err := compile(t, `animal: meow
action: yes action: yes
@ -47,6 +47,18 @@ A*: globbed`)
assertQuery(t, m, 0, 0, "globbed", "action") assertQuery(t, m, 0, 0, "globbed", "action")
}, },
}, },
{
name: "case/2",
run: func(t testing.TB) {
m, err := compile(t, `diddy kong
Donkey Kong
*kong: yes`)
assert.Success(t, err)
assertQuery(t, m, 2, 0, nil, "")
assertQuery(t, m, 0, 0, "yes", "diddy kong")
assertQuery(t, m, 0, 0, "yes", "Donkey Kong")
},
},
{ {
name: "suffix", name: "suffix",
run: func(t testing.TB) { run: func(t testing.TB) {

159
testdata/d2ir/TestCompile/patterns/case/1.exp.json generated vendored Normal file
View file

@ -0,0 +1,159 @@
{
"fields": [
{
"name": "animal",
"primary": {
"value": {
"range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36",
"value": [
{
"string": "globbed",
"raw_string": "globbed"
}
]
}
},
"references": [
{
"string": {
"range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6",
"value": [
{
"string": "animal",
"raw_string": "animal"
}
]
},
"key_path": {
"range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6",
"value": [
{
"string": "animal",
"raw_string": "animal"
}
]
}
}
]
},
"context": {
"edge": null,
"key": {
"range": "TestCompile/patterns/case/1.d2,0:0:0-0:12:12",
"key": {
"range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6",
"value": [
{
"string": "animal",
"raw_string": "animal"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "TestCompile/patterns/case/1.d2,0:8:8-0:12:12",
"value": [
{
"string": "meow",
"raw_string": "meow"
}
]
}
}
}
}
}
]
},
{
"name": "action",
"primary": {
"value": {
"range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36",
"value": [
{
"string": "globbed",
"raw_string": "globbed"
}
]
}
},
"references": [
{
"string": {
"range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19",
"value": [
{
"string": "action",
"raw_string": "action"
}
]
},
"key_path": {
"range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19",
"value": [
{
"string": "action",
"raw_string": "action"
}
]
}
}
]
},
"context": {
"edge": null,
"key": {
"range": "TestCompile/patterns/case/1.d2,1:0:13-1:11:24",
"key": {
"range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19",
"value": [
{
"string": "action",
"raw_string": "action"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "TestCompile/patterns/case/1.d2,1:8:21-1:11:24",
"value": [
{
"string": "yes",
"raw_string": "yes"
}
]
}
}
}
}
}
]
}
],
"edges": null
}

139
testdata/d2ir/TestCompile/patterns/case/2.exp.json generated vendored Normal file
View file

@ -0,0 +1,139 @@
{
"fields": [
{
"name": "diddy kong",
"primary": {
"value": {
"range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33",
"value": [
{
"string": "yes",
"raw_string": "yes"
}
]
}
},
"references": [
{
"string": {
"range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10",
"value": [
{
"string": "diddy kong",
"raw_string": "diddy kong"
}
]
},
"key_path": {
"range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10",
"value": [
{
"string": "diddy kong",
"raw_string": "diddy kong"
}
]
}
}
]
},
"context": {
"edge": null,
"key": {
"range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10",
"key": {
"range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10",
"value": [
{
"string": "diddy kong",
"raw_string": "diddy kong"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
}
]
},
{
"name": "Donkey Kong",
"primary": {
"value": {
"range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33",
"value": [
{
"string": "yes",
"raw_string": "yes"
}
]
}
},
"references": [
{
"string": {
"range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22",
"value": [
{
"string": "Donkey Kong",
"raw_string": "Donkey Kong"
}
]
},
"key_path": {
"range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22",
"value": [
{
"string": "Donkey Kong",
"raw_string": "Donkey Kong"
}
]
}
}
]
},
"context": {
"edge": null,
"key": {
"range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22",
"key": {
"range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22",
"path": [
{
"unquoted_string": {
"range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22",
"value": [
{
"string": "Donkey Kong",
"raw_string": "Donkey Kong"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
}
]
}
],
"edges": null
}