Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ignore "duplicate name" errors on pbjs #501

Closed
wants to merge 2 commits into from
Closed

ignore "duplicate name" errors on pbjs #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27a3a95
Allow negative enum ids even if super inefficient (encodes as 10 byte…
dcodeIO Nov 29, 2016
7797eff
ignore "duplicate name" errors on `pbjs`
endel Nov 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/namespace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,7 @@ NamespacePrototype.add = function add(object) {
if (!this.nested)
this.nested = {};
object.setOptions(prev.options, true);
} else
throw Error("duplicate name '" + object.name + "' in " + this);
}
}
}
this.nested[object.name] = object;
Expand Down
2 changes: 1 addition & 1 deletion src/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ function parse(source, root) {
throw illegal(token, s_name);
var name = token;
skip("=");
var value = parseId(next());
var value = parseNumber(next());
parseInlineOptions(parent.values[name] = new Number(value)); // eslint-disable-line no-new-wrappers
}

Expand Down