Skip to content

Fix for prior fix. #34

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

Merged
merged 1 commit into from
Oct 27, 2016
Merged

Fix for prior fix. #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions utils/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,27 @@ function extractFields(content, details, callback) {

if (equalIndex !== -1) {
fieldName = field.substring(0, equalIndex).trim();
// truncate comments and whitespace
var constant = field.substring(equalIndex + 1, field.length).trim();
var constantEnd = constant.length;
var constantComment = constant.indexOf("#");
if (constantComment >= 0) {
if (fieldType != "string") {
var firstWhitespace = constant.match(/\s/);
if (firstWhitespace) {
constantEnd = firstWhitespace.index;
}
} else {
constantEnd = constantComment;
}
}
var parsedConstant = fieldsUtil.parsePrimitive(fieldType, constant);

constants.push({
name : fieldName
, type : fieldType
, value : parsedConstant
, raw : constant
, raw : constant.slice(0, constantEnd)
, index : fields.length
, messageType : null
});
Expand Down Expand Up @@ -504,7 +517,9 @@ function buildMessageClass(details) {
new (field.messageType)(values ? values[field.name] : undefined);
} else {
// simple value
that[field.name] = values ? values[field.name] :
that[field.name] =
(values && typeof values[field.name] != "undefined") ?
values[field.name] :
(field.value || fieldsUtil.getDefaultValue(field.type));
}
});
Expand Down