Skip to content

parser common BUGFIX revision-date of import/include in ext instances #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aravindor wants to merge 1 commit into
base: devel
Choose a base branch
from
+35 −10
Open

parser common BUGFIX revision-date of import/include in ext instances #2624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions src/parser_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,6 +1784,39 @@ lysp_stmt_identity(struct lysp_ctx *ctx, const struct lysp_stmt *stmt, struct ly
return LY_SUCCESS;
}

/**
* @brief Parse the revision-date statement of an import or include.
*
* The value is validated before it is stored, @p rev has room only for a valid date.
*
* @param[in] ctx Parser context.
* @param[in] stmt Source statement data from the parsed extension instance.
* @param[in,out] rev Array to store the revision date in.
* @param[in,out] exts Extension instances to add to.
* @return LY_ERR value.
*/
static LY_ERR
lysp_stmt_revision_date(struct lysp_ctx *ctx, const struct lysp_stmt *stmt, char *rev, struct lysp_ext_instance **exts)
{
const char *str = NULL;
LY_ERR rc;

if (rev[0]) {
LOGVAL_PARSER(ctx, LY_VCODE_DUPSTMT, "revision-date");
return LY_EVALID;
}

LY_CHECK_RET(lysp_stmt_text_field(ctx, stmt, 0, &str, Y_STR_ARG, exts));

rc = lys_check_date(PARSER_CTX(ctx), str, strlen(str), "revision-date");
if (!rc) {
memcpy(rev, str, LY_REV_SIZE);
}
lysdict_remove(PARSER_CTX(ctx), str);

return rc ? LY_EVALID : LY_SUCCESS;
}

/**
* @brief Parse the import statement.
*
Expand All @@ -1796,7 +1829,6 @@ static LY_ERR
lysp_stmt_import(struct lysp_ctx *ctx, const struct lysp_stmt *stmt, struct lysp_import **imports)
{
struct lysp_import *imp;
const char *str = NULL;

LYA_ADD_ITEM(*imports, imp, LOGMEM(PARSER_CTX(ctx)); return LY_EMEM);

Expand All @@ -1818,10 +1850,7 @@ lysp_stmt_import(struct lysp_ctx *ctx, const struct lysp_stmt *stmt, struct lysp
LY_CHECK_RET(lysp_stmt_text_field(ctx, child, 0, &imp->ref, Y_STR_ARG, &imp->exts));
break;
case LY_STMT_REVISION_DATE:
LY_CHECK_RET(lysp_stmt_text_field(ctx, stmt, 0, &str, Y_STR_ARG, &imp->exts));
strcpy(imp->rev, str);
lysdict_remove(PARSER_CTX(ctx), str);
LY_CHECK_RET(lys_check_date(PARSER_CTX(ctx), imp->rev, LY_REV_SIZE - 1, "revision-date"));
LY_CHECK_RET(lysp_stmt_revision_date(ctx, child, imp->rev, &imp->exts));
break;
case LY_STMT_EXTENSION_INSTANCE:
LY_CHECK_RET(lysp_stmt_ext(ctx, child, stmt->kw, 0, &imp->exts));
Expand All @@ -1847,7 +1876,6 @@ static LY_ERR
lysp_stmt_include(struct lysp_ctx *ctx, const struct lysp_stmt *stmt, struct lysp_include **includes)
{
struct lysp_include *inc;
const char *str = NULL;

LYA_ADD_ITEM(*includes, inc, LOGMEM(PARSER_CTX(ctx)); return LY_EMEM);

Expand All @@ -1865,10 +1893,7 @@ lysp_stmt_include(struct lysp_ctx *ctx, const struct lysp_stmt *stmt, struct lys
LY_CHECK_RET(lysp_stmt_text_field(ctx, child, 0, &inc->ref, Y_STR_ARG, &inc->exts));
break;
case LY_STMT_REVISION_DATE:
LY_CHECK_RET(lysp_stmt_text_field(ctx, stmt, 0, &str, Y_STR_ARG, &inc->exts));
strcpy(inc->rev, str);
lysdict_remove(PARSER_CTX(ctx), str);
LY_CHECK_RET(lys_check_date(PARSER_CTX(ctx), inc->rev, LY_REV_SIZE - 1, "revision-date"));
LY_CHECK_RET(lysp_stmt_revision_date(ctx, child, inc->rev, &inc->exts));
break;
case LY_STMT_EXTENSION_INSTANCE:
LY_CHECK_RET(lysp_stmt_ext(ctx, child, stmt->kw, 0, &inc->exts));
Expand Down