Merge branch 'master' of git://factorcode.org/git/factor

basis/mime-types/mime-types-docs.factor

@@ -11,7 +11,7 @@ HELP: mime-db
 
 HELP: mime-type
 { $values
-    { "path" "a pathname string" }
+    { "filename" "a filename" }
     { "mime-type" "a MIME type string" } }
 { $description "Outputs the MIME type associtated with a path by parsing the path's file extension and looking it up in the table returned by " { $link mime-types } "." } ;
 

unfinished/regexp2/backend/backend.factor

@@ -21,7 +21,6 @@ TUPLE: regexp
     0 >>state
     V{ } clone >>stack
     V{ } clone >>new-states
-    H{ } clone >>options
     H{ } clone >>visited-states ;
 
 SYMBOL: current-regexp

unfinished/regexp2/dfa/dfa.factor

@@ -15,7 +15,7 @@ IN: regexp2.dfa
     eps swap find-delta ;
 
 : find-epsilon-closure ( states regexp -- new-states )
-    '[ dup , (find-epsilon-closure) union ] [ length ] while-changes
+    '[ dup _ (find-epsilon-closure) union ] [ length ] while-changes
     natural-sort ;
 
 : find-closure ( states transition regexp -- new-states )

unfinished/regexp2/parser/parser.factor

@@ -291,6 +291,8 @@ ERROR: bad-escaped-literals seq ;
         { CHAR: f [ HEX: c <constant> ] }
         { CHAR: a [ HEX: 7 <constant> ] }
         { CHAR: e [ HEX: 1b <constant> ] }
+        { CHAR: $ [ CHAR: $ <constant> ] }
+        { CHAR: ^ [ CHAR: ^ <constant> ] }
 
         { CHAR: d [ digit-class ] }
         { CHAR: D [ digit-class <negation> ] }

unfinished/regexp2/regexp2-tests.factor

@@ -222,6 +222,8 @@ IN: regexp2-tests
     <regexp> drop
 ] unit-test
 
+[ ] [ "(\\$[\\p{XDigit}]|[\\p{Digit}])" <regexp> drop ] unit-test
+
 ! Comment
 [ t ] [ "ac" "a(?#boo)c" <regexp> matches? ] unit-test
 

unfinished/regexp2/regexp2.factor

@@ -3,7 +3,8 @@
 USING: accessors combinators kernel math math.ranges
 sequences regexp2.backend regexp2.utils memoize sets
 regexp2.parser regexp2.nfa regexp2.dfa regexp2.traversal
-regexp2.transition-tables ;
+regexp2.transition-tables assocs prettyprint.backend
+make ;
 IN: regexp2
 
 : default-regexp ( string -- regexp )
@@ -14,6 +15,7 @@ IN: regexp2
         <transition-table> >>minimized-table
         H{ } clone >>nfa-traversal-flags
         H{ } clone >>dfa-traversal-flags
+        H{ } clone >>options
         reset-regexp ;
 
 : construct-regexp ( regexp -- regexp' )
@@ -60,3 +62,30 @@ IN: regexp2
 : R` CHAR: ` <regexp> ; parsing
 : R{ CHAR: } <regexp> ; parsing
 : R| CHAR: | <regexp> ; parsing
+
+: find-regexp-syntax ( string -- prefix suffix )
+    {
+        { "R/ "  "/"  }
+        { "R! "  "!"  }
+        { "R\" " "\"" }
+        { "R# "  "#"  }
+        { "R' "  "'"  }
+        { "R( "  ")"  }
+        { "R@ "  "@"  }
+        { "R[ "  "]"  }
+        { "R` "  "`"  }
+        { "R{ "  "}"  }
+        { "R| "  "|"  }
+    } swap [ subseq? not nip ] curry assoc-find drop ;
+
+: option? ( option regexp -- ? )
+    options>> key? ;
+
+M: regexp pprint*
+    [
+        [
+            dup raw>>
+            dup find-regexp-syntax swap % swap % %
+            case-insensitive swap option? [ "i" % ] when
+        ] "" make
+    ] keep present-text ;

unfinished/regexp2/traversal/traversal.factor

@@ -45,7 +45,9 @@ TUPLE: dfa-traverser
     ] when text-finished? ;
 
 : increment-state ( dfa-traverser state -- dfa-traverser )
-    >r [ 1+ ] change-current-index dup current-state>> >>last-state r>
+    [
+        [ 1+ ] change-current-index dup current-state>> >>last-state
+    ] dip
     first >>current-state ;
 
 : match-failed ( dfa-traverser -- dfa-traverser )

unfinished/regexp2/utils/utils.factor

@@ -9,7 +9,7 @@ IN: regexp2.utils
 : (while-changes) ( obj quot pred pred-ret -- obj )
     ! quot: ( obj -- obj' )
     ! pred: ( obj -- <=> )
-    >r >r dup slip r> pick over call r> dupd =
+    [ [ dup slip ] dip pick over call ] dip dupd =
     [ 3drop ] [ (while-changes) ] if ; inline recursive
 
 : while-changes ( obj quot pred -- obj' )