-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ruleguard: filter parsing improvements
Refactored Where() filter parsing code. Implemented || operator while at it. Fixes #115 !(A && B) conditions now work properly Fixes #26 A || B conditions are now implemented
- Loading branch information
Showing
7 changed files
with
494 additions
and
251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package regression | ||
|
|
||
| func testIssue115() { | ||
| intFunc := func() int { return 19 } | ||
| stringFunc := func() string { return "19" } | ||
|
|
||
| println(13) | ||
| println(43 + 5) | ||
|
|
||
| println("foo") // want `\Q"foo" is not a constexpr int` | ||
| println(intFunc()) // want `\QintFunc() is not a constexpr int` | ||
| println(stringFunc()) // want `\QstringFunc() is not a constexpr int` | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,246 @@ | ||
| package ruleguard | ||
|
|
||
| import ( | ||
| "go/ast" | ||
| "go/constant" | ||
| "go/token" | ||
| "go/types" | ||
| "path/filepath" | ||
| "regexp" | ||
|
|
||
| "github.com/quasilyte/go-ruleguard/ruleguard/typematch" | ||
| ) | ||
|
|
||
| const filterSuccess = matchFilterResult("") | ||
|
|
||
| func filterFailure(reason string) matchFilterResult { | ||
| return matchFilterResult(reason) | ||
| } | ||
|
|
||
| func makeNotFilter(src string, x matchFilter) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| if x.fn(params).Matched() { | ||
| return matchFilterResult(src) | ||
| } | ||
| return "" | ||
| } | ||
| } | ||
|
|
||
| func makeAndFilter(lhs, rhs matchFilter) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| if lhsResult := lhs.fn(params); !lhsResult.Matched() { | ||
| return lhsResult | ||
| } | ||
| return rhs.fn(params) | ||
| } | ||
| } | ||
|
|
||
| func makeOrFilter(lhs, rhs matchFilter) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| if lhsResult := lhs.fn(params); lhsResult.Matched() { | ||
| return filterSuccess | ||
| } | ||
| return rhs.fn(params) | ||
| } | ||
| } | ||
|
|
||
| func makeFileImportsFilter(src, pkgPath string) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| _, imported := params.imports[pkgPath] | ||
| if imported { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeFilePkgPathMatchesFilter(src string, re *regexp.Regexp) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| pkgPath := params.ctx.Pkg.Path() | ||
| if re.MatchString(pkgPath) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeFileNameMatchesFilter(src string, re *regexp.Regexp) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| if re.MatchString(filepath.Base(params.filename)) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makePureFilter(src, varname string) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| n := params.subExpr(varname) | ||
| if isPure(params.ctx.Types, n) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeConstFilter(src, varname string) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| n := params.subExpr(varname) | ||
| if isConstant(params.ctx.Types, n) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeAddressableFilter(src, varname string) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| n := params.subExpr(varname) | ||
| if isAddressable(params.ctx.Types, n) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTypeImplementsFilter(src, varname string, iface *types.Interface) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| typ := params.typeofNode(params.subExpr(varname)) | ||
| if types.Implements(typ, iface) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTypeIsFilter(src, varname string, underlying bool, pat *typematch.Pattern) filterFunc { | ||
| if underlying { | ||
| return func(params *filterParams) matchFilterResult { | ||
| typ := params.typeofNode(params.subExpr(varname)).Underlying() | ||
| if pat.MatchIdentical(typ) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
| return func(params *filterParams) matchFilterResult { | ||
| typ := params.typeofNode(params.subExpr(varname)) | ||
| if pat.MatchIdentical(typ) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTypeConvertibleToFilter(src, varname string, dstType types.Type) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| typ := params.typeofNode(params.subExpr(varname)) | ||
| if types.ConvertibleTo(typ, dstType) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTypeAssignableToFilter(src, varname string, dstType types.Type) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| typ := params.typeofNode(params.subExpr(varname)) | ||
| if types.AssignableTo(typ, dstType) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTypeSizeConstFilter(src, varname string, op token.Token, rhsValue constant.Value) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| typ := params.typeofNode(params.subExpr(varname)) | ||
| lhsValue := constant.MakeInt64(params.ctx.Sizes.Sizeof(typ)) | ||
| if constant.Compare(lhsValue, op, rhsValue) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeValueIntConstFilter(src, varname string, op token.Token, rhsValue constant.Value) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| lhsValue := intValueOf(params.ctx.Types, params.subExpr(varname)) | ||
| if lhsValue == nil { | ||
| return filterFailure(src) // The value is unknown | ||
| } | ||
| if constant.Compare(lhsValue, op, rhsValue) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeValueIntFilter(src, varname string, op token.Token, rhsVarname string) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| lhsValue := intValueOf(params.ctx.Types, params.subExpr(varname)) | ||
| if lhsValue == nil { | ||
| return filterFailure(src) | ||
| } | ||
| rhsValue := intValueOf(params.ctx.Types, params.subExpr(rhsVarname)) | ||
| if rhsValue == nil { | ||
| return filterFailure(src) | ||
| } | ||
| if constant.Compare(lhsValue, op, rhsValue) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTextConstFilter(src, varname string, op token.Token, rhsValue constant.Value) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| s := params.nodeText(params.subExpr(varname)) | ||
| lhsValue := constant.MakeString(string(s)) | ||
| if constant.Compare(lhsValue, op, rhsValue) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTextFilter(src, varname string, op token.Token, rhsVarname string) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| s1 := params.nodeText(params.subExpr(varname)) | ||
| lhsValue := constant.MakeString(string(s1)) | ||
| s2 := params.nodeText(params.values[rhsVarname]) | ||
| rhsValue := constant.MakeString(string(s2)) | ||
| if constant.Compare(lhsValue, op, rhsValue) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeTextMatchesFilter(src, varname string, re *regexp.Regexp) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| if re.Match(params.nodeText(params.subExpr(varname))) { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } | ||
|
|
||
| func makeNodeIsFilter(src, varname string, cat nodeCategory) filterFunc { | ||
| return func(params *filterParams) matchFilterResult { | ||
| n := params.subExpr(varname) | ||
| var matched bool | ||
| switch cat { | ||
| case nodeExpr: | ||
| _, matched = n.(ast.Expr) | ||
| case nodeStmt: | ||
| _, matched = n.(ast.Stmt) | ||
| default: | ||
| matched = (cat == categorizeNode(n)) | ||
| } | ||
| if matched { | ||
| return filterSuccess | ||
| } | ||
| return filterFailure(src) | ||
| } | ||
| } |
Oops, something went wrong.