factor: trim using lists

[factor.git] / extra / brainfuck / brainfuck.factor

diff --git a/extra/brainfuck/brainfuck.factor b/extra/brainfuck/brainfuck.factor
index ab1c83cbcde1f9d57b24b4c913f963d4e70fdb15..045cf03c1269e0a1546c7b8ce0c9c2616d988b98 100644 (file)
--- a/extra/brainfuck/brainfuck.factor
+++ b/extra/brainfuck/brainfuck.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2009 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors assocs command-line fry io io.encodings.binary
+USING: accessors assocs command-line io io.encodings.binary
 io.files io.streams.string kernel macros math namespaces
-peg.ebnf prettyprint sequences ;
+peg.ebnf prettyprint sequences multiline ;
 
 IN: brainfuck
 
@@ -26,9 +26,6 @@ TUPLE: brainfuck pointer memory ;
 : (-) ( brainfuck n -- brainfuck )
     [ get-memory ] dip - 255 bitand set-memory ;
 
-: (?) ( brainfuck -- brainfuck t/f )
-    get-memory zero? not ;
-
 : (.) ( brainfuck -- brainfuck )
     get-memory write1 ;
 
@@ -49,7 +46,7 @@ TUPLE: brainfuck pointer memory ;
 : compose-all ( seq -- quot )
     [ ] [ compose ] reduce ;
 
-EBNF: parse-brainfuck
+EBNF: parse-brainfuck [=[
 
 inc-ptr  = (">")+  => [[ length '[ _ (>) ] ]]
 dec-ptr  = ("<")+  => [[ length '[ _ (<) ] ]]
@@ -58,19 +55,19 @@ dec-mem  = ("-")+  => [[ length '[ _ (-) ] ]]
 output   = "."  => [[ [ (.) ] ]]
 input    = ","  => [[ [ (,) ] ]]
 debug    = "#"  => [[ [ (#) ] ]]
-space    = (" "|"\t"|"\r\n"|"\n")+ => [[ [ ] ]]
+space    = [ \t\n\r]+ => [[ [ ] ]]
 unknown  = (.)  => [[ "Invalid input" throw ]]
 
 ops   = inc-ptr|dec-ptr|inc-mem|dec-mem|output|input|debug|space
-loop  = "[" {loop|ops}+ "]" => [[ second compose-all '[ [ (?) ] _ while ] ]]
+loop  = "[" {loop|ops}+ "]" => [[ second compose-all '[ [ get-memory zero? ] _ until ] ]]
 
 code  = (loop|ops|unknown)*  => [[ compose-all ]]
 
-;EBNF
+]=]
 
 PRIVATE>
 
-MACRO: run-brainfuck ( code -- )
+MACRO: run-brainfuck ( code -- quot )
     parse-brainfuck '[ <brainfuck> @ drop flush ] ;
 
 : get-brainfuck ( code -- result )
@@ -85,7 +82,7 @@ PRIVATE>
 
 : brainfuck-main ( -- )
     command-line get [
-        contents (run-brainfuck)
+        read-contents (run-brainfuck)
     ] [
         [ binary file-contents (run-brainfuck) ] each
     ] if-empty ;