Skip to content

Commit

Permalink
Update test data to aas-core-meta 79314c6 (#450)
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 79314c6].

Notably, we propagate the patch related to the pattern of `xs:dateTime`.

[aas-core-meta 79314c6]: aas-core-works/aas-core-meta@79314c6
  • Loading branch information
mristin authored Mar 6, 2024
1 parent f7aeb92 commit a206fe8
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@02ee7bb#egg=aas-core-meta",
"aas-core-meta@git+https://github.com/aas-core-works/aas-core-meta@79314c6#egg=aas-core-meta",
"ssort==0.12.3",
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1540,11 +1540,11 @@ std::wregex ConstructMatchesXsDateTime() {
);
std::wstring end_of_day_frag = L"24:00:00(\\.0+)?";
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_time_lexical_rep = common::Concat(
year_frag,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ private static Regex _constructMatchesXsDateTime()
var minuteFrag = $"[0-5]{digit}";
var secondFrag = $"([0-5]{digit})(\\.{digit}+)?";
var endOfDayFrag = "24:00:00(\\.0+)?";
var timezoneFrag = $"(Z|(\\+|-)(0{digit}|1[0-3]):{minuteFrag}|14:00)";
var timezoneFrag = $"(Z|(\\+|-)((0{digit}|1[0-3]):{minuteFrag}|14:00))";
var dateTimeLexicalRep = $"{yearFrag}-{monthFrag}-{dayFrag}T(({hourFrag}:{minuteFrag}:{secondFrag})|{endOfDayFrag}){timezoneFrag}?";
var pattern = $"^{dateTimeLexicalRep}$";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1097,11 +1097,11 @@ func constructMatchesXsDateTime() *regexp.Regexp {
)
endOfDayFrag := "24:00:00(\\.0+)?"
timezoneFrag := aascommon.Concat(
"(Z|(\\+|-)(0",
"(Z|(\\+|-)((0",
digit,
"|1[0-3]):",
minuteFrag,
"|14:00)",
"|14:00))",
)
dateTimeLexicalRep := aascommon.Concat(
yearFrag,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28405,7 +28405,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]))T(((([01][0-9])|(2[0-3])):[0-5][0-9]:([0-5][0-9])(\\.[0-9]+)?)|24:00:00(\\.0+)?)(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]))T(((([01][0-9])|(2[0-3])):[0-5][0-9]:([0-5][0-9])(\\.[0-9]+)?)|24:00:00(\\.0+)?)(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 @@ -15747,7 +15747,7 @@ UnverifiedSymbolTable(
original_node=...),
value=JoinedStr(
values=[
'(Z|(\\\\+|-)(0',
'(Z|(\\\\+|-)((0',
FormattedValue(
value=Name(
identifier='digit',
Expand All @@ -15759,7 +15759,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 @@ -557,7 +557,7 @@ def _construct_matches_xs_date_time() -> Pattern[str]:
minute_frag = f'[0-5]{digit}'
second_frag = f'([0-5]{digit})(\\.{digit}+)?'
end_of_day_frag = '24:00:00(\\.0+)?'
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_time_lexical_rep = f'{year_frag}-{month_frag}-{day_frag}T(({hour_frag}:{minute_frag}:{second_frag})|{end_of_day_frag}){timezone_frag}?'
pattern = f'^{date_time_lexical_rep}$'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ function constructMatchesXsDateTime(): RegExp {
const minuteFrag = `[0-5]${digit}`;
const secondFrag = `([0-5]${digit})(\\.${digit}+)?`;
const endOfDayFrag = "24:00:00(\\.0+)?";
const timezoneFrag = `(Z|(\\+|-)(0${digit}|1[0-3]):${minuteFrag}|14:00)`;
const timezoneFrag = `(Z|(\\+|-)((0${digit}|1[0-3]):${minuteFrag}|14:00))`;
const dateTimeLexicalRep = `${yearFrag}-${monthFrag}-${dayFrag}T((${hourFrag}:${minuteFrag}:${secondFrag})|${endOfDayFrag})${timezoneFrag}?`;
const pattern = `^${dateTimeLexicalRep}$`;

Expand Down

0 comments on commit a206fe8

Please sign in to comment.