Skip to content

Commit

Permalink
refactor: make all forms, types, contents @final
Browse files Browse the repository at this point in the history
  • Loading branch information
agoose77 committed Dec 23, 2022
1 parent c74f440 commit 6e47ba3
Show file tree
Hide file tree
Showing 31 changed files with 62 additions and 12 deletions.
3 changes: 2 additions & 1 deletion src/awkward/contents/bitmaskedarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
from awkward.contents.content import Content
from awkward.forms.bitmaskedform import BitMaskedForm
from awkward.index import Index
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class BitMaskedArray(Content):
is_option = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/bytemaskedarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
from awkward.contents.content import Content
from awkward.forms.bytemaskedform import ByteMaskedForm
from awkward.index import Index
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class ByteMaskedArray(Content):
is_option = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/emptyarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
from awkward._util import unset
from awkward.contents.content import Content
from awkward.forms.emptyform import EmptyForm
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class EmptyArray(Content):
is_unknown = True
is_leaf = True
Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/indexedarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
from awkward.contents.content import Content
from awkward.forms.indexedform import IndexedForm
from awkward.index import Index
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class IndexedArray(Content):
is_indexed = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/indexedoptionarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
from awkward.contents.content import Content
from awkward.forms.indexedoptionform import IndexedOptionForm
from awkward.index import Index
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class IndexedOptionArray(Content):
is_option = True
is_indexed = True
Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/listarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
from awkward.contents.listoffsetarray import ListOffsetArray
from awkward.forms.listform import ListForm
from awkward.index import Index
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()


@final
class ListArray(Content):
is_list = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/listoffsetarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
from awkward.contents.content import Content
from awkward.forms.listoffsetform import ListOffsetForm
from awkward.index import Index
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class ListOffsetArray(Content):
is_list = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/numpyarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
from awkward.contents.content import Content
from awkward.forms.numpyform import NumpyForm
from awkward.types.numpytype import primitive_to_dtype
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class NumpyArray(Content):
is_numpy = True
is_leaf = True
Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/recordarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
from awkward.contents.content import Content
from awkward.forms.recordform import RecordForm
from awkward.record import Record
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class RecordArray(Content):
is_record = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/regulararray.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
from awkward._util import unset
from awkward.contents.content import Content
from awkward.forms.regularform import RegularForm
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class RegularArray(Content):
is_list = True
is_regular = True
Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/unionarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
from awkward.contents.content import Content
from awkward.forms.unionform import UnionForm
from awkward.index import Index, Index8, Index64
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class UnionArray(Content):
is_union = True

Expand Down
3 changes: 2 additions & 1 deletion src/awkward/contents/unmaskedarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
from awkward._util import unset
from awkward.contents.content import Content
from awkward.forms.unmaskedform import UnmaskedForm
from awkward.typing import Final, Self
from awkward.typing import Final, Self, final

np = ak._nplikes.NumpyMetadata.instance()
numpy = ak._nplikes.Numpy.instance()


@final
class UnmaskedArray(Content):
is_option = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/bitmaskedform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class BitMaskedForm(Form):
is_option = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/bytemaskedform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class ByteMaskedForm(Form):
is_option = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/emptyform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form
from awkward.typing import final


@final
class EmptyForm(Form):
is_numpy = True
is_unknown = True
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/indexedform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal, _parameters_update
from awkward.typing import final


@final
class IndexedForm(Form):
is_indexed = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/indexedoptionform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class IndexedOptionForm(Form):
is_option = True
is_indexed = True
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/listform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class ListForm(Form):
is_list = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/listoffsetform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class ListOffsetForm(Form):
is_list = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/numpyform.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final

np = ak._nplikes.NumpyMetadata.instance()

Expand Down Expand Up @@ -34,6 +35,7 @@ def from_dtype(dtype, parameters=None):
)


@final
class NumpyForm(Form):
is_numpy = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/recordform.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class RecordForm(Form):
is_record = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/regularform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class RegularForm(Form):
is_list = True
is_regular = True
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/unionform.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class UnionForm(Form):
is_union = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/forms/unmaskedform.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward._util import unset
from awkward.forms.form import Form, _parameters_equal
from awkward.typing import final


@final
class UnmaskedForm(Form):
is_option = True

Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/listtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward.forms.form import _parameters_equal
from awkward.types.type import Type
from awkward.typing import final


@final
class ListType(Type):
def __init__(self, content, *, parameters=None, typestr=None):
if not isinstance(content, Type):
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/numpytype.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import awkward as ak
from awkward.forms.form import _parameters_equal
from awkward.types.type import Type
from awkward.typing import final

np = ak._nplikes.NumpyMetadata.instance()

Expand Down Expand Up @@ -92,6 +93,7 @@ def dtype_to_primitive(dtype):
_dtype_to_primitive_dict[dtype] = primitive


@final
class NumpyType(Type):
def __init__(self, primitive, *, parameters=None, typestr=None):
primitive = dtype_to_primitive(primitive_to_dtype(primitive))
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/optiontype.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
from awkward.types.regulartype import RegularType
from awkward.types.type import Type
from awkward.types.uniontype import UnionType
from awkward.typing import final


@final
class OptionType(Type):
def __init__(self, content, *, parameters=None, typestr=None):
if not isinstance(content, Type):
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/recordtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
import awkward._prettyprint
from awkward.forms.form import _parameters_equal
from awkward.types.type import Type
from awkward.typing import final


@final
class RecordType(Type):
def __init__(self, contents, fields, *, parameters=None, typestr=None):
if not isinstance(contents, Iterable):
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/regulartype.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward.forms.form import _parameters_equal
from awkward.types.type import Type
from awkward.typing import final


@final
class RegularType(Type):
def __init__(self, content, size, *, parameters=None, typestr=None):
if not isinstance(content, Type):
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/uniontype.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
import awkward as ak
from awkward.forms.form import _parameters_equal
from awkward.types.type import Type
from awkward.typing import final


@final
class UnionType(Type):
def __init__(self, contents, *, parameters=None, typestr=None):
if not isinstance(contents, Iterable):
Expand Down
2 changes: 2 additions & 0 deletions src/awkward/types/unknowntype.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import awkward as ak
from awkward.forms.form import _parameters_equal
from awkward.types.type import Type
from awkward.typing import final


@final
class UnknownType(Type):
def __init__(self, *, parameters=None, typestr=None):
if parameters is not None and not isinstance(parameters, dict):
Expand Down

0 comments on commit 6e47ba3

Please sign in to comment.