Eliminate UPARSE?/PARSE?/PARSE2?, update tests

This is a very large change which embraces the new DID and DIDN'T
concept, as opposed to needing to make LOGIC!-bearing variations
of functions that return [<opt> any-value!] where you might want
to test the NULL case as soft-failure.

But intead of rotely converting the tests based on UPARSE? to just
check DID UPARSE?, this painstakingly codified what the actual
successful return result was.  It was done by hand as an audit of
any unusual results, which triggered some modifications.  While
painful to go through the 1,000 or so cases, it should provide
more test coverage.

extensions/console/ext-console-init.reb

@@ -528,7 +528,7 @@ ext-console-impl: func [
     let directives: collect [
         let i
         if block? prior [
-            parse prior [some [set i: issue! (keep i)] end]
+            parse3 prior [some [set i: issue! (keep i)] end]
         ]
     ]
 

extensions/filesystem/ext-filesystem-init.reb

@@ -13,7 +13,7 @@ sys.make-scheme [
     info: system.standard.file-info ; for C enums
     init: func [return: <none> port <local> path] [
         if url? port.spec.ref [
-            parse port.spec.ref [thru #":" 0 2 slash path:]
+            parse3 port.spec.ref [thru #":" 0 2 slash path:]
             append port.spec compose [path: (to file! path)]
         ]
     ]

extensions/javascript/tools/prep-libr3-js.reb

@@ -286,7 +286,7 @@ to-js-type: func [
         ; The differences between undefined and null are subtle and easy to
         ; get wrong, but a void-returning function should map to undefined.
         ;
-        parse2? s ["void" opt some space] ["undefined"]
+        did parse2 s ["void" opt some space] ["undefined"]
     ]
 ]
 
@@ -364,7 +364,7 @@ for-each-api [
     ]
 
     no-reb-name: _
-    if not parse2? name ["reb" copy no-reb-name to end] [
+    if didn't parse2 name ["reb" copy no-reb-name to end] [
         fail ["API name must start with `reb`" name]
     ]
 

extensions/locale/iso3166.r

@@ -34,7 +34,7 @@ capitalize: func [
 ]
 
 iso-3166-table: make map! 512
-parse cnt [
+parse3 cnt [
     some [
         copy name to ";"
         ";" copy code-2 to "^/" (
@@ -51,7 +51,7 @@ parse cnt [
 init-code: to text! read init
 space: charset " ^-^M^/"
 iso-3166-table-count: find mold iso-3166-table #"["
-parse init-code [
+parse3 init-code [
     thru "iso-3166-table:"
     to #"["
     change [

extensions/locale/iso639.r

@@ -12,7 +12,7 @@ iso-639-table: make map! 1024
 lower: charset [#"a" - #"z"]
 letter: charset [#"a" - #"z" #"A" - #"Z"]
 
-parse cnt [
+parse3 cnt [
     some [
         ;initialization
         (code-2: name: _)
@@ -54,7 +54,7 @@ parse cnt [
 init-code: to text! read init
 space: charset " ^-^M^/"
 iso-639-table-count: find mold iso-639-table #"["
-parse init-code [
+parse3 init-code [
     thru "iso-639-table:"
     to #"["
     change [

extensions/tcc/ext-tcc-init.reb

@@ -604,7 +604,7 @@ c99: func [
             ]
             'OBJ [
                 if infile != <multi> [
-                    parse copy infile [to [".c" end] change ".c" ".o"] else [
+                    parse3 copy infile [to [".c" end] change ".c" ".o"] else [
                         fail "Input file must end in `.c` for use with -c"
                     ]
                 ]

extensions/uuid/make-libuuid.reb

@@ -53,7 +53,7 @@ fix-randutils.c: func [
         {"c.h"}
     ]
 
-    parse text [
+    parse3 text [
         add-config.h
         insert {^/#include <errno.h>^/}
 
@@ -96,7 +96,7 @@ fix-gen_uuid.c: function [
         | {"sha1.h"}
     ]
 
-    parse text [
+    parse3 text [
         add-config.h
 
         opt some [

scripts/changes-file/changes-file.reb

@@ -110,7 +110,7 @@ parse-credits-for-authors: function [  ; used as switch in github-user-name
     collect [
         keep [{Carl Sassenrath} [{@carls}]]
 
-        parse to-text read credits-file [
+        parse3 to-text read credits-file [
             thru {Code Contributors}
             opt some [
                 {**} copy author: to {**} {**} newline
@@ -145,7 +145,7 @@ notable?: function [
 
     ; Let's try and categorize type of commit (default is 'Changed)
     category: 'Changed
-    parse text: c.summary [[
+    parse3 text: c.summary [[
         opt "* "
           ["Add" | "-add"]           (category: 'Added)
         | ["Fix" | "Patch" | "-fix"] (category: 'Fixed)
@@ -157,7 +157,7 @@ notable?: function [
 
     ; record any bug#NNNN or CC (CureCode) found
     cc: make block! 0
-    parse text [
+    parse3 text [
         opt some [
               "bug#" copy cc-num: some numbers (
                 append c [type: 'Fixed]  ; it's a bug fix!

scripts/encap.reb

@@ -238,7 +238,7 @@ elf-format: context [
         string-section [binary!]
     ][
         let index: 0
-        parse section-headers [
+        parse3 section-headers [
             repeat (e_shnum) [
                 (mode: 'read) section-header-rule
                 (
@@ -266,7 +266,7 @@ elf-format: context [
     ][
         assert [e_phoff < offset]  ; program headers are before any changes
 
-        parse skip executable e_phoff [
+        parse3 skip executable e_phoff [
             repeat (e_phnum) [
                 (mode: 'read) let pos: <here>, program-header-rule
                 (if p_offset >= offset [p_offset: p_offset + delta])
@@ -280,7 +280,7 @@ elf-format: context [
         assert [e_shoff >= offset]  ; section headers are after any changes
 
         let pos
-        parse skip executable e_shoff [
+        parse3 skip executable e_shoff [
             repeat (e_shnum) [
                 (mode: 'read) let pos: <here>, section-header-rule
                 (if sh_offset >= offset [sh_offset: sh_offset + delta])
@@ -323,7 +323,7 @@ elf-format: context [
         ;
         let string-header-offset: e_shoff + (e_shstrndx * e_shentsize)
 
-        parse skip executable string-header-offset [
+        parse3 skip executable string-header-offset [
             (mode: 'read) section-header-rule to <end>
         ] else [
             fail "Error finding string section in ELF binary"
@@ -362,7 +362,7 @@ elf-format: context [
 
             ; Update the size of the embedded section in it's section header
             ;
-            parse skip executable e_shoff + (section-index * e_shentsize) [
+            parse3 skip executable e_shoff + (section-index * e_shentsize) [
                 (sh_size: new-size)
                 (mode: 'write) section-header-rule
                 <end>
@@ -407,7 +407,7 @@ elf-format: context [
 
             ; Update string table size in its corresponding header.
             ;
-            parse skip executable string-header-offset [
+            parse3 skip executable string-header-offset [
                 (mode: 'read) let pos: <here>, section-header-rule
                 (
                     assert [sh_offset = string-section-offset]
@@ -431,7 +431,7 @@ elf-format: context [
             ; miscellaneous program-specific purposes, and hence not touched
             ; by strip...it is also not mapped into memory.
             ;
-            parse new-section-header [
+            parse3 new-section-header [
                 (
                     sh_name: string-section-size  ; w.r.t string-section-offset
                     sh_type: 7  ; SHT_NOTE
@@ -481,7 +481,7 @@ elf-format: context [
             ; (main header write is done after the branch.)
         ]
 
-        parse executable [
+        parse3 executable [
             (mode: 'write) header-rule to <end>
         ] else [
             fail "Error updating the ELF header"
@@ -494,7 +494,7 @@ elf-format: context [
     ][
         let header-data: read/part file 64  ; 64-bit size, 32-bit is smaller
 
-        parse header-data [(mode: 'read) header-rule to <end>] else [
+        parse3 header-data [(mode: 'read) header-rule to <end>] else [
             return null
         ]
 
@@ -504,7 +504,7 @@ elf-format: context [
         ; The string names of the sections are themselves stored in a section,
         ; (at index `e_shstrndx`)
         ;
-        parse skip section-headers-data (e_shstrndx * e_shentsize) [
+        parse3 skip section-headers-data (e_shstrndx * e_shentsize) [
             (mode: 'read) section-header-rule to <end>
         ] else [
             fail "Error finding string section in ELF binary"
@@ -614,7 +614,7 @@ pe-format: context [
             | skip
         ]
 
-        parse rule [opt some block-rule] else [fail]
+        parse3 rule [opt some block-rule] else [fail]
 
         set name make object! append def [~unset~]
         return bind rule get name
@@ -820,7 +820,7 @@ pe-format: context [
         exe-data [binary!]
     ][
         reset
-        parse exe-data exe-rule
+        parse3 exe-data exe-rule
         if err = 'missing-dos-signature [
             return false  ; soft failure (just wasn't an EXE, no "MZ")
         ]
@@ -1274,7 +1274,7 @@ encap: func [
     print ["Compressed resource is" length of compressed "bytes long."]
 
     case [
-        parse? executable [
+        parse3 executable [
             (elf-format.mode: 'read) elf-format.header-rule to <end>
         ][
             print "ELF format found"

scripts/prot-http.r

@@ -39,7 +39,7 @@ REBOL [
 digit: charset [#"0" - #"9"]
 alpha: charset [#"a" - #"z" #"A" - #"Z"]
 idate-to-date: function [return: [date!] date [text!]] [
-    parse date [
+    parse3 date [
         5 skip
         copy day: 2 digit
         space
@@ -165,7 +165,7 @@ parse-write-dialect: function [
     block [block!]
 ][
     spec: port.spec
-    parse block [
+    parse3 block [
         opt ['headers (spec.debug: true)]
         opt ['no-redirect (spec.follow: 'ok)]
         [set temp: word! (spec.method: temp) | (spec.method: 'post)]
@@ -468,7 +468,7 @@ read-body: function [
                 ; even have enough input data for the chunk *size*, much less
                 ; the chunk.  READ until we have at least a chunk size.
                 ;
-                loop [not parse? conn.data [
+                loop [didn't parse3 conn.data [
                     copy chunk-size: some hex-digits, thru crlfbin
                     mk1: <here>, to <end>
                 ]][
@@ -494,7 +494,7 @@ read-body: function [
                 ; Now we have the chunk size but may not have the chunk data.
                 ; Loop until enough data is gathered.
                 ;
-                loop [not parse? mk1 [
+                loop [didn't parse3 mk1 [
                     repeat (chunk-size) skip, mk2: <here>, crlfbin, to <end>
                 ]][
                     read conn
@@ -515,7 +515,7 @@ read-body: function [
             ;
             ; https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Trailer
             ;
-            parse mk1 [
+            parse3 mk1 [
                 crlfbin (trailer: "") to <end>
                     |
                 copy trailer to crlf2bin to <end>

scripts/prot-tls.r

@@ -470,7 +470,7 @@ client-hello: func [
             [version version]
         ]
         block? version [
-            parse version [decimal! decimal!] else [
+            parse3 version [decimal! decimal!] else [
                 fail "BLOCK! /VERSION must be two DECIMAL! (min ver, max ver)"
             ]
             version
@@ -1626,7 +1626,7 @@ do-commands: func [
 
     let cmd
     let arg
-    parse commands [
+    parse3 commands [
         some [
             ; redundant `set cmd`, consider how ELIDE might improve it
             ; https://forum.rebol.info/t/1534/5

scripts/redbol.reb

@@ -719,7 +719,7 @@ parse: emulate [
             blank! [split input charset reduce [tab space CR LF]]
             text! [split input to-bitset rules]
         ] else [
-            apply :uparse2? [input rules /case case_PARSE]
+            did apply :uparse2 [input rules /case case_PARSE]
         ]
     ]
 ]

src/core/c-path.c

@@ -304,7 +304,7 @@ REB_R TO_Sequence(REBVAL *out, enum Reb_Kind kind, const REBVAL *arg) {
         //
         return rebValue(
             "as", Datatype_From_Kind(kind), "catch [",
-                "parse let v: load @", arg, "[",
+                "parse3 let v: load @", arg, "[",
                     "[any-sequence! | any-array!] end (throw first v)",
                     "| (throw v)",  // try to convert whatever other block
                 "]",

src/core/u-parse.c

@@ -549,7 +549,7 @@ static REB_R Parse_One_Rule(
             // this patch handles the explicit case of wanting to match
             // something like:
             //
-            //     >> parse? "ab" [thru ["ab"] ""]
+            //     >> did parse3 "ab" [thru ["ab"] ""]
             //     == #[true]
             //
             // Just to show what should happen in the new model (R3-Alpha did
@@ -2804,7 +2804,7 @@ REBNATIVE(parse_p)
     // native code in the future.  But this is just to get people out of the
     // habit of writing `IF PARSE ...`
     //
-    return rebValue("'~use-PARSE?-for-logic~");
+    return rebValue("~use-DID-PARSE-for-logic~");
 }
 
 

src/main/main-startup.reb

@@ -48,7 +48,7 @@ make-banner: func [
     let spc: format ["**" 70 "**"] ""
 
     let [a b s]
-    parse fmt [
+    parse3 fmt [
         some [
             [
                 set a: text! (s: format ["**  " 68 "**"] a)
@@ -491,7 +491,7 @@ main-startup: func [
 
     loop [not tail? argv] [
 
-        let is-option: parse?/case argv.1 [
+        let is-option: did parse3/case argv.1 [
 
             ["--" end] (
                 ; Double-dash means end of command line arguments, and the
@@ -679,7 +679,7 @@ main-startup: func [
         ; heuristic is to check for more than one letter.
         ;
         alphanum: charset [#"A" - #"Z" #"a" - #"z" #"0" #"9"]
-        o.script: parse o.script [alphanum some alphanum ":" to <end>] then [
+        o.script: parse3 o.script [alphanum some alphanum ":" to <end>] then [
             to url! o.script
         ]
         else [

src/mezz/base-defs.r

@@ -349,16 +349,15 @@ then?: func* [return: [logic!] ^optional [<opt> any-value!]] [
 ; UPARSE's design when it hardens.  For now these routines provide some amount
 ; of interface parity with UPARSE.
 ;
-parse: :parse*/fully  ; could be more complex definition (UPARSE is!)
-parse?: chain [:parse*/fully | :then?]
-match-parse: enclose :parse func* [f] [
-    let input: f.input
-    do f then [input]
-]
+parse3: :parse*/fully  ; could be more complex definition (UPARSE is!)
 here: <here>  ; temporary workaround for compatibility, will be removed
 
+; Eventually, PARSE will be deprecated to force everyone to use either UPARSE
+; or PARSE3.  When that is ultimately settled, UPARSE will take the PARSE name.
+;
+parse: :parse3
+
 parse2: :parse*/redbol/fully
-parse2?: chain [:parse*/redbol/fully | :then?]
 
 ; The lower-level pointfree function separates out the action it takes, but
 ; the higher level one uses a block.  Specialize out the action, and then