protobufjs 3.6.0 → 3.8.2

package/src/ProtoBuf/DotProto/Parser.js

@@ -6,7 +6,7 @@
 /**
  * Constructs a new Parser.
  * @exports ProtoBuf.DotProto.Parser
- * @class proto parser
+ * @class prototype parser
  * @param {string} proto Protocol source
  * @constructor
  */
@@ -20,13 +20,19 @@ var Parser = function(proto) {
     this.tn = new Tokenizer(proto);
 };
 
+/**
+ * @alias ProtoBuf.DotProto.Parser.prototype
+ * @inner
+ */
+var ParserPrototype = Parser.prototype;
+
 /**
  * Runs the parser.
  * @return {{package: string|null, messages: Array.<object>, enums: Array.<object>, imports: Array.<string>, options: object<string,*>}}
  * @throws {Error} If the source cannot be parsed
  * @expose
  */
-Parser.prototype.parse = function() {
+ParserPrototype.parse = function() {
     var topLevel = {
         "name": "[ROOT]", // temporary
         "package": null,
@@ -41,12 +47,12 @@ Parser.prototype.parse = function() {
         switch (token) {
             case 'package':
                 if (!head || topLevel["package"] !== null)
-                    throw Error("Illegal package at line "+this.tn.line);
+                    throw Error("Unexpected package at line "+this.tn.line);
                 topLevel["package"] = this._parsePackage(token);
                 break;
             case 'import':
                 if (!head)
-                    throw Error("Illegal import at line "+this.tn.line);
+                    throw Error("Unexpected import at line "+this.tn.line);
                 topLevel.imports.push(this._parseImport(token));
                 break;
             case 'message':
@@ -59,7 +65,7 @@ Parser.prototype.parse = function() {
                 break;
             case 'option':
                 if (!head)
-                    throw Error("Illegal option at line "+this.tn.line);
+                    throw Error("Unexpected option at line "+this.tn.line);
                 this._parseOption(topLevel, token);
                 break;
             case 'service':
@@ -72,7 +78,7 @@ Parser.prototype.parse = function() {
                 this._parseIgnoredStatement(topLevel, token);
                 break;
             default:
-                throw Error("Illegal token at line "+this.tn.line+": "+token);
+                throw Error("Unexpected token at line "+this.tn.line+": "+token);
         }
     }
     delete topLevel["name"];
@@ -86,7 +92,7 @@ Parser.prototype.parse = function() {
  * @throws {Error} If the number value is invalid
  * @private
  */
-Parser.prototype._parseNumber = function(val) {
+ParserPrototype._parseNumber = function(val) {
     var sign = 1;
     if (val.charAt(0) == '-')
         sign = -1,
@@ -104,18 +110,17 @@ Parser.prototype._parseNumber = function(val) {
 
 /**
  * Parses a (possibly multiline) string.
- * @param {string} context Context description
  * @returns {string}
  * @private
  */
-Parser.prototype._parseString = function(context) {
+ParserPrototype._parseString = function() {
     var value = "", token;
     do {
         token = this.tn.next(); // Known to be = this.tn.stringEndsWith
         value += this.tn.next();
         token = this.tn.next();
         if (token !== this.tn.stringEndsWith)
-            throw Error("Illegal end of string in "+context+" at line "+this.tn.line+": "+token+" ('"+this.tn.stringEndsWith+"' expected)");
+            throw Error("Illegal end of string at line "+this.tn.line+": "+token);
         token = this.tn.peek();
     } while (token === Lang.STRINGOPEN || token === Lang.STRINGOPEN_SQ);
     return value;
@@ -129,7 +134,7 @@ Parser.prototype._parseString = function(context) {
  * @throws {Error} If the ID value is invalid
  * @private
  */
-Parser.prototype._parseId = function(val, neg) {
+ParserPrototype._parseId = function(val, neg) {
     var id = -1;
     var sign = 1;
     if (val.charAt(0) == '-')
@@ -142,10 +147,10 @@ Parser.prototype._parseId = function(val, neg) {
     else if (Lang.NUMBER_OCT.test(val))
         id = parseInt(val.substring(1), 8);
     else
-        throw Error("Illegal ID at line "+this.tn.line+": "+(sign < 0 ? '-' : '')+val);
+        throw Error("Illegal id at line "+this.tn.line+": "+(sign < 0 ? '-' : '')+val);
     id = (sign*id)|0; // Force to 32bit
     if (!neg && id < 0)
-        throw Error("Illegal ID at line "+this.tn.line+": "+(sign < 0 ? '-' : '')+val);
+        throw Error("Illegal id at line "+this.tn.line+": "+(sign < 0 ? '-' : '')+val);
     return id;
 };
 
@@ -156,14 +161,14 @@ Parser.prototype._parseId = function(val, neg) {
  * @throws {Error} If the package definition cannot be parsed
  * @private
  */
-Parser.prototype._parsePackage = function(token) {
+ParserPrototype._parsePackage = function(token) {
     token = this.tn.next();
     if (!Lang.TYPEREF.test(token))
-        throw Error("Illegal package at line "+this.tn.line+": "+token);
+        throw Error("Illegal package name at line "+this.tn.line+": "+token);
     var pkg = token;
     token = this.tn.next();
     if (token != Lang.END)
-        throw Error("Illegal end of package at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+        throw Error("Illegal end of package at line "+this.tn.line+": "+token);
     return pkg;
 };
 
@@ -174,17 +179,17 @@ Parser.prototype._parsePackage = function(token) {
  * @throws {Error} If the import definition cannot be parsed
  * @private
  */
-Parser.prototype._parseImport = function(token) {
+ParserPrototype._parseImport = function(token) {
     token = this.tn.peek();
     if (token === "public")
         this.tn.next(),
         token = this.tn.peek();
     if (token !== Lang.STRINGOPEN && token !== Lang.STRINGOPEN_SQ)
-        throw Error("Illegal import at line "+this.tn.line+": "+token+" ('"+Lang.STRINGOPEN+"' or '"+Lang.STRINGOPEN_SQ+"' expected)");
-    var imported = this._parseString("root");
+        throw Error("Illegal start of import at line "+this.tn.line+": "+token);
+    var imported = this._parseString();
     token = this.tn.next();
     if (token !== Lang.END)
-        throw Error("Illegal import at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+        throw Error("Illegal end of import at line "+this.tn.line+": "+token);
     return imported;
 };
 
@@ -195,7 +200,7 @@ Parser.prototype._parseImport = function(token) {
  * @throws {Error} If the option cannot be parsed
  * @private
  */
-Parser.prototype._parseOption = function(parent, token) {
+ParserPrototype._parseOption = function(parent, token) {
     token = this.tn.next();
     var custom = false;
     if (token == Lang.COPTOPEN)
@@ -204,12 +209,12 @@ Parser.prototype._parseOption = function(parent, token) {
     if (!Lang.TYPEREF.test(token))
         // we can allow options of the form google.protobuf.* since they will just get ignored anyways
         if (!/google\.protobuf\./.test(token))
-            throw Error("Illegal option in message "+parent.name+" at line "+this.tn.line+": "+token);
+            throw Error("Illegal option name in message "+parent.name+" at line "+this.tn.line+": "+token);
     var name = token;
     token = this.tn.next();
     if (custom) { // (my_method_option).foo, (my_method_option), some_method_option, (foo.my_option).bar
         if (token !== Lang.COPTCLOSE)
-            throw Error("Illegal option in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTCLOSE+"' expected)");
+            throw Error("Illegal end in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token);
         name = '('+name+')';
         token = this.tn.next();
         if (Lang.FQTYPEREF.test(token))
@@ -217,11 +222,11 @@ Parser.prototype._parseOption = function(parent, token) {
             token = this.tn.next();
     }
     if (token !== Lang.EQUAL)
-        throw Error("Illegal option operator in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+        throw Error("Illegal operator in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token);
     var value;
     token = this.tn.peek();
     if (token === Lang.STRINGOPEN || token === Lang.STRINGOPEN_SQ)
-        value = this._parseString("message "+parent.name+", option "+name);
+        value = this._parseString();
     else {
         this.tn.next();
         if (Lang.NUMBER.test(token))
@@ -235,7 +240,7 @@ Parser.prototype._parseOption = function(parent, token) {
     }
     token = this.tn.next();
     if (token !== Lang.END)
-        throw Error("Illegal end of option in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+        throw Error("Illegal end of option in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token);
     parent["options"][name] = value;
 };
 
@@ -246,12 +251,12 @@ Parser.prototype._parseOption = function(parent, token) {
  * @throws {Error} If the directive cannot be parsed
  * @private
  */
-Parser.prototype._parseIgnoredStatement = function(parent, keyword) {
+ParserPrototype._parseIgnoredStatement = function(parent, keyword) {
     var token;
     do {
         token = this.tn.next();
         if (token === null)
-            throw Error("Unexpected EOF in "+parent.name+", "+keyword+" (ignored) at line "+this.tn.line);
+            throw Error("Unexpected EOF in "+parent.name+", "+keyword+" at line "+this.tn.line);
         if (token === Lang.END)
             break;
     } while (true);
@@ -264,7 +269,7 @@ Parser.prototype._parseIgnoredStatement = function(parent, keyword) {
  * @throws {Error} If the service cannot be parsed
  * @private
  */
-Parser.prototype._parseService = function(parent, token) {
+ParserPrototype._parseService = function(parent, token) {
     token = this.tn.next();
     if (!Lang.NAME.test(token))
         throw Error("Illegal service name at line "+this.tn.line+": "+token);
@@ -276,7 +281,7 @@ Parser.prototype._parseService = function(parent, token) {
     };
     token = this.tn.next();
     if (token !== Lang.OPEN)
-        throw Error("Illegal OPEN after service "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.OPEN+"' expected)");
+        throw Error("Illegal start of service "+name+" at line "+this.tn.line+": "+token);
     do {
         token = this.tn.next();
         if (token === "option")
@@ -284,7 +289,7 @@ Parser.prototype._parseService = function(parent, token) {
         else if (token === 'rpc')
             this._parseServiceRPC(svc, token);
         else if (token !== Lang.CLOSE)
-            throw Error("Illegal type for service "+name+" at line "+this.tn.line+": "+token);
+            throw Error("Illegal type of service "+name+" at line "+this.tn.line+": "+token);
     } while (token !== Lang.CLOSE);
     parent["services"].push(svc);
 };
@@ -295,11 +300,11 @@ Parser.prototype._parseService = function(parent, token) {
  * @param {string} token Initial token
  * @private
  */
-Parser.prototype._parseServiceRPC = function(svc, token) {
+ParserPrototype._parseServiceRPC = function(svc, token) {
     var type = token;
     token = this.tn.next();
     if (!Lang.NAME.test(token))
-        throw Error("Illegal RPC method name in service "+svc["name"]+" at line "+this.tn.line+": "+token);
+        throw Error("Illegal method name in service "+svc["name"]+" at line "+this.tn.line+": "+token);
     var name = token;
     var method = {
         "request": null,
@@ -308,25 +313,25 @@ Parser.prototype._parseServiceRPC = function(svc, token) {
     };
     token = this.tn.next();
     if (token !== Lang.COPTOPEN)
-        throw Error("Illegal start of request type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTOPEN+"' expected)");
+        throw Error("Illegal start of request type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     if (!Lang.TYPEREF.test(token))
-        throw Error("Illegal request type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
+        throw Error("Illegal request type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     method["request"] = token;
     token = this.tn.next();
     if (token != Lang.COPTCLOSE)
-        throw Error("Illegal end of request type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTCLOSE+"' expected)");
+        throw Error("Illegal end of request type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     if (token.toLowerCase() !== "returns")
-        throw Error("Illegal request/response delimiter in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('returns' expected)");
+        throw Error("Illegal delimiter in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     if (token != Lang.COPTOPEN)
-        throw Error("Illegal start of response type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTOPEN+"' expected)");
+        throw Error("Illegal start of response type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     method["response"] = token;
     token = this.tn.next();
     if (token !== Lang.COPTCLOSE)
-        throw Error("Illegal end of response type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTCLOSE+"' expected)");
+        throw Error("Illegal end of response type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     if (token === Lang.OPEN) {
         do {
@@ -334,12 +339,12 @@ Parser.prototype._parseServiceRPC = function(svc, token) {
             if (token === 'option')
                 this._parseOption(method, token); // <- will fail for the custom-options example
             else if (token !== Lang.CLOSE)
-                throw Error("Illegal start of option in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('option' expected)");
+                throw Error("Illegal start of option inservice "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
         } while (token !== Lang.CLOSE);
         if (this.tn.peek() === Lang.END)
             this.tn.next();
     } else if (token !== Lang.END)
-        throw Error("Illegal method delimiter in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' or '"+Lang.OPEN+"' expected)");
+        throw Error("Illegal delimiter in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
     if (typeof svc[type] === 'undefined')
         svc[type] = {};
     svc[type][name] = method;
@@ -354,7 +359,7 @@ Parser.prototype._parseServiceRPC = function(svc, token) {
  * @throws {Error} If the message cannot be parsed
  * @private
  */
-Parser.prototype._parseMessage = function(parent, fld, token) {
+ParserPrototype._parseMessage = function(parent, fld, token) {
     /** @dict */
     var msg = {}; // Note: At some point we might want to exclude the parser, so we need a dict.
     var isGroup = token === "group";
@@ -365,7 +370,7 @@ Parser.prototype._parseMessage = function(parent, fld, token) {
     if (isGroup) {
         token = this.tn.next();
         if (token !== Lang.EQUAL)
-            throw Error("Illegal id assignment after group "+msg.name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+            throw Error("Illegal id assignment after group "+msg.name+" at line "+this.tn.line+": "+token);
         token = this.tn.next();
         try {
             fld["id"] = this._parseId(token);
@@ -378,12 +383,13 @@ Parser.prototype._parseMessage = function(parent, fld, token) {
     msg["enums"] = [];
     msg["messages"] = [];
     msg["options"] = {};
+    msg["oneofs"] = {};
     token = this.tn.next();
     if (token === Lang.OPTOPEN && fld)
         this._parseFieldOptions(msg, fld, token),
         token = this.tn.next();
     if (token !== Lang.OPEN)
-        throw Error("Illegal OPEN after "+(isGroup ? "group" : "message")+" "+msg.name+" at line "+this.tn.line+": "+token+" ('"+Lang.OPEN+"' expected)");
+        throw Error("Illegal start of "+(isGroup ? "group" : "message")+" "+msg.name+" at line "+this.tn.line+": "+token);
     // msg["extensions"] = undefined
     do {
         token = this.tn.next();
@@ -394,6 +400,8 @@ Parser.prototype._parseMessage = function(parent, fld, token) {
             break;
         } else if (Lang.RULE.test(token))
             this._parseMessageField(msg, token);
+        else if (token === "oneof")
+            this._parseMessageOneOf(msg, token);
         else if (token === "enum")
             this._parseEnum(msg, token);
         else if (token === "message")
@@ -405,7 +413,7 @@ Parser.prototype._parseMessage = function(parent, fld, token) {
         else if (token === "extend")
             this._parseExtend(msg, token);
         else
-            throw Error("Illegal token in message "+msg.name+" at line "+this.tn.line+": "+token+" (type or '"+Lang.CLOSE+"' expected)");
+            throw Error("Illegal token in message "+msg.name+" at line "+this.tn.line+": "+token);
     } while (true);
     parent["messages"].push(msg);
     return msg;
@@ -415,10 +423,11 @@ Parser.prototype._parseMessage = function(parent, fld, token) {
  * Parses a message field.
  * @param {Object} msg Message definition
  * @param {string} token Initial token
+ * @returns {!Object} Field descriptor
  * @throws {Error} If the message field cannot be parsed
  * @private
  */
-Parser.prototype._parseMessageField = function(msg, token) {
+ParserPrototype._parseMessageField = function(msg, token) {
     /** @dict */
     var fld = {}, grp = null;
     fld["rule"] = token;
@@ -447,21 +456,48 @@ Parser.prototype._parseMessageField = function(msg, token) {
         fld["name"] = token;
         token = this.tn.next();
         if (token !== Lang.EQUAL)
-            throw Error("Illegal field id assignment in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+            throw Error("Illegal token in field "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
         token = this.tn.next();
         try {
             fld["id"] = this._parseId(token);
         } catch (e) {
-            throw Error("Illegal field id value in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
+            throw Error("Illegal field id in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
         }
         token = this.tn.next();
         if (token === Lang.OPTOPEN)
             this._parseFieldOptions(msg, fld, token),
             token = this.tn.next();
         if (token !== Lang.END)
-            throw Error("Illegal field delimiter in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+            throw Error("Illegal delimiter in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
     }
     msg["fields"].push(fld);
+    return fld;
+};
+
+/**
+ * Parses a message oneof.
+ * @param {Object} msg Message definition
+ * @param {string} token Initial token
+ * @throws {Error} If the message oneof cannot be parsed
+ * @private
+ */
+ParserPrototype._parseMessageOneOf = function(msg, token) {
+    token = this.tn.next();
+    if (!Lang.NAME.test(token))
+        throw Error("Illegal oneof name in message "+msg.name+" at line "+this.tn.line+": "+token);
+    var name = token,
+        fld;
+    var fields = [];
+    token = this.tn.next();
+    if (token !== Lang.OPEN)
+        throw Error("Illegal start of oneof "+name+" at line "+this.tn.line+": "+token);
+    while (this.tn.peek() !== Lang.CLOSE) {
+        fld = this._parseMessageField(msg, "optional");
+        fld["oneof"] = name;
+        fields.push(fld["id"]);
+    }
+    this.tn.next();
+    msg["oneofs"][name] = fields;
 };
 
 /**
@@ -472,7 +508,7 @@ Parser.prototype._parseMessageField = function(msg, token) {
  * @throws {Error} If the message field options cannot be parsed
  * @private
  */
-Parser.prototype._parseFieldOptions = function(msg, fld, token) {
+ParserPrototype._parseFieldOptions = function(msg, fld, token) {
     var first = true;
     do {
         token = this.tn.next();
@@ -480,7 +516,7 @@ Parser.prototype._parseFieldOptions = function(msg, fld, token) {
             break;
         else if (token === Lang.OPTEND) {
             if (first)
-                throw Error("Illegal start of message field options in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
+                throw Error("Illegal start of options in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
             token = this.tn.next();
         }
         this._parseFieldOption(msg, fld, token);
@@ -496,18 +532,18 @@ Parser.prototype._parseFieldOptions = function(msg, fld, token) {
  * @throws {Error} If the mesage field option cannot be parsed
  * @private
  */
-Parser.prototype._parseFieldOption = function(msg, fld, token) {
+ParserPrototype._parseFieldOption = function(msg, fld, token) {
     var custom = false;
     if (token === Lang.COPTOPEN)
         token = this.tn.next(),
         custom = true;
     if (!Lang.TYPEREF.test(token))
-        throw Error("Illegal field option in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
+        throw Error("Illegal field option in "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
     var name = token;
     token = this.tn.next();
     if (custom) {
         if (token !== Lang.COPTCLOSE)
-            throw Error("Illegal custom field option name delimiter in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" (')' expected)");
+            throw Error("Illegal delimiter in "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
         name = '('+name+')';
         token = this.tn.next();
         if (Lang.FQTYPEREF.test(token))
@@ -515,11 +551,11 @@ Parser.prototype._parseFieldOption = function(msg, fld, token) {
             token = this.tn.next();
     }
     if (token !== Lang.EQUAL)
-        throw Error("Illegal field option operation in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" ('=' expected)");
+        throw Error("Illegal token in "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
     var value;
     token = this.tn.peek();
     if (token === Lang.STRINGOPEN || token === Lang.STRINGOPEN_SQ) {
-        value = this._parseString("message "+msg.name+"#"+fld.name);
+        value = this._parseString();
     } else if (Lang.NUMBER.test(token, true))
         value = this._parseNumber(this.tn.next(), true);
     else if (Lang.BOOL.test(token))
@@ -527,7 +563,7 @@ Parser.prototype._parseFieldOption = function(msg, fld, token) {
     else if (Lang.TYPEREF.test(token))
         value = this.tn.next(); // TODO: Resolve?
     else
-        throw Error("Illegal field option value in message "+msg.name+"#"+fld.name+", option "+name+" at line "+this.tn.line+": "+token);
+        throw Error("Illegal value in message "+msg.name+"#"+fld.name+", option "+name+" at line "+this.tn.line+": "+token);
     fld["options"][name] = value;
 };
 
@@ -538,7 +574,7 @@ Parser.prototype._parseFieldOption = function(msg, fld, token) {
  * @throws {Error} If the enum cannot be parsed
  * @private
  */
-Parser.prototype._parseEnum = function(msg, token) {
+ParserPrototype._parseEnum = function(msg, token) {
     /** @dict */
     var enm = {};
     token = this.tn.next();
@@ -547,7 +583,7 @@ Parser.prototype._parseEnum = function(msg, token) {
     enm["name"] = token;
     token = this.tn.next();
     if (token !== Lang.OPEN)
-        throw Error("Illegal OPEN after enum "+enm.name+" at line "+this.tn.line+": "+token);
+        throw Error("Illegal start of enum "+enm.name+" at line "+this.tn.line+": "+token);
     enm["values"] = [];
     enm["options"] = {};
     do {
@@ -562,7 +598,7 @@ Parser.prototype._parseEnum = function(msg, token) {
             this._parseOption(enm, token);
         else {
             if (!Lang.NAME.test(token))
-                throw Error("Illegal enum value name in enum "+enm.name+" at line "+this.tn.line+": "+token);
+                throw Error("Illegal name in enum "+enm.name+" at line "+this.tn.line+": "+token);
             this._parseEnumValue(enm, token);
         }
     } while (true);
@@ -576,18 +612,18 @@ Parser.prototype._parseEnum = function(msg, token) {
  * @throws {Error} If the enum value cannot be parsed
  * @private
  */
-Parser.prototype._parseEnumValue = function(enm, token) {
+ParserPrototype._parseEnumValue = function(enm, token) {
     /** @dict */
     var val = {};
     val["name"] = token;
     token = this.tn.next();
     if (token !== Lang.EQUAL)
-        throw Error("Illegal enum value operator in enum "+enm.name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+        throw Error("Illegal token in enum "+enm.name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     try {
         val["id"] = this._parseId(token, true);
     } catch (e) {
-        throw Error("Illegal enum value id in enum "+enm.name+" at line "+this.tn.line+": "+token);
+        throw Error("Illegal id in enum "+enm.name+" at line "+this.tn.line+": "+token);
     }
     enm["values"].push(val);
     token = this.tn.next();
@@ -597,7 +633,7 @@ Parser.prototype._parseEnumValue = function(enm, token) {
         token = this.tn.next();
     }
     if (token !== Lang.END)
-        throw Error("Illegal enum value delimiter in enum "+enm.name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+        throw Error("Illegal delimiter in enum "+enm.name+" at line "+this.tn.line+": "+token);
 };
 
 /**
@@ -607,7 +643,7 @@ Parser.prototype._parseEnumValue = function(enm, token) {
  * @throws {Error} If the extensions statement cannot be parsed
  * @private
  */
-Parser.prototype._parseExtensions = function(msg, token) {
+ParserPrototype._parseExtensions = function(msg, token) {
     /** @type {Array.<number>} */
     var range = [];
     token = this.tn.next();
@@ -619,7 +655,7 @@ Parser.prototype._parseExtensions = function(msg, token) {
         range.push(this._parseNumber(token));
     token = this.tn.next();
     if (token !== 'to')
-        throw Error("Illegal extensions delimiter in message "+msg.name+" at line "+this.tn.line+" ('to' expected)");
+        throw Error("Illegal extensions delimiter in message "+msg.name+" at line "+this.tn.line+": "+token);
     token = this.tn.next();
     if (token === "min")
         range.push(ProtoBuf.ID_MIN);
@@ -629,7 +665,7 @@ Parser.prototype._parseExtensions = function(msg, token) {
         range.push(this._parseNumber(token));
     token = this.tn.next();
     if (token !== Lang.END)
-        throw Error("Illegal extension delimiter in message "+msg.name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+        throw Error("Illegal extensions delimiter in message "+msg.name+" at line "+this.tn.line+": "+token);
     return range;
 };
 
@@ -640,17 +676,17 @@ Parser.prototype._parseExtensions = function(msg, token) {
  * @throws {Error} If the extend block cannot be parsed
  * @private
  */
-Parser.prototype._parseExtend = function(parent, token) {
+ParserPrototype._parseExtend = function(parent, token) {
     token = this.tn.next();
     if (!Lang.TYPEREF.test(token))
-        throw Error("Illegal extended message name at line "+this.tn.line+": "+token);
+        throw Error("Illegal message name at line "+this.tn.line+": "+token);
     /** @dict */
     var ext = {};
     ext["ref"] = token;
     ext["fields"] = [];
     token = this.tn.next();
     if (token !== Lang.OPEN)
-        throw Error("Illegal OPEN in extend "+ext.name+" at line "+this.tn.line+": "+token+" ('"+Lang.OPEN+"' expected)");
+        throw Error("Illegal start of extend "+ext.name+" at line "+this.tn.line+": "+token);
     do {
         token = this.tn.next();
         if (token === Lang.CLOSE) {
@@ -661,7 +697,7 @@ Parser.prototype._parseExtend = function(parent, token) {
         } else if (Lang.RULE.test(token))
             this._parseMessageField(ext, token);
         else
-            throw Error("Illegal token in extend "+ext.name+" at line "+this.tn.line+": "+token+" (rule or '"+Lang.CLOSE+"' expected)");
+            throw Error("Illegal token in extend "+ext.name+" at line "+this.tn.line+": "+token);
     } while (true);
     parent["messages"].push(ext);
     return ext;
@@ -671,6 +707,6 @@ Parser.prototype._parseExtend = function(parent, token) {
  * Returns a string representation of this object.
  * @returns {string} String representation as of "Parser"
  */
-Parser.prototype.toString = function() {
+ParserPrototype.toString = function() {
     return "Parser";
 };