steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parser-combinators: Fix <:&> and add <&:>

chris.double 2006-08-07 04:35:48 +00:00
parent b68fb8f9c1
commit 855b7009c8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/parser-combinators/parser-combinators.factor
View File

@ -20,7 +20,7 @@
! WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ! WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
USING: lazy-lists kernel sequences strings math io arrays errors ; USING: lazy-lists kernel sequences strings math io arrays errors namespaces ;
IN: parser-combinators IN: parser-combinators
TUPLE: parse-result parsed unparsed ; TUPLE: parse-result parsed unparsed ;
@ -232,17 +232,25 @@ TUPLE: parse-result parsed unparsed ;
: <:&>-parser ( input parser1 parser2 -- result ) : <:&>-parser ( input parser1 parser2 -- result )
#! Same as <&> except flatten the result. #! Same as <&> except flatten the result.
<&> [ flatten ] <@ call ; <&> [ dup second swap first [ % , ] { } make ] <@ call ;
: <:&> ( parser1 parser2 -- parser ) : <:&> ( parser1 parser2 -- parser )
#! Same as <&> except flatten the result. #! Same as <&> except flatten the result.
[ <:&>-parser ] curry curry ; [ <:&>-parser ] curry curry ;
: <&:>-parser ( input parser1 parser2 -- result )
#! Same as <&> except flatten the result.
<&> [ dup second swap first [ , % ] { } make ] <@ call ;
: <&:> ( parser1 parser2 -- parser )
#! Same as <&> except flatten the result.
[ <&:>-parser ] curry curry ;
DEFER: <*> DEFER: <*>
: (<*>) ( parser -- parser ) : (<*>) ( parser -- parser )
#! Non-delayed implementation of <*> #! Non-delayed implementation of <*>
dup <*> <:&> [ ] succeed <|> ; dup <*> <&:> [ ] succeed <|> ;
: <*> ( parser -- parser ) : <*> ( parser -- parser )
#! Return a parser that accepts zero or more occurences of the original #! Return a parser that accepts zero or more occurences of the original
@ -251,7 +259,7 @@ DEFER: <*>
: (<+>) ( parser -- parser ) : (<+>) ( parser -- parser )
#! Non-delayed implementation of <+> #! Non-delayed implementation of <+>
dup <*> <:&> ; dup <*> <&:> ;
: <+> ( parser -- parser ) : <+> ( parser -- parser )
#! Return a parser that accepts one or more occurences of the original #! Return a parser that accepts one or more occurences of the original