Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Threads 0.9.2 #1

Merged
merged 1 commit into from
Apr 2, 2015
Merged

Threads 0.9.2 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions modules/Thread.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ return {
functions = {
{}
}
},
{
name = 'isRunning',
description = 'Returns whether the thread is currently running.\n\nThreads which are not running can be (re)started with Thread:start.',
functions = {
{
returns = {
type = 'boolean',
name = 'running',
description = 'True if the thread is running, false otherwise.'
}
}
}
}
},
supertypes = {
Expand Down Expand Up @@ -123,7 +136,7 @@ return {
description = 'Send a message to the thread Channel.\n\nThe value of the message can be a boolean, string, number, LÖVE userdata, or a simple flat table. Foreign userdata (Lua\'s files, LuaSocket, ENet, ...), functions, and tables inside tables are not supported.',
functions = {
{
returns = {
arguments = {
{
type = 'value',
name = 'value',
Expand All @@ -138,7 +151,7 @@ return {
description = 'Send a message to the thread Channel and wait for a thread to accept it.\n\nThe value of the message can be a boolean, string, number, LÖVE userdata, or a simple flat table. Foreign userdata (Lua\'s files, LuaSocket, ENet, ...), functions, and tables inside tables are not supported.',
functions = {
{
returns = {
arguments = {
{
type = 'value',
name = 'value',
Expand Down Expand Up @@ -198,15 +211,10 @@ return {
functions = {
{
arguments = {
{
type = 'string',
name = 'name',
description = 'The name of the thread.'
},
{
type = 'string',
name = 'filename',
description = 'The name of the File to use as source.'
description = 'The name of the Lua File to use as source.'
}
},
returns = {
Expand All @@ -220,14 +228,9 @@ return {
{
arguments = {
{
type = 'string',
name = 'name',
description = 'The name of the thread.'
},
{
type = 'File',
name = 'file',
description = 'The file to use as source.'
type = 'FileData',
name = 'fileData',
description = 'The FileData containing the Lua code to use as the source.'
}
},
returns = {
Expand All @@ -242,13 +245,8 @@ return {
arguments = {
{
type = 'string',
name = 'name',
description = 'The name of the thread.'
},
{
type = 'Data',
name = 'data',
description = 'The data to use as source.'
name = 'codestring',
description = 'A string containing the Lua code to use as the source.'
}
},
returns = {
Expand All @@ -262,4 +260,4 @@ return {
}
}
}
}
}