From 5bb1c2b520e5d42d325f79673ae9711c6698082c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 26 Aug 2017 19:45:54 -0500
Subject: [PATCH] modern: Fix : ; and add unit tests.

---
 extra/modern/modern-tests.factor | 38 ++++++++++++++++++++++++++++++++
 extra/modern/modern.factor       |  7 ++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/extra/modern/modern-tests.factor b/extra/modern/modern-tests.factor
index b2f6f56781..1369a288b2 100644
--- a/extra/modern/modern-tests.factor
+++ b/extra/modern/modern-tests.factor
@@ -33,6 +33,30 @@ IN: modern.tests
     { "1" ":>" "one" }
 } [ "1 :> one" string>literals >strings ] unit-test
 
+{
+    { { ":" { "foo" } ";" } }
+} [ ": foo ;" string>literals >strings ] unit-test
+
+{
+    {
+        { "FOO:" { "a" } }
+        { "BAR:" { "b" } }
+    }
+} [ "FOO: a BAR: b" string>literals >strings ] unit-test
+
+{
+    {
+        { "FOO:" { "a" } ";" }
+    }
+} [ "FOO: a ;" string>literals >strings ] unit-test
+
+{
+    {
+        { "FOO:" { "a" } "FOO;" }
+    }
+} [ "FOO: a FOO;" string>literals >strings ] unit-test
+
+
 ! Acute
 {
     { { "<A" { } "A>" } }
@@ -91,3 +115,17 @@ IN: modern.tests
 { { "\\[[" } } [ "\\[[" string>literals >strings ] unit-test
 { { "\\[=[" } } [ "\\[=[" string>literals >strings ] unit-test
 { { "\\[==[" } } [ "\\[==[" string>literals >strings ] unit-test
+
+
+{ t } [ "FOO:" strict-upper? ] unit-test
+{ t } [ ":" strict-upper? ] unit-test
+{ f } [ "<FOO" strict-upper? ] unit-test
+{ f } [ "<FOO:" strict-upper? ] unit-test
+{ f } [ "->" strict-upper? ] unit-test
+{ f } [ "FOO>" strict-upper? ] unit-test
+{ f } [ ";FOO>" strict-upper? ] unit-test
+
+{ f } [ "FOO" section-open? ] unit-test
+{ f } [ "FOO:" section-open? ] unit-test
+{ f } [ ";FOO" section-close? ] unit-test
+{ f } [ "FOO" section-close? ] unit-test
diff --git a/extra/modern/modern.factor b/extra/modern/modern.factor
index 75c03565b7..131501817c 100644
--- a/extra/modern/modern.factor
+++ b/extra/modern/modern.factor
@@ -133,7 +133,7 @@ MACRO:: read-matched ( ch -- quot: ( n string tag -- n' string slice' ) )
     dup '[ but-last ";" append ";" 2array lex-colon-until ] dip
     swap
     ! Remove the ; from the paylaod if present
-    dup ?last ";" sequence= [
+    dup ?last ";" tail? [
         unclip-last 3array
     ] [
         2array
@@ -162,7 +162,7 @@ ERROR: unexpected-terminator n string slice ;
         dup terminator? [ unexpected-terminator ] when
     ] dip swap 2array ;
 
-: strict-upper? ( string -- ? )
+: (strict-upper?) ( string -- ? )
     {
         [
             [
@@ -172,6 +172,9 @@ ERROR: unexpected-terminator n string slice ;
         [ [ char: A char: Z between? ] any? ]
     } 1&& ;
 
+: strict-upper? ( string -- ? )
+    { [ ":" sequence= ] [ (strict-upper?) ] } 1|| ;
+
 ! <a <a: but not <a>
 : section-open? ( string -- ? )
     {