hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Codegen: fix autopep8 pre-commit hook

Browse Source
This commit is contained in:
Paolo Tranquilli
2023-03-29 15:57:45 +02:00
parent 48c2303391
commit 92197bf9f2
5 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@@ -19,7 +19,7 @@ repos:
rev: v1.6.0 rev: v1.6.0
hooks: hooks:
- id: autopep8 - id: autopep8
files: ^swift/.*\.py files: ^misc/codegen/.*\.py
- repo: local - repo: local
hooks: hooks:

1
misc/codegen/lib/schemadefs.py
View File

@@ -94,6 +94,7 @@ class _Listifier(_schema.PropertyModifier):
raise _schema.Error( raise _schema.Error(
"list should only be applied to simple or optional property types") "list should only be applied to simple or optional property types")
class _Setifier(_schema.PropertyModifier): class _Setifier(_schema.PropertyModifier):
def modify(self, prop: _schema.Property): def modify(self, prop: _schema.Property):
K = _schema.Property.Kind K = _schema.Property.Kind

100
misc/codegen/test/test_cppgen.py
View File

@@ -41,8 +41,8 @@ def test_empty_class(generate):
assert generate([ assert generate([
schema.Class(name="MyClass"), schema.Class(name="MyClass"),
]) == [ ]) == [
cpp.Class(name="MyClass", final=True, trap_name="MyClasses") cpp.Class(name="MyClass", final=True, trap_name="MyClasses")
] ]
def test_two_class_hierarchy(generate): def test_two_class_hierarchy(generate):
@@ -51,9 +51,9 @@ def test_two_class_hierarchy(generate):
schema.Class(name="A", derived={"B"}), schema.Class(name="A", derived={"B"}),
schema.Class(name="B", bases=["A"]), schema.Class(name="B", bases=["A"]),
]) == [ ]) == [
base, base,
cpp.Class(name="B", bases=[base], final=True, trap_name="Bs"), cpp.Class(name="B", bases=[base], final=True, trap_name="Bs"),
] ]
@pytest.mark.parametrize("type,expected", [ @pytest.mark.parametrize("type,expected", [
@@ -73,12 +73,12 @@ def test_class_with_field(generate, type, expected, property_cls, optional, repe
assert generate([ assert generate([
schema.Class(name="MyClass", properties=[property_cls("prop", type)]), schema.Class(name="MyClass", properties=[property_cls("prop", type)]),
]) == [ ]) == [
cpp.Class(name="MyClass", cpp.Class(name="MyClass",
fields=[cpp.Field("prop", expected, is_optional=optional, fields=[cpp.Field("prop", expected, is_optional=optional,
is_repeated=repeated, is_unordered=unordered, trap_name=trap_name)], is_repeated=repeated, is_unordered=unordered, trap_name=trap_name)],
trap_name="MyClasses", trap_name="MyClasses",
final=True) final=True)
] ]
def test_class_field_with_null(generate, input): def test_class_field_with_null(generate, input):
@@ -91,13 +91,13 @@ def test_class_field_with_null(generate, input):
schema.SingleProperty("y", "B"), schema.SingleProperty("y", "B"),
]) ])
]) == [ ]) == [
a, a,
cpp.Class(name="B", bases=[a], final=True, trap_name="Bs", cpp.Class(name="B", bases=[a], final=True, trap_name="Bs",
fields=[ fields=[
cpp.Field("x", "TrapLabel<ATag>"), cpp.Field("x", "TrapLabel<ATag>"),
cpp.Field("y", "TrapLabel<BOrNoneTag>"), cpp.Field("y", "TrapLabel<BOrNoneTag>"),
]), ]),
] ]
def test_class_with_predicate(generate): def test_class_with_predicate(generate):
@@ -105,12 +105,12 @@ def test_class_with_predicate(generate):
schema.Class(name="MyClass", properties=[ schema.Class(name="MyClass", properties=[
schema.PredicateProperty("prop")]), schema.PredicateProperty("prop")]),
]) == [ ]) == [
cpp.Class(name="MyClass", cpp.Class(name="MyClass",
fields=[ fields=[
cpp.Field("prop", "bool", trap_name="MyClassProp", is_predicate=True)], cpp.Field("prop", "bool", trap_name="MyClassProp", is_predicate=True)],
trap_name="MyClasses", trap_name="MyClasses",
final=True) final=True)
] ]
@pytest.mark.parametrize("name", @pytest.mark.parametrize("name",
@@ -120,11 +120,11 @@ def test_class_with_overridden_unsigned_field(generate, name):
schema.Class(name="MyClass", properties=[ schema.Class(name="MyClass", properties=[
schema.SingleProperty(name, "bar")]), schema.SingleProperty(name, "bar")]),
]) == [ ]) == [
cpp.Class(name="MyClass", cpp.Class(name="MyClass",
fields=[cpp.Field(name, "unsigned")], fields=[cpp.Field(name, "unsigned")],
trap_name="MyClasses", trap_name="MyClasses",
final=True) final=True)
] ]
def test_class_with_overridden_underscore_field(generate): def test_class_with_overridden_underscore_field(generate):
@@ -132,11 +132,11 @@ def test_class_with_overridden_underscore_field(generate):
schema.Class(name="MyClass", properties=[ schema.Class(name="MyClass", properties=[
schema.SingleProperty("something_", "bar")]), schema.SingleProperty("something_", "bar")]),
]) == [ ]) == [
cpp.Class(name="MyClass", cpp.Class(name="MyClass",
fields=[cpp.Field("something", "bar")], fields=[cpp.Field("something", "bar")],
trap_name="MyClasses", trap_name="MyClasses",
final=True) final=True)
] ]
@pytest.mark.parametrize("name", cpp.cpp_keywords) @pytest.mark.parametrize("name", cpp.cpp_keywords)
@@ -145,11 +145,11 @@ def test_class_with_keyword_field(generate, name):
schema.Class(name="MyClass", properties=[ schema.Class(name="MyClass", properties=[
schema.SingleProperty(name, "bar")]), schema.SingleProperty(name, "bar")]),
]) == [ ]) == [
cpp.Class(name="MyClass", cpp.Class(name="MyClass",
fields=[cpp.Field(name + "_", "bar")], fields=[cpp.Field(name + "_", "bar")],
trap_name="MyClasses", trap_name="MyClasses",
final=True) final=True)
] ]
def test_classes_with_dirs(generate_grouped): def test_classes_with_dirs(generate_grouped):
@@ -161,11 +161,11 @@ def test_classes_with_dirs(generate_grouped):
schema.Class(name="C", bases=["CBase"], group="bar"), schema.Class(name="C", bases=["CBase"], group="bar"),
schema.Class(name="D", group="foo/bar/baz"), schema.Class(name="D", group="foo/bar/baz"),
]) == { ]) == {
".": [cpp.Class(name="A", trap_name="As", final=True)], ".": [cpp.Class(name="A", trap_name="As", final=True)],
"foo": [cpp.Class(name="B", trap_name="Bs", final=True)], "foo": [cpp.Class(name="B", trap_name="Bs", final=True)],
"bar": [cbase, cpp.Class(name="C", bases=[cbase], trap_name="Cs", final=True)], "bar": [cbase, cpp.Class(name="C", bases=[cbase], trap_name="Cs", final=True)],
"foo/bar/baz": [cpp.Class(name="D", trap_name="Ds", final=True)], "foo/bar/baz": [cpp.Class(name="D", trap_name="Ds", final=True)],
} }
def test_cpp_skip_pragma(generate): def test_cpp_skip_pragma(generate):
@@ -175,10 +175,10 @@ def test_cpp_skip_pragma(generate):
schema.SingleProperty("y", "bar", pragmas=["x", "cpp_skip", "y"]), schema.SingleProperty("y", "bar", pragmas=["x", "cpp_skip", "y"]),
]) ])
]) == [ ]) == [
cpp.Class(name="A", final=True, trap_name="As", fields=[ cpp.Class(name="A", final=True, trap_name="As", fields=[
cpp.Field("x", "foo"), cpp.Field("x", "foo"),
]), ]),
] ]
def test_ipa_classes_ignored(generate): def test_ipa_classes_ignored(generate):
@@ -199,8 +199,8 @@ def test_ipa_classes_ignored(generate):
name="Z", name="Z",
), ),
]) == [ ]) == [
cpp.Class(name="Z", final=True, trap_name="Zs"), cpp.Class(name="Z", final=True, trap_name="Zs"),
] ]
if __name__ == '__main__': if __name__ == '__main__':

3
misc/codegen/test/test_ql.py
View File

@@ -36,6 +36,7 @@ indefinite_getters = [
("Whatever", "getAWhatever"), ("Whatever", "getAWhatever"),
] ]
@pytest.mark.parametrize("name,expected_getter", indefinite_getters) @pytest.mark.parametrize("name,expected_getter", indefinite_getters)
def test_property_indefinite_article(name, expected_getter): def test_property_indefinite_article(name, expected_getter):
prop = ql.Property(name, plural="X") prop = ql.Property(name, plural="X")
@@ -47,6 +48,7 @@ def test_property_unordered_getter(name, expected_getter):
prop = ql.Property(name, plural="X", is_unordered=True) prop = ql.Property(name, plural="X", is_unordered=True)
assert prop.getter == expected_getter assert prop.getter == expected_getter
@pytest.mark.parametrize("plural,expected", [ @pytest.mark.parametrize("plural,expected", [
(None, False), (None, False),
("", False), ("", False),
@@ -56,6 +58,7 @@ def test_property_is_repeated(plural, expected):
prop = ql.Property("foo", "Foo", "props", ["result"], plural=plural) prop = ql.Property("foo", "Foo", "props", ["result"], plural=plural)
assert prop.is_repeated is expected assert prop.is_repeated is expected
@pytest.mark.parametrize("plural,unordered,expected", [ @pytest.mark.parametrize("plural,unordered,expected", [
(None, False, False), (None, False, False),
("", False, False), ("", False, False),

17
misc/codegen/test/test_qlgen.py
View File

@@ -337,21 +337,22 @@ def test_repeated_property(generate_classes, is_child, prev_child):
])), ])),
} }
def test_repeated_unordered_property(generate_classes): def test_repeated_unordered_property(generate_classes):
assert generate_classes([ assert generate_classes([
schema.Class("FakeRoot"), schema.Class("FakeRoot"),
schema.Class("MyObject", properties=[ schema.Class("MyObject", properties=[
schema.RepeatedUnorderedProperty("foo", "bar")]), schema.RepeatedUnorderedProperty("foo", "bar")]),
]) == { ]) == {
"FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"), "FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
a_ql_class(name="FakeRoot", final=True)), a_ql_class(name="FakeRoot", final=True)),
"MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"), "MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
a_ql_class(name="MyObject", final=True, properties=[ a_ql_class(name="MyObject", final=True, properties=[
ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos", ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos",
tableparams=["this", "result"], is_unordered=True, tableparams=["this", "result"], is_unordered=True,
doc="foo of this my object", doc_plural="foos of this my object"), doc="foo of this my object", doc_plural="foos of this my object"),
])), ])),
} }
@pytest.mark.parametrize("is_child,prev_child", [(False, None), (True, "")]) @pytest.mark.parametrize("is_child,prev_child", [(False, None), (True, "")])
@@ -588,8 +589,8 @@ def test_test_partial_properties(opts, generate_tests):
is_indexed=True, is_indexed=True,
type="int")), type="int")),
"B/B_getAW.ql": a_ql_property_tester(class_name="B", "B/B_getAW.ql": a_ql_property_tester(class_name="B",
property=ql.PropertyForTest(getter="getAW", is_total=False, property=ql.PropertyForTest(getter="getAW", is_total=False,
type="string")), type="string")),
} }