Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit fe5c8c3

Browse files
committed
[[ Docs ]] Improve variadic syntax declarations
The variadic syntax declarations were not very consisten with the way they used `...` to describe addition optional parameters of the same syntax. This patch attempts to make them consistent.
1 parent aa1f256 commit fe5c8c3

File tree

9 files changed

+28
-44
lines changed

9 files changed

+28
-44
lines changed

docs/dictionary/command/local.lcdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: local
22

33
Type: command
44

5-
Syntax: local <variableName> [= <value>] [, ...]
5+
Syntax: local <variableName> [= <value>] [, <variableName> [= <value>] ...]
66

77
Summary:
88
<declare|Declares> one or more <local variable|local variables> and

docs/dictionary/command/mobileControlDo.lcdoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: iphonecontroldo
44

55
Type: command
66

7-
Syntax: mobileControlDo <idOrName>, <action>, ...action specific parameters...
7+
Syntax: mobileControlDo <idOrName>, <action> [, <actionParameter> ...]
88

99
Summary:
1010
Execute specific behaviors of native mobile controls created using
@@ -42,6 +42,7 @@ The id or name of the control.
4242
action (enum):
4343
The name of the <action> to perform. See Description for complete <action> listing.
4444

45+
actionParameter: Additional parameter required for the action.
4546

4647
Description:
4748
Use the <mobileControlDo> command to execute behaviors specific to a

docs/dictionary/command/mobilePick.lcdoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: iphonepick
44

55
Type: command
66

7-
Syntax: mobilePick <optionList>, <initialIndex> [, <optionList>, <initialIndex>, ...] [, <style> ] [, <button>] [, <view>]
7+
Syntax: mobilePick <optionList1>, <initialIndex1> [, <optionList2>, <initialIndex2> ...] [, <style> ] [, <button>] [, <view>]
88

99
Summary:
1010
Presents the user with a native list picker dialog.
@@ -38,12 +38,15 @@ mobilePick tDays, 2, tMonths, 3, "checkmark"
3838
answer the result with "Okay"
3939

4040
Parameters:
41-
optionList:
41+
optionList1:
4242
A return delimited list of options.
4343

44-
initialIndex:
44+
initialIndex1:
4545
The (1-based) index of the item to be initially highlighted.
4646

47+
optionList2:
48+
initialIndex2:
49+
4750
style:
4851
The type of display used. On the iPad if "checkmark" is specified a
4952
check-mark (tick) is put against the currently selected item. If not

docs/dictionary/command/visual-effect.lcdoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Name: visual effect
22

33
Type: command
44

5-
Syntax: visual [effect] <effectName> [<speed>] [to <finalImage>]
6-
[with sound <audioClip>] [and <param> <value> and ...]
5+
Syntax: visual [effect] <effectName> [<speed>] [to <finalImage>] [with sound <audioClip>] [and <param> <value> ...]
76

87
Summary:
98
Adds a visual effect transition.

docs/dictionary/function/libUrlFormData.lcdoc

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: libURLFormData
22

33
Type: function
44

5-
Syntax: libURLFormData(<key_1>, <value_1>, ..., <key_n>, <value_n>)
5+
Syntax: libURLFormData(<key1>, <value1> [, <key2>, <value2> ...])
66

77
Summary:
88
<libURLFormData> formats data in the standard format suitable for
@@ -26,16 +26,10 @@ post it to url "http://www.someserver.com/cgi-bin/form.pl"
2626
-- In this case, the data posted to the url will look like this: name=John&message=Hello
2727

2828
Parameters:
29-
key_1:
30-
31-
32-
value_1:
33-
34-
35-
key_n:
36-
37-
38-
value_n:
29+
key1:
30+
value1:
31+
key2:
32+
value2:
3933

4034

4135
Description:

docs/dictionary/function/libUrlMultipartFormData.lcdoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Name: libURLMultipartFormData
22

33
Type: function
44

5-
Syntax: libURLMultipartFormData(<formData>, key_1, value_1, ..., key_n, value_n)
5+
Syntax: libURLMultipartFormData(<formData>, <key1>, <value1> [, <key2>, <value2> ...])
66

7-
Syntax: libURLMultipartFormData(<formData>, array)
7+
Syntax: libURLMultipartFormData(<formData>, <array>)
88

99
Syntax: libURLMultipartFormData(<formData>)
1010

@@ -42,6 +42,11 @@ end if
4242

4343
Parameters:
4444
formData: A variable, which will be filled with the form data.
45+
key1:
46+
value1:
47+
key2:
48+
value2:
49+
array:
4550

4651
Returns:
4752
The function will return empty if successful, or an error message

docs/dictionary/function/revBrowserCallScript.lcdoc

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: revBrowserCallScript
22

33
Type: function
44

5-
Syntax: revBrowserCallScript(<instanceId>, <functionName> [, <parameter1>, <parameter2>, ..., <parameterN>])
5+
Syntax: revBrowserCallScript(<instanceId>, <functionName> [, <functionParameter> ...])
66

77
Summary:
88
Calls a web script function in the current browser object
@@ -28,15 +28,9 @@ The integer identifier of a browser object
2828
functionName:
2929
The name of the web script function to call
3030

31-
parameter1:
32-
The parameters parameter1 through to parameterN contain the arguments
33-
to pass to the function (optional).
34-
35-
parameter2:
36-
37-
38-
parameterN:
39-
31+
functionParameter:
32+
One or more optional parameters may contain the arguments to pass to the
33+
function.
4034

4135
Description:
4236
Use the <revBrowserCallScript> function to call a web script function in

docs/dictionary/function/revOpenDatabase.lcdoc

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ Name: revOpenDatabase
33
Synonyms: revdb_connect
44

55
Type: function
6-
Syntax: revOpenDatabase(<databaseType>, {<hostAddress>, <databaseName>, [<userName>],[<passWord>],{[<useSSL>], [<socketAddr>], [<rwTimeout>], [<autoReconnect>] | [<cursorType>] | [<sslOption>],...} | <filePath>,[<sqliteOptions>]})
76

87
Syntax: revOpenDatabase("mysql", <hostAddress>, <databaseName>, [<userName>],[<passWord>],[<useSSL>], [<socketAddr>], [<rwTimeout>], [<autoReconnect>])
98

109
Syntax: revOpenDatabase("odbc", <hostAddress>, <databaseName>, [<userName>],[<passWord>],[<cursorType>])
1110

1211
Syntax: revOpenDatabase("sqlite",<filePath>,[<sqliteOptions>])
1312

14-
Syntax: revOpenDatabase("postgresql", <hostAddress>, <databaseName>, [<userName>], [<passWord>], [<sslOption>],...)
13+
Syntax: revOpenDatabase("postgresql", <hostAddress>, <databaseName>, [<userName>], [<passWord>] [, <sslOption> ...])
1514

1615
Syntax: revOpenDatabase("oracle", <hostAddress>, <databaseName>, [<userName>],[<passWord>])
1716

@@ -123,17 +122,6 @@ order of the items in the options parameter is not important):
123122
LiveCode encoding).
124123

125124

126-
databaseType (enum):
127-
A string specifying the database type to use. One of the following:
128-
129-
- "mysql"
130-
- "oracle"
131-
- "odbc"
132-
- "postgresql"
133-
- "valentina"
134-
- "sqlite"
135-
136-
137125
filePath (string):
138126
(SQLite Only) A string specifying the path to the SQLite database.
139127

docs/guides/LiveCode Documentation Format Reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ An entry may have a number of Syntax elements, if there are variations within th
5959

6060
The following can be used to specify livecode syntax:
6161
- [optional]
62-
- ... (repeated)
62+
- [repeated optional ...]
6363
- { variant 1 | variant 2 }
6464
- <parameterName>
6565

0 commit comments

Comments
 (0)