aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/source/lux/compiler/default/syntax.lux5
-rw-r--r--stdlib/test/test/lux/compiler/default/syntax.lux2
2 files changed, 2 insertions, 5 deletions
diff --git a/stdlib/source/lux/compiler/default/syntax.lux b/stdlib/source/lux/compiler/default/syntax.lux
index aa77be1e5..06672b2aa 100644
--- a/stdlib/source/lux/compiler/default/syntax.lux
+++ b/stdlib/source/lux/compiler/default/syntax.lux
@@ -59,7 +59,6 @@
(def: digits+ (format "_" ..digits))
(def: white-space " ")
-(def: carriage-return "\r")
(def: new-line "\n")
## (def: new-line^ (l.this new-line))
@@ -142,7 +141,6 @@
## Handle special cases.
"v" (wrap [2 "\v"])
"n" (wrap [2 ..new-line])
- "r" (wrap [2 "\r"])
(^ (static ..text-delimiter)) (wrap [2 ..text-delimiter])
(^ (static ..escape)) (wrap [2 ..escape])
@@ -623,7 +621,6 @@
(!find-next-escape 2 next-escape end source-code total <output>))
(["v" "\v"]
["n" (static ..new-line)]
- ["r" "\r"]
[(~~ (static ..escape)) (static ..escape)])
(^ (char (~~ (static ..text-delimiter))))
@@ -878,7 +875,7 @@
(!inc offset)
source-code]))
([(~~ (static ..white-space)) #.column]
- [(~~ (static ..carriage-return)) #.column])
+ [(~~ (static text.carriage-return)) #.column])
(^ (char (~~ (static ..new-line))))
(recur tracker [(!new-line where) (!inc offset) source-code])
diff --git a/stdlib/test/test/lux/compiler/default/syntax.lux b/stdlib/test/test/lux/compiler/default/syntax.lux
index e8b5bb5b4..14de95b52 100644
--- a/stdlib/test/test/lux/compiler/default/syntax.lux
+++ b/stdlib/test/test/lux/compiler/default/syntax.lux
@@ -30,7 +30,7 @@
(do r.Monad<Random>
[#let [digits "0123456789"
delimiters "()[]{}#.\""
- space "\v \n\r"
+ space "\v \n"
invalid-range (format digits delimiters space)
char-gen (|> r.nat
(:: @ map (|>> (n/% 256) (n/max 1)))