summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2016-11-27 08:44:52 +0100
committerTomek Mrugalski <tomasz@isc.org>2016-11-29 19:58:36 +0100
commitdd3c52d99c0d176197893ea8c00bb290c691475a (patch)
treeea0f12a3453c7930821ae9892dc648213e1d115e /src
parent[5014] Cleaned up (indent, factor, etc) (diff)
downloadkea-dd3c52d99c0d176197893ea8c00bb290c691475a.tar.xz
kea-dd3c52d99c0d176197893ea8c00bb290c691475a.zip
[5014_phase2] Fixed default rule (flex -s)
Diffstat (limited to 'src')
-rw-r--r--src/bin/dhcp6/dhcp6_lexer.ll9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index a26734868c..927d5e2f3b 100644
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -148,15 +148,18 @@ JSONString \"{JSONStringCharacter}*\"
driver.includeFile(tmp);
}
+<DIR_ENTER,DIR_INCLUDE,DIR_EXIT><<EOF>> {
+ isc_throw(isc::BadValue, "Directive not closed.");
+}
<DIR_EXIT>"?>" BEGIN(INITIAL);
-{blank}+ {
+<*>{blank}+ {
// Ok, we found a with space. Let's ignore it and update loc variable.
loc.step();
}
-[\n]+ {
+<*>[\n]+ {
// Newline found. Let's update the location and continue.
loc.lines(yyleng);
loc.step();
@@ -792,7 +795,7 @@ null {
return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(loc);
}
-. driver.error (loc, "Invalid character: " + std::string(yytext));
+<*>. driver.error (loc, "Invalid character: " + std::string(yytext));
<<EOF>> {
if (states.empty()) {