From d7ed503bad389be70ff81dc9c66bb9328ec2b834 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Mon, 25 Jul 2022 09:42:18 +0200 Subject: [PATCH] Removed debugs, updated CHANGELOG --- CHANGELOG.md | 15 ++++++--------- lib/src/clixon_yang_schemanode_parse.y | 2 +- lib/src/clixon_yang_sub_parse.c | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f530b23c..c1b0c711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,15 +35,6 @@ * [3.3.2](#332) Aug 27 2017 * [3.3.1](#331) June 7 2017 -## Refine branch - -* Break-out RFC 7950 Section 6.1 tokenization - * This enables full string lexical parsing of some rules previously not fully compliant, including: - * refine, uses-augment, augment, if-feature, type, base. - * Also solves previous tokenization issues - * [String concatenation in YANG model leads to syntax error ](https://github.com/clicon/clixon/issues/265) - * [Can't use + symbol in the enum statement without quotes](https://github.com/clicon/clixon/issues/241) - ## 5.8.0 Planned: July 2022 @@ -120,6 +111,12 @@ Developers may need to change their code ### Minor features +* Break-out RFC 7950 Section 6.1 tokenization + * This enables full string lexical parsing of some rules previously not fully compliant, including: + * refine, uses-augment, augment, if-feature, type, base. + * Also solves previous tokenization issues + * [String concatenation in YANG model leads to syntax error ](https://github.com/clicon/clixon/issues/265) + * [Can't use + symbol in the enum statement without quotes](https://github.com/clicon/clixon/issues/241) * Added XPATH function `boolean()` * This caused problem for new NTP YANG in RFC 9249 * Full RFC 7950 if-feature-expr support (Section 7.20.2) diff --git a/lib/src/clixon_yang_schemanode_parse.y b/lib/src/clixon_yang_schemanode_parse.y index a793cd60..8f0dd9c6 100644 --- a/lib/src/clixon_yang_schemanode_parse.y +++ b/lib/src/clixon_yang_schemanode_parse.y @@ -93,7 +93,7 @@ #include "clixon_yang_schemanode_parse.h" /* Enable for debugging, steals some cycles otherwise */ -#if 1 +#if 0 #define _PARSE_DEBUG(s) clicon_debug(1,(s)) #else #define _PARSE_DEBUG(s) diff --git a/lib/src/clixon_yang_sub_parse.c b/lib/src/clixon_yang_sub_parse.c index 1f3b5c13..63418bde 100644 --- a/lib/src/clixon_yang_sub_parse.c +++ b/lib/src/clixon_yang_sub_parse.c @@ -120,7 +120,7 @@ yang_schema_nodeid_subparse(char *str, int retval = -1; clixon_yang_schemanode_yacc ife = {0,}; - clicon_debug(1, "%s %s", __FUNCTION__, str); + clicon_debug(2, "%s %s", __FUNCTION__, str); ife.if_parse_string = str; ife.if_linenum = linenum; ife.if_mainfile = mainfile;