Allow END after rpc definitions when parsing, fixes #135

Author: dcodeIO

ProtoBuf.js

@@ -538,7 +538,7 @@
              * @expose
              */
             Tokenizer.prototype.peek = function() {
-                if (this.stack.length == 0) {
+                if (this.stack.length === 0) {
                     var token = this.next();
                     if (token === null) return null;
                     this.stack.push(token);
@@ -948,6 +948,7 @@
                             throw(new Error("Illegal start of option in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('option' expected)"));
                         }
                     } while (token !== Lang.CLOSE);
+                    if (this.tn.peek() === Lang.END) this.tn.next();
                 } else if (token !== Lang.END) {
                     throw(new Error("Illegal method delimiter in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' or '"+Lang.OPEN+"' expected)"));
                 }

ProtoBuf.min.js

@@ -404,6 +404,7 @@ ProtoBuf.DotProto.Parser = (function(ProtoBuf, Lang, Tokenizer) {
                     throw(new Error("Illegal start of option in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('option' expected)"));
                 }
             } while (token !== Lang.CLOSE);
+            if (this.tn.peek() === Lang.END) this.tn.next();
         } else if (token !== Lang.END) {
             throw(new Error("Illegal method delimiter in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' or '"+Lang.OPEN+"' expected)"));
         }

ProtoBuf.min.map

@@ -173,7 +173,7 @@ ProtoBuf.DotProto.Tokenizer = (function(Lang) {
      * @expose
      */
     Tokenizer.prototype.peek = function() {
-        if (this.stack.length == 0) {
+        if (this.stack.length === 0) {
             var token = this.next();
             if (token === null) return null;
             this.stack.push(token);

src/ProtoBuf/DotProto/Parser.js

@@ -0,0 +1,29 @@
+package Datastore;
+
+message LookupRequest {
+  repeated string key = 1;
+}
+
+message LookupResponse {
+  repeated string results = 1;
+}
+
+message RunQueryRequest {
+  required string query = 1;
+}
+
+message RunQueryResponse {
+  repeated string results = 1;
+}
+
+service LookupService {
+  // Look up some entities by key.
+  rpc Lookup(LookupRequest) returns (LookupResponse) {
+  }
+}
+
+service RunQueryService {
+  // Query for entities.
+  rpc RunQuery(RunQueryRequest) returns (RunQueryResponse) {
+  };
+}

src/ProtoBuf/DotProto/Tokenizer.js

@@ -219,6 +219,16 @@
             }
             test.done();
         },
+
+        "example5": function(test) {
+            try {
+                var builder = ProtoBuf.loadProtoFile(__dirname+"/example5.proto");
+                builder.build();
+            } catch(e) {
+                fail(e);
+            }
+            test.done();
+        },
 
         "numberFormats": function(test) {
             try {