Data update

Task/Number-names/Quackery/number-names.quackery

@@ -1,4 +1,4 @@
-  [ [ table
+[ [ table
       $ "zero"  $ "one"   $ "two"
       $ "three" $ "four"  $ "five"
       $ "six"   $ "seven" $ "eight"
@@ -6,13 +6,13 @@
       $ "twelve"   $ "thirteen"
       $ "fourteen" $ "fifteen"
       $ "sixteen"  $ "seventeen"
-      $ "eighteen" $ "nineteen" ] do ]  is units   ( n --> $ )
+      $ "eighteen" $ "nineteen" ] do ]     is units   ( n --> $ )
 
   [ [ table
       $ "nonety" $ "tenty"   $ "twenty"
       $ "thirty" $ "fourty"  $ "fifty"
       $ "sixty"  $ "seventy" $ "eighty"
-      $ "ninety" ] do ]                 is tens    ( n --> $ )
+      $ "ninety" ] do ]                    is tens    ( n --> $ )
 
   [ $ "" swap
     dup 99 > if
@@ -29,11 +29,32 @@
     over size 0 > if
       [ over -1 peek space != if
           [ dip [ space join ] ] ]
-    units join ]                        is triplet ( n --> $ )
+    units join ]                           is triplet ( n --> $ )
 
   [ $ "" swap
+    dup 999999999999999 > if
+      [ 1000000000000000 /mod swap triplet
+        $ " quadrillion" join
+        swap dip join
+        dup 0 = iff drop ]done[ ]
+    dup 999999999999 > if
+      [ over size 0 > if
+          [ dip [ $ ", " join ] ]
+        1000000000000 /mod swap triplet
+        $ " trillion" join
+        swap dip join
+        dup 0 = iff drop ]done[ ]
+    dup 999999999 > if
+      [ over size 0 > if
+          [ dip [ $ ", " join ] ]
+        1000000000 /mod swap triplet
+        $ " billion" join
+        swap dip join
+        dup 0 = iff drop ]done[ ]
     dup 999999 > if
-      [ 1000000 /mod swap triplet
+      [ over size 0 > if
+          [ dip [ $ ", " join ] ]
+        1000000 /mod swap triplet
         $ " million" join
         swap dip join
         dup 0 = iff drop ]done[ ]
@@ -46,10 +67,17 @@
         dup 0 = iff drop ]done[ ]
     over size 0 > if
       [ dip [ $ ", " join ] ]
-    triplet join ]                      is name$   ( n --> $ )
+    triplet join
+    dup reverse witheach
+      [ char , = if
+          [ i split
+            behead drop
+            $ " and" swap
+            join join
+            conclude ] ] ]                 is name$   ( n --> $ )
 
-   10 times
-     [ 10 9 random
+    10 times
+     [ 10 18 random
        1+ ** random
        dup echo
        say " is:"