-
Notifications
You must be signed in to change notification settings - Fork 23
Lua 5.3 integer support #11
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
Open
lukealonso
wants to merge
1
commit into
torch:master
Choose a base branch
from
lukealonso:integer
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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 |
---|---|---|
|
@@ -74,7 +74,7 @@ argtypes.index = { | |
end | ||
} | ||
|
||
for _,typename in ipairs({"real", "unsigned char", "char", "short", "int", "long", "float", "double"}) do | ||
for _,typename in ipairs({"real", "float", "double"}) do | ||
argtypes[typename] = { | ||
|
||
helpname = function(arg) | ||
|
@@ -127,6 +127,59 @@ for _,typename in ipairs({"real", "unsigned char", "char", "short", "int", "long | |
} | ||
end | ||
|
||
for _,typename in ipairs({"unsigned char", "char", "short", "int", "long"}) do | ||
argtypes[typename] = { | ||
|
||
helpname = function(arg) | ||
return typename | ||
end, | ||
|
||
declare = function(arg) | ||
-- if it is a number we initialize here | ||
local default = tonumber(interpretdefaultvalue(arg)) or 0 | ||
return string.format("%s arg%d = %g;", typename, arg.i, default) | ||
end, | ||
|
||
check = function(arg, idx) | ||
return string.format("lua_isnumber(L, %d)", idx) | ||
end, | ||
|
||
read = function(arg, idx) | ||
return string.format("arg%d = (%s)lua_tointeger(L, %d);", arg.i, typename, idx) | ||
end, | ||
|
||
init = function(arg) | ||
-- otherwise do it here | ||
if arg.default then | ||
local default = interpretdefaultvalue(arg) | ||
if not tonumber(default) then | ||
return string.format("arg%d = %s;", arg.i, default) | ||
end | ||
end | ||
end, | ||
|
||
carg = function(arg) | ||
return string.format('arg%d', arg.i) | ||
end, | ||
|
||
creturn = function(arg) | ||
return string.format('arg%d', arg.i) | ||
end, | ||
|
||
precall = function(arg) | ||
if arg.returned then | ||
return string.format('lua_pushinteger(L, (long)arg%d);', arg.i) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same for here and other calls to lua_*integer |
||
end | ||
end, | ||
|
||
postcall = function(arg) | ||
if arg.creturned then | ||
return string.format('lua_pushinteger(L, (long)arg%d);', arg.i) | ||
end | ||
end | ||
} | ||
end | ||
|
||
argtypes.byte = argtypes['unsigned char'] | ||
|
||
argtypes.boolean = { | ||
|
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.
wouldn't this break Lua 5.2 and Lua 5.1 support, as they do not have lua_tointeger. Can we guard it with a version check somehow?