Merge pull request #5 from wez/symbolorder-kicad5

kicad5: allow ALIAS or $FPLIST to be in either order
productize · May 21, 2019 · b1b62bf · b1b62bf
2 parents b44829e + 4f22808
commit b1b62bf
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/src/symbol_lib.rs b/src/symbol_lib.rs
@@ -684,23 +684,29 @@ fn parse_symbol(p: &mut ParseState) -> Result<Symbol, KicadError> {
             break;
         }
     }
-    if &p.here() == "$FPLIST" {
-        p.next();
-        // skip FPLIST for now
-        while !p.eof() {
-            if &p.here() == "$ENDFPLIST" {
-                p.next();
-                break;
-            }
-            p.next()
+    loop{
+        if &p.here() == "DRAW" {
+            break;
         }
-    }
-    if p.here().starts_with("ALIAS") {
-        let v = parse_split_quote_aware(&p.here())?;
-        for alias in v.into_iter().skip(1) {
-            s.aliases.push(alias)
+        if &p.here() == "$FPLIST" {
+            p.next();
+            // skip FPLIST for now
+            while !p.eof() {
+                if &p.here() == "$ENDFPLIST" {
+                    p.next();
+                    break;
+                }
+                p.next()
+            }
+        } else if p.here().starts_with("ALIAS") {
+            let v = parse_split_quote_aware(&p.here())?;
+            for alias in v.into_iter().skip(1) {
+                s.aliases.push(alias)
+            }
+            p.next();
+        } else {
+            break;
         }
-        p.next();
     }
     // TODO draw
     assume_line!(p, "DRAW");