Skip to content

Commit dfa2271

Browse files
bkryzabkryza
authored
Merge pull request #456 from bkryza/refactor-element-ids-to-usr-2-master
Refactor element ids to usr 2 master
2 parents 3650837 + c29860b commit dfa2271

706 files changed

Lines changed: 31897 additions & 15892 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.clang-tidy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Checks: >-
1919
-bugprone-throwing-static-initialization,
2020
-bugprone-unchecked-optional-access,
2121
-clang-analyzer-alpha.*,
22+
-clang-analyzer-optin*,
2223
-clang-analyzer-core.NonNullParamChecker,
2324
-clang-analyzer-core.StackAddressEscape,
24-
-clang-analyzer-optin.cplusplus.UninitializedObject,
2525
-clang-analyzer-security.ArrayBound,
2626
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
2727
-cppcoreguidelines-macro-usage,

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ if(LLVM_VERSION_MAJOR GREATER_EQUAL 17)
106106
endif()
107107
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
108108
set(CUSTOM_COMPILE_OPTIONS ${CUSTOM_COMPILE_OPTIONS}
109-
-Wno-unused-private-field)
109+
-Wno-unused-private-field
110+
-D_LIBCPP_INTRODUCED_IN_LLVM_21=0)
110111
if(CMAKE_BUILD_TYPE MATCHES Debug)
111112
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstandalone-debug")
112113
endif()

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ format:
201201

202202
.PHONY: debug_tidy
203203
tidy: debug
204-
run-clang-tidy-22 -extra-arg=-std=c++17 -extra-arg=-Wno-unknown-warning-option -j $(NUMPROC) -p debug "${PWD}/src"
204+
run-clang-tidy-22 -allow-no-checks -extra-arg=-std=c++17 -extra-arg=-Wno-unknown-warning-option -j $(NUMPROC) -p debug "${PWD}/src"
205205

206206
.PHONY: check-formatting
207207
check-formatting:

‎cmake/LLVMSetup.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ if(NOT "${LLVM_CONFIG_PATH}" STREQUAL "")
2020
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.(.+)"
2121
LLVM_VERSION_MATCH ${LLVM_VERSION_STR})
2222
set(LLVM_VERSION ${CMAKE_MATCH_1})
23+
set(LLVM_VERSION_MAJOR ${CMAKE_MATCH_1})
2324
set(LLVM_VERSION_MINOR ${CMAKE_MATCH_2})
2425
endif()
2526

‎dev-requirements.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ cmakelang
22
jinja2
33
lxml
44
nicegui
5-
pyyaml
5+
pyyaml
6+
xmlschema

‎docs/test_cases/t00002.md‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private:
151151
"text": "\n \n"
152152
},
153153
"display_name": "A",
154-
"id": "7901073918843258388",
154+
"id": "8773172135197962840",
155155
"is_abstract": true,
156156
"is_nested": false,
157157
"is_struct": false,
@@ -247,7 +247,7 @@ private:
247247
"bases": [
248248
{
249249
"access": "public",
250-
"id": "7901073918843258388",
250+
"id": "8773172135197962840",
251251
"is_virtual": false
252252
}
253253
],
@@ -263,7 +263,7 @@ private:
263263
"text": "\n \n"
264264
},
265265
"display_name": "B",
266-
"id": "4753875669499007606",
266+
"id": "18170990853807266918",
267267
"is_abstract": false,
268268
"is_nested": false,
269269
"is_struct": false,
@@ -315,7 +315,7 @@ private:
315315
"bases": [
316316
{
317317
"access": "public",
318-
"id": "7901073918843258388",
318+
"id": "8773172135197962840",
319319
"is_virtual": false
320320
}
321321
],
@@ -332,7 +332,7 @@ private:
332332
"text": "\n \n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n"
333333
},
334334
"display_name": "C",
335-
"id": "9139995436788700062",
335+
"id": "10246215981066239872",
336336
"is_abstract": false,
337337
"is_nested": false,
338338
"is_struct": false,
@@ -392,12 +392,12 @@ private:
392392
"bases": [
393393
{
394394
"access": "public",
395-
"id": "4753875669499007606",
395+
"id": "18170990853807266918",
396396
"is_virtual": false
397397
},
398398
{
399399
"access": "public",
400-
"id": "9139995436788700062",
400+
"id": "10246215981066239872",
401401
"is_virtual": false
402402
}
403403
],
@@ -410,7 +410,7 @@ private:
410410
"text": "\n This is class D\n which is a little like B\n and a little like C\n"
411411
},
412412
"display_name": "D",
413-
"id": "487603959843317797",
413+
"id": "720631026875968928",
414414
"is_abstract": false,
415415
"is_nested": false,
416416
"is_struct": false,
@@ -527,17 +527,17 @@ private:
527527
"bases": [
528528
{
529529
"access": "public",
530-
"id": "4753875669499007606",
530+
"id": "18170990853807266918",
531531
"is_virtual": true
532532
},
533533
{
534534
"access": "public",
535-
"id": "9139995436788700062",
535+
"id": "10246215981066239872",
536536
"is_virtual": true
537537
}
538538
],
539539
"display_name": "E",
540-
"id": "17903093362471729766",
540+
"id": "6149996290787934466",
541541
"is_abstract": false,
542542
"is_nested": false,
543543
"is_struct": false,
@@ -656,52 +656,52 @@ private:
656656
"relationships": [
657657
{
658658
"access": "public",
659-
"destination": "7901073918843258388",
660-
"source": "4753875669499007606",
659+
"destination": "8773172135197962840",
660+
"source": "18170990853807266918",
661661
"type": "extension"
662662
},
663663
{
664664
"access": "public",
665-
"destination": "7901073918843258388",
666-
"source": "9139995436788700062",
665+
"destination": "8773172135197962840",
666+
"source": "10246215981066239872",
667667
"type": "extension"
668668
},
669669
{
670670
"access": "private",
671-
"destination": "7901073918843258388",
671+
"destination": "8773172135197962840",
672672
"label": "as",
673-
"source": "487603959843317797",
673+
"source": "720631026875968928",
674674
"type": "association"
675675
},
676676
{
677677
"access": "public",
678-
"destination": "4753875669499007606",
679-
"source": "487603959843317797",
678+
"destination": "18170990853807266918",
679+
"source": "720631026875968928",
680680
"type": "extension"
681681
},
682682
{
683683
"access": "public",
684-
"destination": "9139995436788700062",
685-
"source": "487603959843317797",
684+
"destination": "10246215981066239872",
685+
"source": "720631026875968928",
686686
"type": "extension"
687687
},
688688
{
689689
"access": "private",
690-
"destination": "7901073918843258388",
690+
"destination": "8773172135197962840",
691691
"label": "as",
692-
"source": "17903093362471729766",
692+
"source": "6149996290787934466",
693693
"type": "association"
694694
},
695695
{
696696
"access": "public",
697-
"destination": "4753875669499007606",
698-
"source": "17903093362471729766",
697+
"destination": "18170990853807266918",
698+
"source": "6149996290787934466",
699699
"type": "extension"
700700
},
701701
{
702702
"access": "public",
703-
"destination": "9139995436788700062",
704-
"source": "17903093362471729766",
703+
"destination": "10246215981066239872",
704+
"source": "6149996290787934466",
705705
"type": "extension"
706706
}
707707
],
@@ -736,35 +736,35 @@ private:
736736
<data key="nd2"><![CDATA[A]]></data>
737737
<data key="nd3">abstract</data>
738738
<data key="nd6">false</data>
739-
<data key="nd4">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L7</data>
739+
<data key="nd4">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L7</data>
740740
<data key="nd5">This is class A</data>
741741
</node>
742742
<node id="n1">
743743
<data key="nd1">class</data>
744744
<data key="nd2"><![CDATA[B]]></data>
745745
<data key="nd6">false</data>
746-
<data key="nd4">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L16</data>
746+
<data key="nd4">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L16</data>
747747
<data key="nd5">This is class B</data>
748748
</node>
749749
<node id="n2">
750750
<data key="nd1">class</data>
751751
<data key="nd2"><![CDATA[C]]></data>
752752
<data key="nd6">false</data>
753-
<data key="nd4">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L27</data>
753+
<data key="nd4">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L27</data>
754754
<data key="nd5">This is class C - class C has a long comment</data>
755755
</node>
756756
<node id="n3">
757757
<data key="nd1">class</data>
758758
<data key="nd2"><![CDATA[D]]></data>
759759
<data key="nd6">false</data>
760-
<data key="nd4">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L36</data>
760+
<data key="nd4">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L36</data>
761761
<data key="nd5">D</data>
762762
</node>
763763
<node id="n4">
764764
<data key="nd1">class</data>
765765
<data key="nd2"><![CDATA[E]]></data>
766766
<data key="nd6">false</data>
767-
<data key="nd4">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L61</data>
767+
<data key="nd4">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L61</data>
768768
<data key="nd5">E</data>
769769
</node>
770770
<node id="n5">
@@ -801,7 +801,7 @@ private:
801801
<data key="ed1">public</data>
802802
</edge>
803803
<edge id="e5" source="n3" target="n0">
804-
<data key="ed3">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L58</data>
804+
<data key="ed3">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L58</data>
805805
<data key="ed0">association</data>
806806
<data key="ed2">as</data>
807807
<data key="ed1">private</data>
@@ -815,7 +815,7 @@ private:
815815
<data key="ed1">public</data>
816816
</edge>
817817
<edge id="e8" source="n4" target="n0">
818-
<data key="ed3">https://github.com/bkryza/clang-uml/blob/2dbd1029093b76d78fbff0cb3eb3f104c3a3366e/tests/t00002/t00002.cc#L83</data>
818+
<data key="ed3">https://github.com/bkryza/clang-uml/blob/6223022ec9d18db9484d664f819a7cefd7cfaaa6/tests/t00002/t00002.cc#L83</data>
819819
<data key="ed0">association</data>
820820
<data key="ed2">as</data>
821821
<data key="ed1">private</data>

0 commit comments

Comments
 (0)