From 3f68fb46189abba9f28f4fba393d52e230b30f2b Mon Sep 17 00:00:00 2001
From: Chris Double <chris@bethia.(none)>
Date: Tue, 15 Jul 2008 15:42:13 +1200
Subject: [PATCH] Fix regression where multiply defined ebnf rules didn't
 result in an error

---
 extra/peg/ebnf/ebnf-tests.factor | 4 ++--
 extra/peg/ebnf/ebnf.factor       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extra/peg/ebnf/ebnf-tests.factor b/extra/peg/ebnf/ebnf-tests.factor
index 7f14293a15..45e1e9b218 100644
--- a/extra/peg/ebnf/ebnf-tests.factor
+++ b/extra/peg/ebnf/ebnf-tests.factor
@@ -449,7 +449,7 @@ foo=<foreign any-char> 'd'
 ] unit-test
 
 [
-  "USING: peg.ebnf ; \"ab\" [EBNF foo='a' foo='b' EBNF]" eval drop
+  "USING: peg.ebnf ; <EBNF foo='a' foo='b' EBNF>" eval drop
 ] must-fail
 
 { t } [
@@ -519,4 +519,4 @@ Tok                = Spaces (Number | Special )
 
 { "\\" } [
   "\\" [EBNF foo="\\" EBNF]
-] unit-test
\ No newline at end of file
+] unit-test
diff --git a/extra/peg/ebnf/ebnf.factor b/extra/peg/ebnf/ebnf.factor
index 2a75fcccc0..cc94a215e6 100644
--- a/extra/peg/ebnf/ebnf.factor
+++ b/extra/peg/ebnf/ebnf.factor
@@ -371,7 +371,7 @@ M: ebnf-tokenizer (transform) ( ast -- parser )
 M: ebnf-rule (transform) ( ast -- parser )
   dup elements>> 
   (transform) [
-    swap symbol>> dup get { [ tuple? ] [ delegate parser? ] } 1&& [ 
+    swap symbol>> dup get parser? [ 
       "Rule '" over append "' defined more than once" append throw 
     ] [ 
       set