From b31f8a0d15775357aabbd0ce8e04dea4ad7c3810 Mon Sep 17 00:00:00 2001 From: Sam Anklesaria Date: Fri, 24 Apr 2009 23:23:02 -0500 Subject: [PATCH] peg lexer changes --- extra/peg-lexer/peg-lexer.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor index e7acf1f5bb..e58d8dd65b 100644 --- a/extra/peg-lexer/peg-lexer.factor +++ b/extra/peg-lexer/peg-lexer.factor @@ -1,5 +1,6 @@ USING: hashtables assocs sequences locals math accessors multiline delegate strings -delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words ; +delegate.protocols kernel peg peg.ebnf peg.private lexer namespaces combinators parser +words ; IN: peg-lexer TUPLE: lex-hash hash ; @@ -43,11 +44,11 @@ M: lex-hash at* : parse* ( parser -- ast ) compile - [ execute( -- result ) [ error-stack get first throw ] unless* ] with-global-lexer + [ execute [ error-stack get first throw ] unless* ] with-global-lexer ast>> ; : create-bnf ( name parser -- ) - reset-tokenizer [ lexer get skip-blank parse* parsed ] curry + reset-tokenizer [ lexer get skip-blank parse* dup ignore? [ drop ] [ parsed ] if ] curry define-syntax ; SYNTAX: ON-BNF: