Merge branch 'master' of github.com:processing/p5.js

Author: Lauren McCarthy

Gruntfile.js

@@ -362,6 +362,9 @@ module.exports = function(grunt) {
     open: {
       yui: {
         path: 'http://127.0.0.1:9001/docs/reference/'
+      },
+      dev: {
+        path: 'http://127.0.0.1:9001/test/'
       }
     },
     'saucelabs-mocha': {

developer_docs/README.md

@@ -78,7 +78,7 @@ $ grunt
 Sometimes it is useful to run the tests in the browser instead of on the command line. To do this, first start the [connect](https://github.com/gruntjs/grunt-contrib-connect) server:
 
 ```
-$ npm run grunt connect -keepalive
+$ npm run dev
 ```
 
 With the server running, you should be able to open `test/test.html` in a browser.
@@ -108,7 +108,7 @@ A complete guide to unit testing is beyond the scope of the p5.js documentation,
    $ npm run grunt
    ```
 
-   If you're continuously changing files in the library, you may want to run `npm run grunt watch:quick` to automatically rebuild the library for you whenever any of its source files change without you having to first type the command manually.
+   If you're continuously changing files in the library, you may want to run `npm run dev` to automatically rebuild the library for you whenever any of its source files change without you having to first type the command manually.
 
 6. Make some changes to the codebase and [commit](https://help.github.com/articles/github-glossary/#commit) them with Git.
 

developer_docs/inline_documentation.md

@@ -68,6 +68,13 @@ If the parameter is optional, add square brackets around the name:
 @param {type} [name] Description here.
 ```
 
+If the parameter takes one or more values defined in `constants.js`,
+then the type should be specified as `{Constant}` and the valid values should be enumerated in the comment following the `either` keyword, eg:
+
+```
+@param {Constant} horizAlign horizontal alignment, either LEFT, CENTER, or RIGHT
+```
+
 ## Specify return type
 
 The `@return` is identical to `@params`, but without the name. It should be the last element in `@method`. The JS types are: String, Number, Boolean, Object, Array, Null, and Undefined. If there is no return type, do not include `@return`. 

docs/preprocessor.js

@@ -70,27 +70,40 @@ function mergeOverloadedMethods(data) {
       }
     };
 
-    var extractConsts = function(params) {
-      params &&
-        params.forEach(function(param) {
-          if (param.type.split('|').indexOf('Constant') >= 0) {
-            var match;
-            if (classitem.name === 'endShape' && param.name === 'mode') {
-              match = 'CLOSE';
-            } else {
-              var constantRe = /either\s+(?:[A-Z0-9_]+\s*,?\s*(?:or)?\s*)+/g;
-              var execResult = constantRe.exec(param.description);
-              match = execResult && execResult[0];
-            }
-            if (match) {
-              var reConst = /[A-Z0-9_]+/g;
-              var matchConst;
-              while ((matchConst = reConst.exec(match)) !== null) {
-                methodConsts[matchConst] = true;
-              }
-            }
+    var extractConsts = function(param) {
+      if (!param.type) {
+        console.log(param);
+      }
+      if (param.type.split('|').indexOf('Constant') >= 0) {
+        var match;
+        if (classitem.name === 'endShape' && param.name === 'mode') {
+          match = 'CLOSE';
+        } else {
+          var constantRe = /either\s+(?:[A-Z0-9_]+\s*,?\s*(?:or)?\s*)+/g;
+          var execResult = constantRe.exec(param.description);
+          match = execResult && execResult[0];
+          if (!match) {
+            throw new Error(
+              classitem.file +
+                ':' +
+                classitem.line +
+                ', Constant-typed parameter ' +
+                fullName +
+                '(...' +
+                param.name +
+                '...) is missing valid value enumeration. ' +
+                'See inline_documentation.md#specify-parameters.'
+            );
+          }
+        }
+        if (match) {
+          var reConst = /[A-Z0-9_]+/g;
+          var matchConst;
+          while ((matchConst = reConst.exec(match)) !== null) {
+            methodConsts[matchConst] = true;
           }
-        });
+        }
+      }
     };
 
     var processOverloadedParams = function(params) {
@@ -125,10 +138,10 @@ function mergeOverloadedMethods(data) {
           );
         } else {
           paramNames[param.name] = param;
+          extractConsts(param);
         }
       });
 
-      extractConsts(params);
       return params;
     };
 
@@ -182,7 +195,11 @@ function mergeOverloadedMethods(data) {
         method.overloads.push(makeOverload(classitem));
         return false;
       } else {
-        extractConsts(classitem.params);
+        if (classitem.params) {
+          classitem.params.forEach(function(param) {
+            extractConsts(param);
+          });
+        }
         methodsByFullName[fullName] = classitem;
       }
 

package.json

@@ -4,6 +4,7 @@
   "scripts": {
     "grunt": "grunt",
     "build": "grunt build",
+    "dev": "grunt browserify connect open:dev watch:quick",
     "docs": "grunt yui",
     "docs:dev": "grunt yui:dev",
     "test": "grunt",