diff --git a/setup.py b/setup.py index bc5796fcb..06bdc8234 100644 --- a/setup.py +++ b/setup.py @@ -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", ] }, diff --git a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp index 0195ab94f..543987cb0 100644 --- a/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp +++ b/test_data/cpp/test_main/aas_core_meta.v3/expected_output/verification.cpp @@ -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, diff --git a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs index 4264e78a8..9b5cef93c 100644 --- a/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs +++ b/test_data/csharp/test_main/aas_core_meta.v3/expected_output/verification.cs @@ -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}$"; diff --git a/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go b/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go index 1d6ff395f..a1f6ca0dc 100644 --- a/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go +++ b/test_data/golang/test_main/aas_core_meta.v3/expected_output/verification/verification.go @@ -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, diff --git a/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt b/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt index f930cdcfa..7976578f2 100644 --- a/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt +++ b/test_data/intermediate/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt @@ -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', diff --git a/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt b/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt index 6c8493bc7..d0059237a 100644 --- a/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt +++ b/test_data/parse/real_meta_models/aas_core_meta.v3/expected_symbol_table.txt @@ -15747,7 +15747,7 @@ UnverifiedSymbolTable( original_node=...), value=JoinedStr( values=[ - '(Z|(\\\\+|-)(0', + '(Z|(\\\\+|-)((0', FormattedValue( value=Name( identifier='digit', @@ -15759,7 +15759,7 @@ UnverifiedSymbolTable( identifier='minute_frag', original_node=...), original_node=...), - '|14:00)'], + '|14:00))'], original_node=...), original_node=...)"""), textwrap.dedent("""\ diff --git a/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py b/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py index 42bef2683..2c3bea9fa 100644 --- a/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py +++ b/test_data/python/test_main/aas_core_meta.v3/expected_output/verification.py @@ -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}$' diff --git a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts index 5099abe82..0dd319666 100644 --- a/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts +++ b/test_data/typescript/test_main/aas_core_meta.v3/expected_output/verification.ts @@ -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}$`;