o More flexible parsing. More rules needs to be updated.

1 files changed, 14 insertions, 4 deletions

diff --git a/core/kicad.cpp b/core/kicad.cpp
index 1a6ca2f..a553b62 100644
--- a/core/kicad.cpp
+++ b/core/kicad.cpp
@@ -112,12 +112,22 @@ public:
         nodes.emplace_back(ref, pin);
     }
 
+    template<typename T>
+    static
+    Ref<T> onlyOne(const vector<Ref<T>> items, const antlr4::ParserRuleContext *ctx, const string &parent, const string &item) {
+        if(items.size() != 1) {
+            throw kicad_parse_exception("Bad netlist: expected only one " + item + " inside of " + parent + ". Line: " + to_string(ctx->start->getLine()) + ":" + to_string(ctx->start->getCharPositionInLine()));
+        }
+        return items[0];
+    }
+
     virtual void exitComponent(KicadNetParser::ComponentContext *ctx) override {
-        auto ref = strings.get(ctx->ref()->string());
-        auto value = strings.get(ctx->value()->string());
+        auto ref = strings.get(onlyOne(ctx->ref(), ctx, "comp", "ref")->string());
+        auto value = strings.get(onlyOne(ctx->value(), ctx, "comp", "value")->string());
+        auto libsource = onlyOne(ctx->libsource(), ctx, "comp", "libsource");
 
-        lib_source ls{strings.get(ctx->libsource()->lib()->string()),
-                      strings.get(ctx->libsource()->part()->string())};
+        lib_source ls{strings.get(libsource->lib()->string()),
+                      strings.get(libsource->part()->string())};
 
         components.emplace_back(ref, value, ls);
     }