Skip to content

Commit 258d0a6

Browse files
committed
Running astyle [ci skip].
1 parent 9f445fc commit 258d0a6

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

lib/library.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,7 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
712712
return Error(BAD_ATTRIBUTE_VALUE, (!p ? "\"\"" : argnode->GetText()));
713713
// Set validation expression
714714
ac.valid = argnode->GetText();
715-
}
716-
else if (argnodename == "minsize") {
715+
} else if (argnodename == "minsize") {
717716
const char *typeattr = argnode->Attribute("type");
718717
if (!typeattr)
719718
return Error(MISSING_ATTRIBUTE, "type");
@@ -1226,24 +1225,20 @@ bool Library::isCompliantValidationExpression(const char* p)
12261225
range = true;
12271226
has_dot = false;
12281227
has_E = false;
1229-
}
1230-
else if ((*p == '-')|| (*p == '+'))
1228+
} else if ((*p == '-')|| (*p == '+'))
12311229
error |= (!std::isdigit(*(p + 1)));
12321230
else if (*p == ',') {
12331231
range = false;
12341232
error |= *(p + 1) == '.';
12351233
has_dot = false;
12361234
has_E = false;
1237-
}
1238-
else if (*p == '.') {
1235+
} else if (*p == '.') {
12391236
error |= has_dot | (!std::isdigit(*(p + 1)));
12401237
has_dot = true;
1241-
}
1242-
else if (*p == 'E' || *p == 'e') {
1238+
} else if (*p == 'E' || *p == 'e') {
12431239
error |= has_E;
12441240
has_E = true;
1245-
}
1246-
else
1241+
} else
12471242
return false;
12481243
}
12491244
return !error;

test/testlibrary.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ class TestLibrary : public TestFixture {
7373
return library.load(doc);
7474
}
7575

76-
void isCompliantValidationExpression()
77-
{
76+
void isCompliantValidationExpression() {
7877
ASSERT_EQUALS(true, Library::isCompliantValidationExpression("-1"));
7978
ASSERT_EQUALS(true, Library::isCompliantValidationExpression("1"));
8079
ASSERT_EQUALS(true, Library::isCompliantValidationExpression("1:"));

0 commit comments

Comments
 (0)