From d1e0aa6e806e730d1972274e262a2f5b8ddd3563 Mon Sep 17 00:00:00 2001
From: Chris Double <chris@bethia.(none)>
Date: Sat, 22 Mar 2008 00:58:53 +1300
Subject: [PATCH] Get peg subvocabs working again

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

diff --git a/extra/peg/ebnf/ebnf-tests.factor b/extra/peg/ebnf/ebnf-tests.factor
index 54639431a4..c9b9f5d977 100644
--- a/extra/peg/ebnf/ebnf-tests.factor
+++ b/extra/peg/ebnf/ebnf-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 !
-USING: kernel tools.test peg peg.ebnf ;
+USING: kernel tools.test peg peg.ebnf words ;
 IN: peg.ebnf.tests
 
 { T{ ebnf-non-terminal f "abc" } } [
diff --git a/extra/peg/ebnf/ebnf.factor b/extra/peg/ebnf/ebnf.factor
index ab7baa547e..db478e571f 100644
--- a/extra/peg/ebnf/ebnf.factor
+++ b/extra/peg/ebnf/ebnf.factor
@@ -278,7 +278,7 @@ M: ebnf-non-terminal (transform) ( ast -- parser )
 
 : ebnf>quot ( string -- hashtable quot )
   'ebnf' parse check-parse-result 
-  parse-result-ast transform dup main swap at compile ;
+  parse-result-ast transform dup main swap at compile 1quotation ;
 
 : [EBNF "EBNF]" parse-multiline-string ebnf>quot nip parsed ; parsing
 
diff --git a/extra/peg/peg.factor b/extra/peg/peg.factor
index 9d6b18398e..47dc0a3454 100755
--- a/extra/peg/peg.factor
+++ b/extra/peg/peg.factor
@@ -3,7 +3,7 @@
 USING: kernel sequences strings namespaces math assocs shuffle 
        vectors arrays combinators.lib math.parser match
        unicode.categories sequences.lib compiler.units parser
-       words ;
+       words quotations ;
 IN: peg
 
 TUPLE: parse-result remaining ast ;
@@ -42,7 +42,7 @@ GENERIC: (compile) ( parser -- quot )
   ] with-variable ;
 
 : parse ( state parser -- result )
-  compile call ;
+  compile execute ;
 
 <PRIVATE
 
@@ -260,7 +260,7 @@ TUPLE: delay-parser quot ;
 
 M: delay-parser (compile) ( parser -- quot )
   [
-    delay-parser-quot % \ (compile) , \ call ,
+    delay-parser-quot % \ compile , \ execute ,
   ] [ ] make ;
 
 PRIVATE>
@@ -334,7 +334,7 @@ PRIVATE>
 : PEG:
   (:) [
     [
-        call compile
+        call compile 1quotation
         [ dup [ parse-result-ast ] [ "Parse failed" throw ] if ]
         append define
     ] with-compilation-unit