From 9671d6064dd02dfe6c32492f5b9907b096e5bd89 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 21 Jul 2018 23:57:21 -0400
Subject: Re-named "seq" to "and" and "alt" to "or".

---
 stdlib/source/lux/data/format/json.lux | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'stdlib/source/lux/data/format/json.lux')

diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index 79510cb5c..02c05f5dd 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -284,8 +284,8 @@
 
 (def: #export (nullable parser)
   (All [a] (-> (Reader a) (Reader (Maybe a))))
-  (p.alt null
-         parser))
+  (p.or null
+        parser))
 
 (def: #export (array parser)
   {#.doc "Parses a JSON array, assuming that every element can be parsed the same way."}
@@ -405,7 +405,7 @@
 
 (def: data-sep
   (l.Lexer [Text Any Text])
-  ($_ p.seq space~ (l.this ",") space~))
+  ($_ p.and space~ (l.this ",") space~))
 
 (def: null~
   (l.Lexer Null)
@@ -502,7 +502,7 @@
 
 (def: (json~' _)
   (-> Any (l.Lexer JSON))
-  ($_ p.alt null~ boolean~ number~ string~ (array~ json~') (object~ json~')))
+  ($_ p.or null~ boolean~ number~ string~ (array~ json~') (object~ json~')))
 
 (structure: #export _ (Codec Text JSON)
   (def: encode show-json)
-- 
cgit v1.2.3