Merge pull request #1 from zaach/master

update

README.md

@@ -60,38 +60,39 @@ Usage from a CommonJS module
 
 You can generate parsers programatically from JavaScript as well. Assuming Jison is in your commonjs environment's load path:
 
-    // mygenerator.js
-    var Parser = require("jison").Parser;
-
-    // a grammar in JSON
-    var grammar = {
-        "lex": {
-            "rules": [
-               ["\\s+", "/* skip whitespace */"],
-               ["[a-f0-9]+", "return 'HEX';"]
-            ]
-        },
-
-        "bnf": {
-            "hex_strings" :[ "hex_strings HEX",
-                             "HEX" ]
-        }
-    };
-
-    // `grammar` can also be a string that uses jison's grammar format
-    var parser = new Parser(grammar);
-
-    // generate source, ready to be written to disk
-    var parserSource = parser.generate();
-
-    // you can also use the parser directly from memory
-
-    // returns true
-    parser.parse("adfe34bc e82a");
-
-    // throws lexical error
-    parser.parse("adfe34bc zxg");
-
+```javascript
+// mygenerator.js
+var Parser = require("jison").Parser;
+
+// a grammar in JSON
+var grammar = {
+    "lex": {
+        "rules": [
+           ["\\s+", "/* skip whitespace */"],
+           ["[a-f0-9]+", "return 'HEX';"]
+        ]
+    },
+
+    "bnf": {
+        "hex_strings" :[ "hex_strings HEX",
+                         "HEX" ]
+    }
+};
+
+// `grammar` can also be a string that uses jison's grammar format
+var parser = new Parser(grammar);
+
+// generate source, ready to be written to disk
+var parserSource = parser.generate();
+
+// you can also use the parser directly from memory
+
+// returns true
+parser.parse("adfe34bc e82a");
+
+// throws lexical error
+parser.parse("adfe34bc zxg");
+```
 
 More Documentation
 ------------------

examples/json.js

@@ -33,6 +33,8 @@ exports.grammar = {
 
     "bnf": {
         "JSONString": [ "STRING" ],
+
+        "JSONNullLiteral": [ "NULL" ],
 
         "JSONNumber": [ "NUMBER" ],
 

lib/jison.js

@@ -1359,13 +1359,9 @@ function parseError (str, hash) {
     if (hash.recoverable) {
         this.trace(str);
     } else {
-        function _parseError (msg, hash) {
-            this.message = msg;
-            this.hash = hash;
-        }
-        _parseError.prototype = new Error();
-
-        throw new _parseError(str, hash);
+        var error = new Error(str);
+        error.hash = hash;
+        throw error;
     }
 }
 

package.json

@@ -2,7 +2,7 @@
   "author": "Zach Carter <[email protected]> (http://zaa.ch)",
   "name": "jison",
   "description": "A parser generator with Bison's API",
-  "version": "0.4.15",
+  "version": "0.4.17",
   "license": "MIT",
   "keywords": [
     "jison",