Other: Removed now useless trailing comment checks, see #640

protobufjs · Jan 12, 2017 · c280a4a · c280a4a
1 parent 3f6ffd0
commit c280a4a
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 39 deletions.
diff --git a/dist/noparse/protobuf.js b/dist/noparse/protobuf.js
diff --git a/dist/noparse/protobuf.min.js b/dist/noparse/protobuf.min.js
diff --git a/dist/noparse/protobuf.min.js.gz b/dist/noparse/protobuf.min.js.gz
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/src/parse.js b/src/parse.js
@@ -313,14 +313,9 @@ function parse(source, root, options) {
             throw illegal(name, "name");
         name = applyCase(name);
         skip("=");
-        var line = tn.line(),
-            field = new Field(name, parseId(next()), type, rule, extend);
+        var field = new Field(name, parseId(next()), type, rule, extend);
         field.comment = cmnt();
         parseInlineOptions(field);
-        if (!field.comment) {
-            peek();
-            field.comment = cmnt(/* if on */ line);
-        }
         // JSON defaults to packed=true if not set so we have to set packed=false explicity when
         // parsing proto2 descriptors without the option, where applicable.
         if (field.repeated && types.packed[type] !== undefined && !isProto3)
@@ -452,15 +447,9 @@ function parse(source, root, options) {
 
         var name = token;
         skip("=");
-        var value = parseId(next(), true),
-            comment = cmnt(),
-            line = tn.line();
-        parent.add(name, value, comment);
+        var value = parseId(next(), true);
+        parent.add(name, value, cmnt());
         parseInlineOptions({}); // skips enum value options
-        if (!comment) {
-            peek();
-            parent.comments[name] = cmnt(/* if on */ line);
-        }
     }
 
     function parseOption(parent, token) {