diff --git a/basis/regexp/classes/classes.factor b/basis/regexp/classes/classes.factor index ab4a102eae..9030f02442 100644 --- a/basis/regexp/classes/classes.factor +++ b/basis/regexp/classes/classes.factor @@ -34,54 +34,54 @@ C: script-class GENERIC: class-member? ( obj class -- ? ) -M: t class-member? ( obj class -- ? ) 2drop t ; +M: t class-member? ( obj class -- ? ) 2drop t ; inline -M: integer class-member? ( obj class -- ? ) = ; +M: integer class-member? ( obj class -- ? ) = ; inline M: range-class class-member? ( obj class -- ? ) - [ from>> ] [ to>> ] bi between? ; + [ from>> ] [ to>> ] bi between? ; inline M: letter-class class-member? ( obj class -- ? ) - drop letter? ; - + drop letter? ; inline + M: LETTER-class class-member? ( obj class -- ? ) - drop LETTER? ; + drop LETTER? ; inline M: Letter-class class-member? ( obj class -- ? ) - drop Letter? ; + drop Letter? ; inline M: ascii-class class-member? ( obj class -- ? ) - drop ascii? ; + drop ascii? ; inline M: digit-class class-member? ( obj class -- ? ) - drop digit? ; + drop digit? ; inline : c-identifier-char? ( ch -- ? ) { [ alpha? ] [ CHAR: _ = ] } 1|| ; M: c-identifier-class class-member? ( obj class -- ? ) - drop c-identifier-char? ; + drop c-identifier-char? ; inline M: alpha-class class-member? ( obj class -- ? ) - drop alpha? ; + drop alpha? ; inline : punct? ( ch -- ? ) "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" member? ; M: punctuation-class class-member? ( obj class -- ? ) - drop punct? ; + drop punct? ; inline : java-printable? ( ch -- ? ) { [ alpha? ] [ punct? ] } 1|| ; M: java-printable-class class-member? ( obj class -- ? ) - drop java-printable? ; + drop java-printable? ; inline M: non-newline-blank-class class-member? ( obj class -- ? ) - drop { [ blank? ] [ CHAR: \n = not ] } 1&& ; + drop { [ blank? ] [ CHAR: \n = not ] } 1&& ; inline M: control-character-class class-member? ( obj class -- ? ) - drop control? ; + drop control? ; inline : hex-digit? ( ch -- ? ) { @@ -91,7 +91,7 @@ M: control-character-class class-member? ( obj class -- ? ) } 1|| ; M: hex-digit-class class-member? ( obj class -- ? ) - drop hex-digit? ; + drop hex-digit? ; inline : java-blank? ( ch -- ? ) { @@ -100,27 +100,27 @@ M: hex-digit-class class-member? ( obj class -- ? ) } member? ; M: java-blank-class class-member? ( obj class -- ? ) - drop java-blank? ; + drop java-blank? ; inline M: unmatchable-class class-member? ( obj class -- ? ) - 2drop f ; + 2drop f ; inline M: terminator-class class-member? ( obj class -- ? ) - drop "\r\n\u000085\u002029\u002028" member? ; + drop "\r\n\u000085\u002029\u002028" member? ; inline -M: f class-member? 2drop f ; +M: f class-member? 2drop f ; inline : same? ( obj1 obj2 quot1: ( obj1 -- val1 ) quot2: ( obj2 -- val2 ) -- ? ) bi* = ; inline M: script-class class-member? - [ script-of ] [ script>> ] same? ; + [ script-of ] [ script>> ] same? ; inline M: category-class class-member? - [ category ] [ category>> ] same? ; + [ category ] [ category>> ] same? ; inline -M: category-range-class class-member? - [ category first ] [ category>> ] same? ; +M: category-range-class class-member? inline + [ category first ] [ category>> ] same? ; inline TUPLE: not-class class ; @@ -131,17 +131,17 @@ UNION: simple-class PREDICATE: not-simple < not-class class>> simple-class? ; M: not-class class-member? - class>> class-member? not ; + class>> class-member? not ; inline TUPLE: or-class seq ; M: or-class class-member? - seq>> [ class-member? ] with any? ; + seq>> [ class-member? ] with any? ; inline TUPLE: and-class seq ; M: and-class class-member? - seq>> [ class-member? ] with all? ; + seq>> [ class-member? ] with all? ; inline DEFER: substitute @@ -273,7 +273,7 @@ M: f drop t ; 2array [ ] [ ] bi ; M: primitive-class class-member? - class>> class-member? ; + class>> class-member? ; inline TUPLE: condition question yes no ; C: condition