commit 626df48d36a3cfca6e41e64c43ab72d52d247f05
author Radek Krejci <rkrejci@cesnet.cz> Thu Oct 11 15:06:31 2018 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Oct 11 15:06:31 2018 +0200
tree b47c0f87e1cf3fc0c3f137f25472ddee23bffda9
parent dcc7b32b2d59d7052b8fa477df4a865c8d6d7172

YANG parser BUGFIX processing ';', '{' and '}' as keywords

src/parser_yang.c

diff --git a/src/parser_yang.c b/src/parser_yang.c
index 77c7084..9a04440 100644
--- a/src/parser_yang.c
+++ b/src/parser_yang.c
@@ -884,15 +884,15 @@
     case ';':
         MOVE_INPUT(ctx, data, 1);
         *kw = YANG_SEMICOLON;
-        break;
+        goto success;
     case '{':
         MOVE_INPUT(ctx, data, 1);
         *kw = YANG_LEFT_BRACE;
-        break;
+        goto success;
     case '}':
         MOVE_INPUT(ctx, data, 1);
         *kw = YANG_RIGHT_BRACE;
-        break;
+        goto success;
     default:
         break;
     }
@@ -942,7 +942,7 @@
 
         *kw = YANG_CUSTOM;
     }
-
+success:
     if (word_p) {
         *word_p = (char *)word_start;
         *word_len = *data - word_start;

tests/src/test_parser_yang.c

diff --git a/tests/src/test_parser_yang.c b/tests/src/test_parser_yang.c
index 60ba4ad..9033a84 100644
--- a/tests/src/test_parser_yang.c
+++ b/tests/src/test_parser_yang.c
@@ -612,6 +612,21 @@
     assert_int_equal(LY_SUCCESS, get_keyword(&ctx, &str, &kw, &word, &len));
     assert_int_equal(YANG_YIN_ELEMENT, kw);
     assert_int_equal(11, len);
+    str = ";config false;";
+    assert_int_equal(LY_SUCCESS, get_keyword(&ctx, &str, &kw, &word, &len));
+    assert_int_equal(YANG_SEMICOLON, kw);
+    assert_int_equal(1, len);
+    assert_string_equal("config false;", str);
+    str = "{ config false;";
+    assert_int_equal(LY_SUCCESS, get_keyword(&ctx, &str, &kw, &word, &len));
+    assert_int_equal(YANG_LEFT_BRACE, kw);
+    assert_int_equal(1, len);
+    assert_string_equal(" config false;", str);
+    str = "}";
+    assert_int_equal(LY_SUCCESS, get_keyword(&ctx, &str, &kw, &word, &len));
+    assert_int_equal(YANG_RIGHT_BRACE, kw);
+    assert_int_equal(1, len);
+    assert_string_equal("", str);
 
     /* geenric extension */
     str = p = "nacm:default-deny-write;";