More optimizations to the Lux syntax parser.

1 files changed, 12 insertions, 5 deletions

diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 1f8068111..aa7b9abce 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -61,6 +61,7 @@
   [<group> "groupId"]
   [<name> "artifactId"]
   [<version> "version"]
+  [<versioning> "versioning"]
   [<versions> "versions"]
   [<last-updated> "lastUpdated"]
   [<metadata> "metadata"]
@@ -87,8 +88,10 @@
              xml.attributes
              (list (..write-group (get@ #group value))
                    (..write-name (get@ #name value))
-                   (..write-versions (get@ #versions value))
-                   (..write-last-updated (get@ #last-updated value)))))
+                   (#xml.Node ..<versioning>
+                              xml.attributes
+                              (list (..write-versions (get@ #versions value))
+                                    (..write-last-updated (get@ #last-updated value)))))))
 
 (def: (sub tag parser)
   (All [a] (-> xml.Tag (Parser a) (Parser a)))
@@ -136,9 +139,13 @@
       ($_ <>.and
           (<xml>.somewhere (..text ..<group>))
           (<xml>.somewhere (..text ..<name>))
-          (<xml>.somewhere (<| (..sub ..<versions>)
-                               (<>.many (..text ..<version>))))
-          (<xml>.somewhere ..last-updated-parser)
+          (<| (..sub ..<versioning>)
+              ($_ <>.and
+                  (<| <xml>.somewhere
+                      (..sub ..<versions>)
+                      (<>.many (..text ..<version>)))
+                  (<xml>.somewhere ..last-updated-parser)
+                  ))
           )))
 
 (def: #export equivalence