From c7f12617a6665bc3e26e070fda2982dc6b43d8c6 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 6 Mar 2018 19:07:37 -0600
Subject: [PATCH] factor: port changes.

---
 basis/io/encodings/8-bit/8-bit.factor |  2 +-
 extra/dbf/dbf.factor                  | 62 +++++++++++++--------------
 extra/images/png/png.factor           |  2 +-
 extra/minesweeper/minesweeper.factor  |  2 +-
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/basis/io/encodings/8-bit/8-bit.factor b/basis/io/encodings/8-bit/8-bit.factor
index ec9a661ed7..e1be74be61 100644
--- a/basis/io/encodings/8-bit/8-bit.factor
+++ b/basis/io/encodings/8-bit/8-bit.factor
@@ -43,6 +43,7 @@ M: 8-bit decode-char
 PRIVATE>
 
 SYNTAX: \8-BIT: scan-token scan-token scan-token load-encoding ;
+>>
 
 8-BIT: cp424 IBM424 CP424
 8-BIT: cp437 IBM437 CP437
@@ -95,4 +96,3 @@ SYNTAX: \8-BIT: scan-token scan-token scan-token load-encoding ;
 8-BIT: windows-1256 windows-1256 CP1256
 8-BIT: windows-1257 windows-1257 CP1257
 8-BIT: windows-1258 windows-1258 CP1258
->>>>>>> origin/master
diff --git a/extra/dbf/dbf.factor b/extra/dbf/dbf.factor
index 62daadedc8..a2cb789907 100644
--- a/extra/dbf/dbf.factor
+++ b/extra/dbf/dbf.factor
@@ -149,20 +149,20 @@ STRUCT: dbf-field-header
     { index-field-flag uint8_t } ;
 
 : read-field-headers ( -- field-headers )
-    [ read1 dup { CHAR: \r CHAR: \n f } member? not ] [
+    [ read1 dup { char: \r char: \n f } member? not ] [
         dbf-field-header heap-size 1 - read swap prefix
         dbf-field-header memory>struct
     ] produce nip ;
 
 : check-field-header ( field-header -- field-header )
     dup type>> {
-        { CHAR: I [ dup length>> 4 assert= ] }
-        { CHAR: L [ dup length>> 1 assert= ] }
-        { CHAR: O [ dup length>> 8 assert= ] }
-        { CHAR: Y [ dup length>> 8 assert= ] }
-        { CHAR: D [ dup length>> 8 assert= ] }
-        { CHAR: T [ dup length>> 8 assert= ] }
-        { CHAR: M [ dup length>> 10 assert= ] }
+        { char: I [ dup length>> 4 assert= ] }
+        { char: L [ dup length>> 1 assert= ] }
+        { char: O [ dup length>> 8 assert= ] }
+        { char: Y [ dup length>> 8 assert= ] }
+        { char: D [ dup length>> 8 assert= ] }
+        { char: T [ dup length>> 8 assert= ] }
+        { char: M [ dup length>> 10 assert= ] }
         [ drop ]
     } case ;
 
@@ -176,7 +176,7 @@ TUPLE: record deleted? values ;
 : read-records ( field-headers -- records )
     [ read1 dup { 0x1a f } member? not ]
     [
-        CHAR: * = over [
+        char: * = over [
             [ length>> read ]
             [ type>> parse-field ] bi
         ] map record boa
@@ -229,7 +229,7 @@ ERROR: illegal-logical value ;
 
 : parse-numeric ( byte-array -- n )
     [ "\r\n\t *" member? ] trim
-    H{ { CHAR: , CHAR: . } } substitute string>number ;
+    H{ { char: , char: . } } substitute string>number ;
 
 : parse-double ( byte-array -- n )
     dup length 8 assert= le> bits>double ;
@@ -245,27 +245,27 @@ ERROR: unsupported-field-type type ;
 
 : parse-field ( byte-array type -- data )
     {
-        { CHAR: \0 [ ] }
-        { CHAR: 2  [ parse-short ] }
-        { CHAR: 4  [ parse-int ] }
-        { CHAR: 8  [ parse-double ] }
-        { CHAR: C  [ parse-string ] }
-        { CHAR: D  [ parse-date ] }
-        { CHAR: F  [ parse-float ] }
-        { CHAR: I  [ parse-int ] }
-        { CHAR: L  [ parse-logical ] }
-        { CHAR: N  [ parse-numeric ] }
-        { CHAR: O  [ parse-double ] }
-        { CHAR: V  [ parse-string ] }
-        { CHAR: Y  [ parse-currency ] }
-        { CHAR: @  [ parse-timestamp ] }
-        ! { CHAR: +  [ parse-autoincrement ] }
-        ! { CHAR: M  [ parse-memo ] }
-        ! { CHAR: T  [ parse-datetime ] }
-        ! { CHAR: B  [ parse-double? ] } ! (only on dbversion in [0x30, 0x31, 0x32])
-        ! { CHAR: G  [ parse-general ] }
-        ! { CHAR: P  [ parse-picture ] }
-        ! { CHAR: Q  [ parse-varbinary ] }
+        { char: \0 [ ] }
+        { char: 2  [ parse-short ] }
+        { char: 4  [ parse-int ] }
+        { char: 8  [ parse-double ] }
+        { char: C  [ parse-string ] }
+        { char: D  [ parse-date ] }
+        { char: F  [ parse-float ] }
+        { char: I  [ parse-int ] }
+        { char: L  [ parse-logical ] }
+        { char: N  [ parse-numeric ] }
+        { char: O  [ parse-double ] }
+        { char: V  [ parse-string ] }
+        { char: Y  [ parse-currency ] }
+        { char: @  [ parse-timestamp ] }
+        ! { char: +  [ parse-autoincrement ] }
+        ! { char: M  [ parse-memo ] }
+        ! { char: T  [ parse-datetime ] }
+        ! { char: B  [ parse-double? ] } ! (only on dbversion in [0x30, 0x31, 0x32])
+        ! { char: G  [ parse-general ] }
+        ! { char: P  [ parse-picture ] }
+        ! { char: Q  [ parse-varbinary ] }
         [ unsupported-field-type ]
     } case ;
 
diff --git a/extra/images/png/png.factor b/extra/images/png/png.factor
index 017705e666..174d27cf46 100644
--- a/extra/images/png/png.factor
+++ b/extra/images/png/png.factor
@@ -6,7 +6,7 @@ images.loader io io.binary io.encodings.ascii
 io.encodings.binary io.encodings.latin1 io.encodings.string
 io.streams.byte-array io.streams.throwing kernel locals math
 math.bitwise math.functions sequences sorting ;
-QUALIFIED: bitstreams
+QUALIFIED-WITH: bitstreams bs
 IN: images.png
 
 SINGLETON: png-image
diff --git a/extra/minesweeper/minesweeper.factor b/extra/minesweeper/minesweeper.factor
index 930d616d1d..39acfe46df 100644
--- a/extra/minesweeper/minesweeper.factor
+++ b/extra/minesweeper/minesweeper.factor
@@ -191,7 +191,7 @@ M: grid-gadget pref-dim*
         h 58 >= [
             h 58 - w [ 32 /i ] bi@ :> ( row col )
             gadget cells>> row col cell-at [
-                mined?>> COLOR: black COLOR: white ? gl-color
+                mined?>> color: black color: white ? gl-color
                 { 0 0 } { 1 1 } gl-fill-rect
             ] when*
         ] when