From f4a669d466c43821e458a46420937b8b9a0147fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Konvi=C4=8Dka?= <konvicka.g630@gmail.com>
Date: Thu, 11 Jan 2024 14:31:20 +0100
Subject: [PATCH] feat: make std optional in vector
---
.gitignore | 3 ++-
LanguageRecogniser/Cpp/CppClassDiagramVisitor.cs | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index add57be..91953df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ bin/
obj/
/packages/
riderModule.iml
-/_ReSharper.Caches/
\ No newline at end of file
+/_ReSharper.Caches/
+.idea
\ No newline at end of file
diff --git a/LanguageRecogniser/Cpp/CppClassDiagramVisitor.cs b/LanguageRecogniser/Cpp/CppClassDiagramVisitor.cs
index e9f6f67..173f674 100644
--- a/LanguageRecogniser/Cpp/CppClassDiagramVisitor.cs
+++ b/LanguageRecogniser/Cpp/CppClassDiagramVisitor.cs
@@ -112,8 +112,8 @@ public class CppClassDiagramVisitor : CPP14ParserBaseVisitor<object>
else
{
// Regular expressions
- string aggregationPattern = @"^(std::vector<(\w*)\*>|(\w*)\*|(\w*)\* (\w*|\[\]))$";
- string compositionPattern = @"^(std::vector<(\w*)>|(\w*)|(\w*) (\w*|\[\]))$";
+ string aggregationPattern = @"^((std::)?vector<(\w*)\*>|(\w*)\*|(\w*)\* (\w*|\[\]))$";
+ string compositionPattern = @"^((std::)?vector<(\w*)>|(\w*)|(\w*) (\w*|\[\]))$";
// Check if the property type matches aggregation or composition
Match aggregationMatch = Regex.Match(atribute.Type, aggregationPattern);
--
GitLab