Stub for reserved keyword, see #344, more renaming

.travis.yml

@@ -2,3 +2,4 @@ language: node_js
 node_js:
   - 0.12
   - 4.2
+sudo: false

dist/protobuf.js

@@ -1104,6 +1104,8 @@
                     this._parseExtensions(msg);
                 else if (token === "extend")
                     this._parseExtend(msg);
+                else if (token === "reserved")
+                    this._parseMessageReserved(msg);
                 else if (Lang.TYPEREF.test(token)) {
                     if (!this.proto3)
                         throw Error("illegal field rule: "+token);
@@ -1116,6 +1118,23 @@
             return msg;
         };
 
+        /**
+         * Parses a message's reserved ids / names statement.
+         * @param {!Object} msg Message definition
+         * @private
+         */
+        ParserPrototype._parseMessageReserved = function(msg) {
+            // TODO: This currently just skips a reserved statement for compatibility.
+            // Valid formats are
+            //   reserved 2, 15, 9 to 11;
+            // for reserved ids or
+            //   reserved "foo", "bar";
+            // for reserved names.
+            while (this.tn.peek() !== ';')
+                this.tn.next();
+            this.tn.skip(";");
+        };
+
         /**
          * Parses a message field.
          * @param {!Object} msg Message definition

docs/ProtoBuf.Builder.Message.html

@@ -178,7 +178,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2330">line 2330</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2349">line 2349</a>
     </li></ul></dd>
 
 
@@ -299,7 +299,7 @@ <h5>Type:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2998">line 2998</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3017">line 3017</a>
     </li></ul></dd>
 
 
@@ -365,7 +365,7 @@ <h5>Type:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3014">line 3014</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3033">line 3033</a>
     </li></ul></dd>
 
 
@@ -431,7 +431,7 @@ <h5>Type:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3006">line 3006</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3025">line 3025</a>
     </li></ul></dd>
 
 
@@ -497,7 +497,7 @@ <h5>Type:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3022">line 3022</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3041">line 3041</a>
     </li></ul></dd>
 
 
@@ -664,7 +664,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2880">line 2880</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2899">line 2899</a>
     </li></ul></dd>
 
 
@@ -841,7 +841,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2941">line 2941</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2960">line 2960</a>
     </li></ul></dd>
 
 
@@ -1061,7 +1061,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2908">line 2908</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2927">line 2927</a>
     </li></ul></dd>
 
 
@@ -1229,7 +1229,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2955">line 2955</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2974">line 2974</a>
     </li></ul></dd>
 
 
@@ -1397,7 +1397,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2969">line 2969</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2988">line 2988</a>
     </li></ul></dd>
 
 
@@ -1639,7 +1639,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2408">line 2408</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2427">line 2427</a>
     </li></ul></dd>
 
 
@@ -1855,7 +1855,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2604">line 2604</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2623">line 2623</a>
     </li></ul></dd>
 
 
@@ -2034,7 +2034,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2494">line 2494</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2513">line 2513</a>
     </li></ul></dd>
 
 
@@ -2284,7 +2284,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2461">line 2461</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2480">line 2480</a>
     </li></ul></dd>
 
 
@@ -2504,7 +2504,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2380">line 2380</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2399">line 2399</a>
     </li></ul></dd>
 
 
@@ -2624,7 +2624,7 @@ <h4 class="name" id="calculate"><span class="type-signature"></span>calculate<sp
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2648">line 2648</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2667">line 2667</a>
     </li></ul></dd>
 
 
@@ -2744,7 +2744,7 @@ <h4 class="name" id="encode64"><span class="type-signature"></span>encode64<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2740">line 2740</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2759">line 2759</a>
     </li></ul></dd>
 
 
@@ -2864,7 +2864,7 @@ <h4 class="name" id="encodeAB"><span class="type-signature"></span>encodeAB<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2682">line 2682</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2701">line 2701</a>
     </li></ul></dd>
 
 
@@ -3047,7 +3047,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2660">line 2660</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2679">line 2679</a>
     </li></ul></dd>
 
 
@@ -3167,7 +3167,7 @@ <h4 class="name" id="encodeHex"><span class="type-signature"></span>encodeHex<sp
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2769">line 2769</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2788">line 2788</a>
     </li></ul></dd>
 
 
@@ -3287,7 +3287,7 @@ <h4 class="name" id="encodeJSON"><span class="type-signature"></span>encodeJSON<
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2870">line 2870</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2889">line 2889</a>
     </li></ul></dd>
 
 
@@ -3380,7 +3380,7 @@ <h4 class="name" id="encodeNB"><span class="type-signature"></span>encodeNB<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2711">line 2711</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2730">line 2730</a>
     </li></ul></dd>
 
 
@@ -3587,7 +3587,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2473">line 2473</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2492">line 2492</a>
     </li></ul></dd>
 
 
@@ -3708,7 +3708,7 @@ <h4 class="name" id="get[SomeField]"><span class="type-signature">(abstract) </s
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2578">line 2578</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2597">line 2597</a>
     </li></ul></dd>
 
 
@@ -3802,7 +3802,7 @@ <h4 class="name" id="get_[some_field]"><span class="type-signature">(abstract) <
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2589">line 2589</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2608">line 2608</a>
     </li></ul></dd>
 
 
@@ -4025,7 +4025,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2421">line 2421</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2440">line 2440</a>
     </li></ul></dd>
 
 
@@ -4237,7 +4237,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2550">line 2550</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2569">line 2569</a>
     </li></ul></dd>
 
 
@@ -4449,7 +4449,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2564">line 2564</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2583">line 2583</a>
     </li></ul></dd>
 
 
@@ -4569,7 +4569,7 @@ <h4 class="name" id="toArrayBuffer"><span class="type-signature"></span>toArrayB
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2700">line 2700</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2719">line 2719</a>
     </li></ul></dd>
 
 
@@ -4689,7 +4689,7 @@ <h4 class="name" id="toBase64"><span class="type-signature"></span>toBase64<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2758">line 2758</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2777">line 2777</a>
     </li></ul></dd>
 
 
@@ -4809,7 +4809,7 @@ <h4 class="name" id="toBuffer"><span class="type-signature"></span>toBuffer<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2729">line 2729</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2748">line 2748</a>
     </li></ul></dd>
 
 
@@ -4925,7 +4925,7 @@ <h4 class="name" id="toHex"><span class="type-signature"></span>toHex<span class
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2787">line 2787</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2806">line 2806</a>
     </li></ul></dd>
 
 
@@ -5136,7 +5136,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2861">line 2861</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2880">line 2880</a>
     </li></ul></dd>
 
 
@@ -5229,7 +5229,7 @@ <h4 class="name" id="toString"><span class="type-signature"></span>toString<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line2985">line 2985</a>
+        <a href="ProtoBuf.js.html">ProtoBuf.js</a>, <a href="ProtoBuf.js.html#line3004">line 3004</a>
     </li></ul></dd>
 
 
@@ -5300,7 +5300,7 @@ <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="ProtoBuf
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Sun Oct 25 2015 00:23:49 GMT+0200 (Mitteleuropäische Sommerzeit)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Thu Oct 29 2015 00:31:27 GMT+0100 (Mitteleuropäische Zeit)
 </footer>
 
 <script> prettyPrint(); </script>