Skip to content

Commit

Permalink
Update test data to aas-core-meta 02ee7bb (#449)
Browse files Browse the repository at this point in the history
We update the development requirements to and re-record the test data
for [aas-core-meta 02ee7bb].

Notably, we propagate the fix to the pattern for `xs:date`'s.

[aas-core-meta 02ee7bb]: aas-core-works/aas-core-meta@02ee7bb
  • Loading branch information
mristin authored Mar 6, 2024
1 parent 09c7972 commit f7aeb92
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"twine",
"jsonschema==3.2.0",
"xmlschema==1.10.0",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@c9692bc#egg=aas-core-meta",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@02ee7bb#egg=aas-core-meta",
"ssort==0.12.3",
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1467,11 +1467,11 @@ std::wregex ConstructMatchesXsDate() {
digit
);
std::wstring timezone_frag = common::Concat(
L"(Z|(\\+|-)(0",
L"(Z|(\\+|-)((0",
digit,
L"|1[0-3]):",
minute_frag,
L"|14:00)"
L"|14:00))"
);
std::wstring date_lexical_rep = common::Concat(
year_frag,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ private static Regex _constructMatchesXsDate()
var monthFrag = "((0[1-9])|(1[0-2]))";
var dayFrag = $"((0[1-9])|([12]{digit})|(3[01]))";
var minuteFrag = $"[0-5]{digit}";
var timezoneFrag = $"(Z|(\\+|-)(0{digit}|1[0-3]):{minuteFrag}|14:00)";
var timezoneFrag = $"(Z|(\\+|-)((0{digit}|1[0-3]):{minuteFrag}|14:00))";
var dateLexicalRep = $"{yearFrag}-{monthFrag}-{dayFrag}{timezoneFrag}?";
var pattern = $"^{dateLexicalRep}$";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1020,11 +1020,11 @@ func constructMatchesXsDate() *regexp.Regexp {
digit,
)
timezoneFrag := aascommon.Concat(
"(Z|(\\+|-)(0",
"(Z|(\\+|-)((0",
digit,
"|1[0-3]):",
minuteFrag,
"|14:00)",
"|14:00))",
)
dateLexicalRep := aascommon.Concat(
yearFrag,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28371,7 +28371,7 @@ SymbolTable(
postconditions=[]),
parsed=...,
arguments_by_name=...,
pattern='^-?(([1-9][0-9][0-9][0-9]+)|(0[0-9][0-9][0-9]))-((0[1-9])|(1[0-2]))-((0[1-9])|([12][0-9])|(3[01]))(Z|(\\+|-)(0[0-9]|1[0-3]):[0-5][0-9]|14:00)?$',
pattern='^-?(([1-9][0-9][0-9][0-9]+)|(0[0-9][0-9][0-9]))-((0[1-9])|(1[0-2]))-((0[1-9])|([12][0-9])|(3[01]))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?$',
pattern_expr=textwrap.dedent("""\
Name(
identifier='pattern',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15498,7 +15498,7 @@ UnverifiedSymbolTable(
original_node=...),
value=JoinedStr(
values=[
'(Z|(\\\\+|-)(0',
'(Z|(\\\\+|-)((0',
FormattedValue(
value=Name(
identifier='digit',
Expand All @@ -15510,7 +15510,7 @@ UnverifiedSymbolTable(
identifier='minute_frag',
original_node=...),
original_node=...),
'|14:00)'],
'|14:00))'],
original_node=...),
original_node=...)"""),
textwrap.dedent("""\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ def _construct_matches_xs_date() -> Pattern[str]:
month_frag = '((0[1-9])|(1[0-2]))'
day_frag = f'((0[1-9])|([12]{digit})|(3[01]))'
minute_frag = f'[0-5]{digit}'
timezone_frag = f'(Z|(\\+|-)(0{digit}|1[0-3]):{minute_frag}|14:00)'
timezone_frag = f'(Z|(\\+|-)((0{digit}|1[0-3]):{minute_frag}|14:00))'
date_lexical_rep = f'{year_frag}-{month_frag}-{day_frag}{timezone_frag}?'
pattern = f'^{date_lexical_rep}$'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ function constructMatchesXsDate(): RegExp {
const monthFrag = "((0[1-9])|(1[0-2]))";
const dayFrag = `((0[1-9])|([12]${digit})|(3[01]))`;
const minuteFrag = `[0-5]${digit}`;
const timezoneFrag = `(Z|(\\+|-)(0${digit}|1[0-3]):${minuteFrag}|14:00)`;
const timezoneFrag = `(Z|(\\+|-)((0${digit}|1[0-3]):${minuteFrag}|14:00))`;
const dateLexicalRep = `${yearFrag}-${monthFrag}-${dayFrag}${timezoneFrag}?`;
const pattern = `^${dateLexicalRep}$`;

Expand Down

0 comments on commit f7aeb92

Please sign in to comment.