From 4ca397765805eda5ddee393901ed3a02001a960a Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Fri, 25 Dec 2020 09:22:38 -0400 Subject: Replaced kebab-case with snake_case for naming convention. --- .../source/program/aedifex/metadata/artifact.lux | 60 +++---- .../source/program/aedifex/metadata/snapshot.lux | 184 ++++++++++----------- 2 files changed, 122 insertions(+), 122 deletions(-) (limited to 'stdlib/source/program/aedifex/metadata') diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index aa7b9abce..cf9a34b58 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -29,7 +29,7 @@ {#group Group #name Name #versions (List Version) - #last-updated Instant}) + #last_updated Instant}) (def: (pad value) (-> Nat Text) @@ -37,23 +37,23 @@ (format "0" (%.nat value)) (%.nat value))) -(def: (date-format value) +(def: (date_format value) (%.Format Date) (format (|> value date.year year.value .nat %.nat) (|> value date.month month.number ..pad) - (|> value date.day-of-month ..pad))) + (|> value date.day_of_month ..pad))) -(def: (time-format value) +(def: (time_format value) (%.Format Time) (let [(^slots [#time.hour #time.minute #time.second]) (time.clock value)] (format (..pad hour) (..pad minute) (..pad second)))) -(def: (instant-format value) +(def: (instant_format value) (%.Format Instant) - (format (..date-format (instant.date value)) - (..time-format (instant.time value)))) + (format (..date_format (instant.date value)) + (..time_format (instant.time value)))) (template [ ] [(def: xml.Tag ["" ])] @@ -63,7 +63,7 @@ [ "version"] [ "versioning"] [ "versions"] - [ "lastUpdated"] + [ "lastUpdated"] [ "metadata"] ) @@ -72,26 +72,26 @@ (-> XML) (|>>
 #xml.Text list (#xml.Node  xml.attributes)))]
 
-  [write-group Group .. (|>)]
-  [write-name Name .. (|>)]
-  [write-version Version .. (|>)]
-  [write-last-updated Instant .. ..instant-format]
+  [write_group Group .. (|>)]
+  [write_name Name .. (|>)]
+  [write_version Version .. (|>)]
+  [write_last_updated Instant .. ..instant_format]
   )
 
-(def: write-versions
+(def: write_versions
   (-> (List Version) XML)
-  (|>> (list\map ..write-version) (#xml.Node .. xml.attributes)))
+  (|>> (list\map ..write_version) (#xml.Node .. xml.attributes)))
 
 (def: #export (write value)
   (-> Metadata XML)
   (#xml.Node ..
              xml.attributes
-             (list (..write-group (get@ #group value))
-                   (..write-name (get@ #name value))
+             (list (..write_group (get@ #group value))
+                   (..write_name (get@ #name value))
                    (#xml.Node ..
                               xml.attributes
-                              (list (..write-versions (get@ #versions value))
-                                    (..write-last-updated (get@ #last-updated value)))))))
+                              (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)))
@@ -103,17 +103,17 @@
   (-> xml.Tag (Parser Text))
   (..sub tag .text))
 
-(def: date-parser
+(def: date_parser
   (.Parser Date)
   (do <>.monad
     [year (<>.codec n.decimal (.exactly 4 .decimal))
      year (<>.lift (year.year (.int year)))
      month (<>.codec n.decimal (.exactly 2 .decimal))
-     month (<>.lift (month.by-number month))
-     day-of-month (<>.codec n.decimal (.exactly 2 .decimal))]
-    (<>.lift (date.date year month day-of-month))))
+     month (<>.lift (month.by_number month))
+     day_of_month (<>.codec n.decimal (.exactly 2 .decimal))]
+    (<>.lift (date.date year month day_of_month))))
 
-(def: time-parser
+(def: time_parser
   (.Parser Time)
   (do <>.monad
     [hour (<>.codec n.decimal (.exactly 2 .decimal))
@@ -123,15 +123,15 @@
               {#time.hour hour
                #time.minute minute
                #time.second second
-               #time.milli-second 0}))))
+               #time.milli_second 0}))))
 
-(def: last-updated-parser
+(def: last_updated_parser
   (Parser Instant)
   (.embed (do <>.monad
-                  [date ..date-parser
-                   time ..time-parser]
-                  (wrap (instant.from-date-time date time)))
-                (..text ..)))
+                  [date ..date_parser
+                   time ..time_parser]
+                  (wrap (instant.from_date_time date time)))
+                (..text ..)))
 
 (def: #export parser
   (Parser Metadata)
@@ -144,7 +144,7 @@
                   (<| .somewhere
                       (..sub ..)
                       (<>.many (..text ..)))
-                  (.somewhere ..last-updated-parser)
+                  (.somewhere ..last_updated_parser)
                   ))
           )))
 
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 1919d06ca..ea6ce4719 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -30,19 +30,19 @@
 (def: snapshot
   "SNAPSHOT")
 
-(type: #export Time-Stamp
+(type: #export Time_Stamp
   Instant)
 
 (type: #export Build
   Nat)
 
 (type: #export Versioning
-  {#time-stamp Time-Stamp
+  {#time_stamp Time_Stamp
    #build Build
    #snapshot (List Type)})
 
 (type: #export Value
-  [Version Time-Stamp Build])
+  [Version Time_Stamp Build])
 
 (type: #export Metadata
   {#group Group
@@ -56,44 +56,44 @@
     (format "0" (%.nat value))
     (%.nat value)))
 
-(def: (date-format value)
+(def: (date_format value)
   (%.Format Date)
   (format (|> value date.year year.value .nat %.nat)
           (|> value date.month month.number ..pad)
-          (|> value date.day-of-month ..pad)))
+          (|> value date.day_of_month ..pad)))
 
-(def: (time-format value)
+(def: (time_format value)
   (%.Format Time)
   (let [(^slots [#time.hour #time.minute #time.second]) (time.clock value)]
     (format (..pad hour)
             (..pad minute)
             (..pad second))))
 
-(def: (instant-format value)
+(def: (instant_format value)
   (%.Format Instant)
-  (format (..date-format (instant.date value))
-          (..time-format (instant.time value))))
+  (format (..date_format (instant.date value))
+          (..time_format (instant.time value))))
 
 (template [ ]
   [(def: 
      )]
 
-  ["." time-stamp-separator]
-  ["-" value-separator]
+  ["." time_stamp_separator]
+  ["-" value_separator]
   )
 
-(def: (time-stamp-format value)
-  (%.Format Time-Stamp)
-  (format (..date-format (instant.date value))
-          ..time-stamp-separator
-          (..time-format (instant.time value))))
+(def: (time_stamp_format value)
+  (%.Format Time_Stamp)
+  (format (..date_format (instant.date value))
+          ..time_stamp_separator
+          (..time_format (instant.time value))))
 
-(def: (value-format [version time-stamp build])
+(def: (value_format [version time_stamp build])
   (%.Format Value)
-  (format (text.replace-all ..snapshot
-                            (..time-stamp-format time-stamp)
+  (format (text.replace_all ..snapshot
+                            (..time_stamp_format time_stamp)
                             version)
-          ..value-separator
+          ..value_separator
           (%.nat build)))
 
 (template [ ]
@@ -102,14 +102,14 @@
   [ "groupId"]
   [ "artifactId"]
   [ "version"]
-  [ "lastUpdated"]
+  [ "lastUpdated"]
   [ "metadata"]
   [ "versioning"]
   [ "snapshot"]
   [ "timestamp"]
-  [ "buildNumber"]
-  [ "snapshotVersions"]
-  [ "snapshotVersion"]
+  [ "buildNumber"]
+  [ "snapshotVersions"]
+  [ "snapshotVersion"]
   [ "extension"]
   [ "value"]
   [ "updated"]
@@ -120,44 +120,44 @@
      (->  XML)
      (|>> 
 #xml.Text list (#xml.Node  xml.attributes)))]
 
-  [write-group Group .. (|>)]
-  [write-name Name .. (|>)]
-  [write-version Version .. (|>)]
-  [write-last-updated Instant .. ..instant-format]
-  [write-time-stamp Instant .. ..time-stamp-format]
-  [write-build-number Nat .. %.nat]
-  [write-extension Type .. (|>)]
-  [write-value Value .. ..value-format]
-  [write-updated Instant .. ..instant-format]
+  [write_group Group .. (|>)]
+  [write_name Name .. (|>)]
+  [write_version Version .. (|>)]
+  [write_last_updated Instant .. ..instant_format]
+  [write_time_stamp Instant .. ..time_stamp_format]
+  [write_build_number Nat .. %.nat]
+  [write_extension Type .. (|>)]
+  [write_value Value .. ..value_format]
+  [write_updated Instant .. ..instant_format]
   )
 
-(def: (write-snapshot value type)
+(def: (write_snapshot value type)
   (-> Value Type XML)
-  (<| (#xml.Node .. xml.attributes)
-      (list (..write-extension type)
-            (..write-value value)
-            (let [[version time-stamp build] value]
-              (..write-updated time-stamp)))))
+  (<| (#xml.Node .. xml.attributes)
+      (list (..write_extension type)
+            (..write_value value)
+            (let [[version time_stamp build] value]
+              (..write_updated time_stamp)))))
 
-(def: (write-versioning version (^slots [#time-stamp #build #snapshot]))
+(def: (write_versioning version (^slots [#time_stamp #build #snapshot]))
   (-> Version Versioning XML)
   (<| (#xml.Node .. xml.attributes)
       (list (<| (#xml.Node .. xml.attributes)
-                (list (..write-time-stamp time-stamp)
-                      (..write-build-number build)))
-            (..write-last-updated time-stamp)
-            (<| (#xml.Node .. xml.attributes)
-                (list\map (..write-snapshot [version time-stamp build])
+                (list (..write_time_stamp time_stamp)
+                      (..write_build_number build)))
+            (..write_last_updated time_stamp)
+            (<| (#xml.Node .. xml.attributes)
+                (list\map (..write_snapshot [version time_stamp build])
                           snapshot)))))
 
 (def: #export (write (^slots [#group #name #version #versioning]))
   (-> Metadata XML)
   (#xml.Node ..
              xml.attributes
-             (list (..write-group group)
-                   (..write-name name)
-                   (..write-version version)
-                   (..write-versioning version versioning))))
+             (list (..write_group group)
+                   (..write_name name)
+                   (..write_version version)
+                   (..write_versioning version versioning))))
 
 (def: (sub tag parser)
   (All [a] (-> xml.Tag (Parser a) (Parser a)))
@@ -169,17 +169,17 @@
   (-> xml.Tag (Parser Text))
   (..sub tag .text))
 
-(def: date-parser
+(def: date_parser
   (.Parser Date)
   (do <>.monad
     [year (<>.codec n.decimal (.exactly 4 .decimal))
      year (<>.lift (year.year (.int year)))
      month (<>.codec n.decimal (.exactly 2 .decimal))
-     month (<>.lift (month.by-number month))
-     day-of-month (<>.codec n.decimal (.exactly 2 .decimal))]
-    (<>.lift (date.date year month day-of-month))))
+     month (<>.lift (month.by_number month))
+     day_of_month (<>.codec n.decimal (.exactly 2 .decimal))]
+    (<>.lift (date.date year month day_of_month))))
 
-(def: time-parser
+(def: time_parser
   (.Parser Time)
   (do <>.monad
     [hour (<>.codec n.decimal (.exactly 2 .decimal))
@@ -189,69 +189,69 @@
               {#time.hour hour
                #time.minute minute
                #time.second second
-               #time.milli-second 0}))))
+               #time.milli_second 0}))))
 
-(def: last-updated-parser
+(def: last_updated_parser
   (Parser Instant)
   (.embed (do <>.monad
-                  [date ..date-parser
-                   time ..time-parser]
-                  (wrap (instant.from-date-time date time)))
-                (..text ..)))
+                  [date ..date_parser
+                   time ..time_parser]
+                  (wrap (instant.from_date_time date time)))
+                (..text ..)))
 
-(def: time-stamp-parser
-  (Parser Time-Stamp)
+(def: time_stamp_parser
+  (Parser Time_Stamp)
   (.embed (do <>.monad
-                  [date ..date-parser
-                   _ (.this ..time-stamp-separator)
-                   time ..time-parser]
-                  (wrap (instant.from-date-time date time)))
+                  [date ..date_parser
+                   _ (.this ..time_stamp_separator)
+                   time ..time_parser]
+                  (wrap (instant.from_date_time date time)))
                 (..text ..)))
 
-(def: build-parser
+(def: build_parser
   (Parser Build)
   (.embed (<>.codec n.decimal
                           (.many .decimal))
-                (..text ..)))
+                (..text ..)))
 
-(exception: #export (time-stamp-mismatch {expected Time-Stamp} {actual Text})
+(exception: #export (time_stamp_mismatch {expected Time_Stamp} {actual Text})
   (exception.report
-   ["Expected time-stamp" (instant-format expected)]
+   ["Expected time-stamp" (instant_format expected)]
    ["Actual time-stamp" actual]))
 
-(exception: #export (value-mismatch {expected Value} {actual Text})
+(exception: #export (value_mismatch {expected Value} {actual Text})
   (exception.report
-   ["Expected" (..value-format expected)]
+   ["Expected" (..value_format expected)]
    ["Actual" actual]))
 
-(def: (snapshot-parser expected)
+(def: (snapshot_parser expected)
   (-> Value (Parser Type))
-  (<| (..sub ..)
+  (<| (..sub ..)
       (do <>.monad
-        [#let [[version time-stamp build] expected]
+        [#let [[version time_stamp build] expected]
          updated (.somewhere (..text ..))
-         _ (<>.assert (exception.construct ..time-stamp-mismatch [time-stamp updated])
-                      (\ text.equivalence = (instant-format time-stamp) updated))
+         _ (<>.assert (exception.construct ..time_stamp_mismatch [time_stamp updated])
+                      (\ text.equivalence = (instant_format time_stamp) updated))
          actual (.somewhere (..text ..))
-         _ (<>.assert (exception.construct ..value-mismatch [expected actual])
-                      (\ text.equivalence = (..value-format expected) actual))]
+         _ (<>.assert (exception.construct ..value_mismatch [expected actual])
+                      (\ text.equivalence = (..value_format expected) actual))]
         (.somewhere (..text ..)))))
 
-(def: (versioning-parser version)
+(def: (versioning_parser version)
   (-> Version (Parser Versioning))
   (<| (..sub ..)
       (do <>.monad
-        [[time-stamp build] (<| .somewhere
+        [[time_stamp build] (<| .somewhere
                                 (..sub ..)
-                                (<>.and (.somewhere ..time-stamp-parser)
-                                        (.somewhere ..build-parser)))
-         last-updated (.somewhere ..last-updated-parser)
-         _ (<>.assert (exception.construct ..time-stamp-mismatch [time-stamp (instant-format last-updated)])
-                      (\ instant.equivalence = time-stamp last-updated))
+                                (<>.and (.somewhere ..time_stamp_parser)
+                                        (.somewhere ..build_parser)))
+         last_updated (.somewhere ..last_updated_parser)
+         _ (<>.assert (exception.construct ..time_stamp_mismatch [time_stamp (instant_format last_updated)])
+                      (\ instant.equivalence = time_stamp last_updated))
          snapshot (<| .somewhere
-                      (..sub ..)
-                      (<>.some (..snapshot-parser [version time-stamp build])))]
-        (wrap {#time-stamp time-stamp
+                      (..sub ..)
+                      (<>.some (..snapshot_parser [version time_stamp build])))]
+        (wrap {#time_stamp time_stamp
                #build build
                #snapshot snapshot}))))
 
@@ -262,13 +262,13 @@
         [group (.somewhere (..text ..))
          name (.somewhere (..text ..))
          version (.somewhere (..text ..))
-         versioning (.somewhere (..versioning-parser version))]
+         versioning (.somewhere (..versioning_parser version))]
         (wrap {#group group
                #name name
                #version version
                #versioning versioning}))))
 
-(def: versioning-equivalence
+(def: versioning_equivalence
   (Equivalence Versioning)
   ($_ product.equivalence
       instant.equivalence
@@ -282,5 +282,5 @@
       text.equivalence
       text.equivalence
       text.equivalence
-      ..versioning-equivalence
+      ..versioning_equivalence
       ))
-- 
cgit v1.2.3