From 7f4fe7669861497137569e36130854dc77b5b872 Mon Sep 17 00:00:00 2001
From: Chris Double <chris@bethia.(none)>
Date: Fri, 4 Jul 2008 15:55:23 +1200
Subject: [PATCH] More peg test fixes

---
 extra/peg/expr/expr-tests.factor | 10 +++++-----
 extra/peg/expr/expr.factor       |  4 ----
 extra/peg/pl0/pl0-tests.factor   |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/extra/peg/expr/expr-tests.factor b/extra/peg/expr/expr-tests.factor
index b6f3163bf4..59c70cd358 100644
--- a/extra/peg/expr/expr-tests.factor
+++ b/extra/peg/expr/expr-tests.factor
@@ -5,21 +5,21 @@ USING: kernel tools.test peg peg.expr multiline sequences ;
 IN: peg.expr.tests
 
 { 5 } [
-  "2+3" eval-expr 
+  "2+3" expr 
 ] unit-test
 
 { 6 } [
-  "2*3" eval-expr 
+  "2*3" expr 
 ] unit-test
 
 { 14 } [
-  "2+3*4" eval-expr 
+  "2+3*4" expr 
 ] unit-test
 
 { 17 } [
-  "2+3*4+3" eval-expr 
+  "2+3*4+3" expr 
 ] unit-test
 
 { 23 } [
-  "2+3*(4+3)" eval-expr 
+  "2+3*(4+3)" expr 
 ] unit-test
diff --git a/extra/peg/expr/expr.factor b/extra/peg/expr/expr.factor
index e2df60ea9a..8b10b4fc0c 100644
--- a/extra/peg/expr/expr.factor
+++ b/extra/peg/expr/expr.factor
@@ -18,7 +18,3 @@ exp      =   exp "+" fac    => [[ first3 nip + ]]
            | exp "-" fac    => [[ first3 nip - ]]
            | fac
 ;EBNF
-
-: eval-expr ( string -- number )
-  expr ast>> ;
-
diff --git a/extra/peg/pl0/pl0-tests.factor b/extra/peg/pl0/pl0-tests.factor
index 4ba550a26c..e84d37e5d4 100644
--- a/extra/peg/pl0/pl0-tests.factor
+++ b/extra/peg/pl0/pl0-tests.factor
@@ -58,7 +58,7 @@ BEGIN
       x := x + 1;
    END
 END.
-"> pl0 remaining>> empty?
+"> main \ pl0 rule (parse) remaining>> empty?
 ] unit-test
 
 { f } [
@@ -124,5 +124,5 @@ BEGIN
   y := 36;
   CALL gcd;
 END.
-  "> pl0 remaining>> empty?
+  "> main \ pl0 rule (parse) remaining>> empty?
 ] unit-test
\ No newline at end of file