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

More peg test fixes

db4
Chris Double 2008-07-04 15:55:23 +12:00
parent f3145c5961
commit 7f4fe76698
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/peg/expr/expr-tests.factor
View File

@ -5,21 +5,21 @@ USING: kernel tools.test peg peg.expr multiline sequences ;
IN: peg.expr.tests IN: peg.expr.tests
{ 5 } [ { 5 } [
"2+3" eval-expr "2+3" expr
] unit-test ] unit-test
{ 6 } [ { 6 } [
"2*3" eval-expr "2*3" expr
] unit-test ] unit-test
{ 14 } [ { 14 } [
"2+3*4" eval-expr "2+3*4" expr
] unit-test ] unit-test
{ 17 } [ { 17 } [
"2+3*4+3" eval-expr "2+3*4+3" expr
] unit-test ] unit-test
{ 23 } [ { 23 } [
"2+3*(4+3)" eval-expr "2+3*(4+3)" expr
] unit-test ] unit-test

4
extra/peg/expr/expr.factor
View File

@ -18,7 +18,3 @@ exp = exp "+" fac => [[ first3 nip + ]]
| exp "-" fac => [[ first3 nip - ]] | exp "-" fac => [[ first3 nip - ]]
| fac | fac
;EBNF ;EBNF
: eval-expr ( string -- number )
expr ast>> ;

4
extra/peg/pl0/pl0-tests.factor
View File

@ -58,7 +58,7 @@ BEGIN
x := x + 1; x := x + 1;
END END
END. END.
"> pl0 remaining>> empty? "> main \ pl0 rule (parse) remaining>> empty?
] unit-test ] unit-test
{ f } [ { f } [
@ -124,5 +124,5 @@ BEGIN
y := 36; y := 36;
CALL gcd; CALL gcd;
END. END.
"> pl0 remaining>> empty? "> main \ pl0 rule (parse) remaining>> empty?
] unit-test ] unit-test