experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Full RFC 7950 if-feature-expr support (Section 7.20.2)

Browse source 
* Previous implementation did not handle nested if-feature expressions
  * As part of fixing: [YANG if-feature does not support nested boolean expression](https://github.com/clicon/clixon/issues/341)
  * Added new yacc/lex parser for if-feature-expr string
This commit is contained in:
Olof hagsand 2022-06-26 10:56:03 +02:00
parent 5bb3767358
commit a00e36caa2
11 changed files with 484 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

118
lib/src/clixon_if_feature_parse.l Normal file
View file

@ -0,0 +1,118 @@
/*
*
***** BEGIN LICENSE BLOCK *****
Copyright (C) 2022 Olof Hagsand and Rubicon Communications, LLC(Netgate)
This file is part of CLIXON.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Alternatively, the contents of this file may be used under the terms of
the GNU General Public License Version 3 or later (the "GPL"),
in which case the provisions of the GPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of the GPL, and not to allow others to
use your version of this file under the terms of Apache License version 2,
indicate your decision by deleting the provisions above and replace them with
the notice and other provisions required by the GPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the Apache License version 2 or the GPL.
***** END LICENSE BLOCK *****
* if-feature-expr RFC7950 14
*/
%{
#include "clixon_config.h"
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include "clixon_if_feature_parse.tab.h" /* generated file */
/* cligen */
#include <cligen/cligen.h>
/* clicon */
#include "clixon_queue.h"
#include "clixon_hash.h"
#include "clixon_handle.h"
#include "clixon_yang.h"
#include "clixon_xml.h"
#include "clixon_if_feature_parse.h"
/* Redefine main lex function so that you can send arguments to it: _if is added to arg list */
#define YY_DECL int clixon_if_feature_parselex(void *_if)
/* Dont use input function (use user-buffer) */
#define YY_NO_INPUT
/* typecast macro */
#define _IF ((clixon_if_feature_yacc *)_if)
#undef clixon_xml_parsewrap
int clixon_if_feature_parsewrap(void)
{
return 1;
}
/*
*/
%}
%x COMMENT
%x STRING
%%
<INITIAL>[ \t\r]* { return SEP; }
<INITIAL>\n { _IF->if_linenum++; return SEP; }
<INITIAL>\( { return *yytext; }
<INITIAL>\) { return *yytext; }
<INITIAL>not { return NOT; }
<INITIAL>and { return AND; }
<INITIAL>or { return OR; }
<INITIAL><<EOF>> { return MY_EOF; }
<INITIAL>[^\n\r \t\(\)]+ {
clixon_if_feature_parselval.string = strdup(yytext);
return TOKEN; }
<INITIAL>. { return -1; }
%%
/*! Initialize XML scanner.
*/
int
clixon_if_feature_parsel_init(clixon_if_feature_yacc *ife)
{
BEGIN(INITIAL);
ife->if_lexbuf = yy_scan_string (ife->if_parse_string);
if (0)
yyunput(0, ""); /* XXX: just to use unput to avoid warning */
return 0;
}
/*! Exit xml scanner */
int
clixon_if_feature_parsel_exit(clixon_if_feature_yacc *ife)
{
yy_delete_buffer(ife->if_lexbuf);
clixon_if_feature_parselex_destroy(); /* modern */
return 0;
}