-
Notifications
You must be signed in to change notification settings - Fork 22
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.
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
Add wrappers around PyFrame and PyCode #225
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,6 @@ | ||
from __future__ import annotations | ||
|
||
def file_name(): ... | ||
def first_line_number(): ... | ||
def function_name(): ... | ||
def line_number(): ... |
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,34 @@ | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
const std = @import("std"); | ||
const py = @import("pydust"); | ||
|
||
pub fn line_number() u32 { | ||
return py.PyFrame.get().?.lineNumber(); | ||
} | ||
|
||
pub fn function_name() !py.PyString { | ||
return py.PyFrame.get().?.code().name(); | ||
} | ||
|
||
pub fn file_name() !py.PyString { | ||
return py.PyFrame.get().?.code().fileName(); | ||
} | ||
|
||
pub fn first_line_number() !u32 { | ||
return py.PyFrame.get().?.code().firstLineNumber(); | ||
} | ||
|
||
comptime { | ||
py.rootmodule(@This()); | ||
} |
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,45 @@ | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
const std = @import("std"); | ||
const py = @import("../pydust.zig"); | ||
const PyObjectMixin = @import("./obj.zig").PyObjectMixin; | ||
|
||
const ffi = py.ffi; | ||
|
||
/// Wrapper for Python PyCode. | ||
/// See: https://docs.python.org/3/c-api/code.html | ||
pub const PyCode = extern struct { | ||
obj: py.PyObject, | ||
|
||
pub inline fn firstLineNumber(self: *const PyCode) !u32 { | ||
const lineNo = try self.obj.getAs(py.PyLong, "co_firstlineno"); | ||
defer lineNo.decref(); | ||
return lineNo.as(u32); | ||
} | ||
|
||
pub inline fn fileName(self: *const PyCode) !py.PyString { | ||
return self.obj.getAs(py.PyString, "co_filename"); | ||
} | ||
|
||
pub inline fn name(self: *const PyCode) !py.PyString { | ||
return self.obj.getAs(py.PyString, "co_name"); | ||
} | ||
}; | ||
|
||
test "PyCode" { | ||
py.initialize(); | ||
defer py.finalize(); | ||
|
||
const pf = py.PyFrame.get(); | ||
try std.testing.expectEqual(@as(?py.PyFrame, null), pf); | ||
} |
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,53 @@ | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
const std = @import("std"); | ||
const py = @import("../pydust.zig"); | ||
const PyObjectMixin = @import("./obj.zig").PyObjectMixin; | ||
|
||
const ffi = py.ffi; | ||
|
||
/// Wrapper for Python PyFrame. | ||
/// See: https://docs.python.org/3/c-api/frame.html | ||
pub const PyFrame = extern struct { | ||
obj: py.PyObject, | ||
|
||
pub fn get() ?PyFrame { | ||
const frame = ffi.PyEval_GetFrame(); | ||
robert3005 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return if (frame) |f| .{ .obj = .{ .py = objPtr(f) } } else null; | ||
} | ||
|
||
pub fn code(self: PyFrame) py.PyCode { | ||
const codeObj = ffi.PyFrame_GetCode(framePtr(self.obj.py)); | ||
return .{ .obj = .{ .py = @alignCast(@ptrCast(codeObj)) } }; | ||
} | ||
|
||
pub inline fn lineNumber(self: PyFrame) u32 { | ||
return @intCast(ffi.PyFrame_GetLineNumber(framePtr(self.obj.py))); | ||
} | ||
|
||
inline fn framePtr(obj: *ffi.PyObject) *ffi.PyFrameObject { | ||
return @alignCast(@ptrCast(obj)); | ||
} | ||
|
||
inline fn objPtr(obj: *ffi.PyFrameObject) *ffi.PyObject { | ||
return @alignCast(@ptrCast(obj)); | ||
} | ||
}; | ||
|
||
test "PyFrame" { | ||
py.initialize(); | ||
defer py.finalize(); | ||
|
||
const pf = PyFrame.get(); | ||
try std.testing.expectEqual(@as(?PyFrame, null), pf); | ||
} |
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,30 @@ | ||
""" | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
""" | ||
|
||
from pathlib import Path | ||
|
||
from example import code | ||
|
||
|
||
def test_line_no(): | ||
assert code.line_number() == 21 | ||
assert code.first_line_number() == 20 | ||
|
||
|
||
def test_function_name(): | ||
assert code.function_name() == "test_function_name" | ||
|
||
|
||
def test_file_name(): | ||
assert Path(code.file_name()).name == "test_code.py" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can find a handy reference of the field names in https://docs.python.org/3/library/inspect.html