diff --git a/setup.py b/setup.py index cc78aaefa..bc5796fcb 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@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", ] }, 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 bcedf01b1..0195ab94f 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 @@ -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, 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 2c746cd8c..4264e78a8 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 @@ -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}$"; 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 e1d0d26e3..1d6ff395f 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 @@ -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, 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 d8b51d857..f930cdcfa 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 @@ -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', 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 b0f31e452..6c8493bc7 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 @@ -15498,7 +15498,7 @@ UnverifiedSymbolTable( original_node=...), value=JoinedStr( values=[ - '(Z|(\\\\+|-)(0', + '(Z|(\\\\+|-)((0', FormattedValue( value=Name( identifier='digit', @@ -15510,7 +15510,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 d84edb61f..42bef2683 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 @@ -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}$' 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 2823cef17..5099abe82 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 @@ -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}$`;