Added single automatic connection dialog + bugfixes

comdel/domain/attribute.cpp

@@ -59,4 +59,8 @@ namespace domain {
         return popup;
     }
 
+    void Attribute::setPupup(std::optional<Popup> popup)  {
+        this->popup = popup;
+    }
+
 } // namespace domain

comdel/domain/attribute.h

@@ -54,7 +54,7 @@ namespace domain {
 
         void setEnumeration(std::vector<Enumeration> enums) {
             enumerated = true;
-            enumeration = std::move(enums);
+            enumeration = enums;
         }
 
     };
@@ -71,6 +71,7 @@ namespace domain {
         Value getDefault();
 
         std::optional<Popup> getPopup();
+        void setPupup(std::optional<Popup> popup);
     };
 
 } // namespace domain

comdel/domain/component.cpp

@@ -62,7 +62,7 @@ namespace domain {
         return false;
     }
 
-    std::vector<Attribute> Component::getAttributes() {
+    std::vector<Attribute>& Component::getAttributes() {
         return attributes;
     }
 

comdel/domain/component.h

@@ -60,7 +60,7 @@ namespace domain {
 
         Pin getPin(std::string pin);
 
-        std::vector<Attribute> getAttributes();
+        std::vector<Attribute>& getAttributes();
 
         Attribute getAttribute(std::string attribute);
 

comdel/domain/connection.cpp

@@ -20,7 +20,7 @@ namespace domain {
         return bus;
     }
 
-    std::vector<Attribute> Connection::getAttributes() {
+    std::vector<Attribute>& Connection::getAttributes() {
         return attributes;
     }
 

comdel/domain/connection.h

@@ -60,7 +60,7 @@ namespace domain {
 
         std::string getBus();
 
-        std::vector<Attribute> getAttributes();
+        std::vector<Attribute>& getAttributes();
 
         std::vector<Value> getWires();
 

comdel/domain/schema_creator.cpp

@@ -438,7 +438,9 @@ namespace domain {
                 } else if (attributes[0].getDefault().getType() != Value::STRING) {
                     errors.emplace_back(node.attributes[0].span, "@attribute must be of type string");
                 } else {
-                    attributes[0].getPopup()->setEnumeration(createWireEnumeration(firstWires));
+                    domain::Popup popup = *attributes[0].getPopup();
+                    popup.setEnumeration(createWireEnumeration(firstWires));
+                    attributes[0].setPupup(popup);
                 }
 
                 if (!attributes[1].getPopup().has_value()) {
@@ -446,7 +448,9 @@ namespace domain {
                 } else if (attributes[1].getDefault().getType() != Value::STRING) {
                     errors.emplace_back(node.attributes[1].span, "@attribute must be of type string");
                 } else {
-                    attributes[1].getPopup()->setEnumeration(createWireEnumeration(secondWires));
+                    domain::Popup popup = *attributes[1].getPopup();
+                    popup.setEnumeration(createWireEnumeration(secondWires));
+                    attributes[1].setPupup(popup);
                 }
             }
 
@@ -935,12 +939,22 @@ namespace domain {
                     auto attribute = connection->getAttribute(attr.name.value);
                     auto value = toType(attr.value);
 
+                    bool valueFound = false;
+
+                    // all connection attributes must be of type enumeration
                     for (auto &en: attribute.getPopup()->getEnumeration()) {
-                        if (en.getValue().asReference() == value.asReference()) {
-                            value = Value::fromReference(value.asReference(), Value::WIRE_REFERENCE);
+                        if (en.getValue().equals(value)) {
+                            valueFound = true;
+                            break;
+                        } else if(value.isType(Value::UNDEFINED)) {
+                            if(en.getValue().isType(Value::WIRE_REFERENCE) && en.getValue().asReference() == value.asReference()) {
+                                value = Value::fromReference(value.asReference(), Value::WIRE_REFERENCE);
+                                valueFound = true;
+                                break;
+                            }
                         }
                     }
-                    if (value.isType(Value::UNDEFINED)) {
+                    if (!valueFound) {
                         errors.emplace_back(attr.span, "invalid value");
                     }