Commit 69d78710 authored by Chris's avatar Chris

Merge commit 'c5431bb044ce52b3b5744e400d4aadbb2a12bc11'

Conflicts:
	setjs/README.md
parents 0e5bde8e 72d5740f
...@@ -11,7 +11,8 @@ The `BasicSet` in SetJS supports values of type `Number` or `String`. ...@@ -11,7 +11,8 @@ The `BasicSet` in SetJS supports values of type `Number` or `String`.
```javascript ```javascript
new BasicSet([initialData]); new BasicSet([initialData]);
``` ```
`initialData` can be a value, several values, an array of values, or a mix of values and arrays of values. If no arguments are provided an empty `BasicSet` will be returned. For example, the following would return a `BasicSet` containing the values `{1,'2',2.5,'c','d',5.0}`. The `initialData` argument(s) can be a value, several values, an array of values, or a mix of values and arrays of values. If no arguments are provided an empty `BasicSet` will be returned. For example, the following would return a `BasicSet` containing the values `{1,'2',2.5,'c','d',5.0}`.
```javascript ```javascript
var set = new BasicSet(1,'2',[2.5,'c'],'d',5.0); // {1,'2',2.5,'c','d',5.0} var set = new BasicSet(1,'2',[2.5,'c'],'d',5.0); // {1,'2',2.5,'c','d',5.0}
``` ```
...@@ -51,4 +52,5 @@ var set = new BasicSet(1,'2',[2.5,'c'],'d',5.0); // {1,'2',2.5,'c','d',5.0} ...@@ -51,4 +52,5 @@ var set = new BasicSet(1,'2',[2.5,'c'],'d',5.0); // {1,'2',2.5,'c','d',5.0}
[1]: http://en.wikipedia.org/wiki/Set_(computer_science) "Set (abstract data type)" [1]: http://en.wikipedia.org/wiki/Set_(computer_science) "Set (abstract data type)"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment