From 5a14faecd6f7352a5556dc3a91e368721d164b22 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 9 Mar 2009 20:13:17 -0500
Subject: [PATCH 01/10] added rendering functions

---
 basis/ui/utils/utils.factor | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 basis/ui/utils/utils.factor

diff --git a/basis/ui/utils/utils.factor b/basis/ui/utils/utils.factor
new file mode 100644
index 0000000000..468af45150
--- /dev/null
+++ b/basis/ui/utils/utils.factor
@@ -0,0 +1,6 @@
+USING: accessors sequences namespaces ui.render opengl fry ;
+IN: ui.utils
+SYMBOLS: width height ;
+: store-dim ( gadget -- ) dim>> [ first width set ] [ second height set ] bi ;
+: with-dim ( gadget quot -- ) '[ _ store-dim @ ] with-scope ;
+: with-w/h ( gadget quot -- ) '[ origin get _ with-translation ] with-dim ;
\ No newline at end of file

From 4d453923ae1f7c65d7274b8f2ea83b4f3b160497 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 9 Mar 2009 20:34:56 -0500
Subject: [PATCH 02/10] added simple dialogs for the ui

---
 basis/ui/gadgets/alerts/alerts.factor | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 basis/ui/gadgets/alerts/alerts.factor

diff --git a/basis/ui/gadgets/alerts/alerts.factor b/basis/ui/gadgets/alerts/alerts.factor
new file mode 100644
index 0000000000..3a4120b3de
--- /dev/null
+++ b/basis/ui/gadgets/alerts/alerts.factor
@@ -0,0 +1,4 @@
+USING: accessors ui ui.gadgets ui.gadgets.labels ui.gadgets.buttons ui.gadgets.packs locals sequences io.styles ;
+IN: ui.gadgets.alerts
+:: alert ( quot string -- ) <pile> { 10 10 } >>gap 1 >>align string <label> { "sans-serif" plain 18 } >>font { 200 100 } >>pref-dim add-gadget 
+   "okay" [ close-window ] quot append <bevel-button> add-gadget "" open-window ;
\ No newline at end of file

From 895b1339f8c70d157fe12f0291aa647d24d07488 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 9 Mar 2009 20:35:49 -0500
Subject: [PATCH 03/10] added buttons for book navigation

---
 basis/ui/gadgets/book-extras/book-extras.factor | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 basis/ui/gadgets/book-extras/book-extras.factor

diff --git a/basis/ui/gadgets/book-extras/book-extras.factor b/basis/ui/gadgets/book-extras/book-extras.factor
new file mode 100644
index 0000000000..31ce8831be
--- /dev/null
+++ b/basis/ui/gadgets/book-extras/book-extras.factor
@@ -0,0 +1,11 @@
+USING: accessors kernel fry math models ui.gadgets ui.gadgets.books ui.gadgets.buttons ;
+IN: ui.gadgets.book-extras
+: <book*> ( pages -- book ) 0 <model> <book> ;
+: |<< ( book -- ) 0 swap set-control-value ;
+: next ( book -- ) model>> [ 1 + ] change-model ;
+: prev ( book -- ) model>> [ 1 - ] change-model ;
+: (book-t) ( quot -- quot ) '[ : owner ( gadget -- book ) parent>> dup book? [ owner ] unless ; owner @ ] ;
+: <book-btn> ( label quot -- button ) (book-t) <button> ;
+: <book-bevel-btn> ( label quot -- button ) (book-t) <bevel-button> ;
+: >>> ( label -- button ) [ next ] <book-btn> ;
+: <<< ( label -- button ) [ prev ] <book-btn> ;
\ No newline at end of file

From d95e5155573782f76e5593ecb0829bfc63dab3c0 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 9 Mar 2009 20:36:35 -0500
Subject: [PATCH 04/10] peg can now be used for parsing words

---
 basis/peg-lexer/peg-lexer.factor | 53 ++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 basis/peg-lexer/peg-lexer.factor

diff --git a/basis/peg-lexer/peg-lexer.factor b/basis/peg-lexer/peg-lexer.factor
new file mode 100644
index 0000000000..52cc5861b6
--- /dev/null
+++ b/basis/peg-lexer/peg-lexer.factor
@@ -0,0 +1,53 @@
+USING: hashtables assocs sequences locals math accessors multiline delegate strings
+delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words ;
+IN: peg-lexer
+
+TUPLE: lex-hash hash ;
+CONSULT: assoc-protocol lex-hash hash>> ;
+: <lex-hash> ( a -- lex-hash ) lex-hash boa ;
+
+: pos-or-0 ( neg? -- pos/0 ) dup 0 < [ drop 0 ] when ;
+
+:: store-pos ( v a -- )
+   [let | n [ input a at v head-slice ] |
+      v "\n" n last-index 0 or - lexer get (>>column)
+      n [ "\n" = ] filter length 1 + lexer get (>>line) ] ;
+
+M: lex-hash set-at swap {
+   { pos [ store-pos ] }
+   [ swap hash>> set-at ] } case ;
+
+:: at-pos ( t l c -- p ) t l 1 - head-slice [ length ] map sum pos-or-0 c + ;
+
+M: lex-hash at* swap {
+      { input [ drop lexer get text>> "\n" join t ] }
+      { pos [ drop lexer get [ text>> ] [ line>> ] [ column>> ] tri at-pos t ] }
+      [ swap hash>> at* ] } case ;
+
+: with-global-lexer ( quot -- result )
+   [ f lrstack set
+        V{ } clone error-stack set H{ } clone \ heads set
+        H{ } clone \ packrat set ] f make-assoc <lex-hash>
+   swap bind ; inline
+
+! Usage:
+! ON-BNF: word expr= [1-9] ;ON-BNF
+! << name parser create-bnf >>
+
+: parse* ( parser -- ast ) compile
+   [ execute [ error-stack get first throw ] unless* ] with-global-lexer
+   ast>> ;
+
+: create-bnf ( name parser -- ) [ lexer get skip-blank parse* dup V{ } = [ parsed ] unless ] curry
+    define POSTPONE: parsing ;
+
+: ON-BNF: CREATE-WORD reset-tokenizer ";ON-BNF" parse-multiline-string parse-ebnf
+    main swap at reset-tokenizer create-bnf ; parsing
+
+! Tokenizer like standard factor lexer
+EBNF: factor
+space = " " | "\n" | "\t"
+spaces = space* => [[ drop ignore ]]
+chunk = (!(space) .)+ => [[ >string ]]
+expr = spaces chunk
+;EBNF
\ No newline at end of file

From 1235a74134ca5486de2b305904158372095cf5f6 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Mon, 9 Mar 2009 20:39:48 -0500
Subject: [PATCH 05/10] added simple tsv flashcard program

---
 extra/drills/drills.factor | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 extra/drills/drills.factor

diff --git a/extra/drills/drills.factor b/extra/drills/drills.factor
new file mode 100644
index 0000000000..ee4343b1b8
--- /dev/null
+++ b/extra/drills/drills.factor
@@ -0,0 +1,41 @@
+USING: accessors arrays cocoa.dialogs combinators continuations
+fry grouping io.encodings.utf8 io.files io.styles kernel math
+math.parser models models.filter models.history namespaces random
+sequences splitting ui ui.gadgets.alerts ui.gadgets.book-extras
+ui.gadgets.books ui.gadgets.buttons ui.gadgets.frames
+ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks ui.gestures ;
+
+IN: drills
+SYMBOLS: it startLength ;
+: big ( gadget -- gadget ) { "sans-serif" plain 30 } >>font ;
+: card ( model quot -- button ) <filter> <label-control> big [ next ] <book-btn> ;
+: op ( quot str -- gadget ) <label> big swap <book-bevel-btn> ;
+
+: show ( model -- gadget ) dup it set-global [ random ] <filter>
+   { [ [ first ] card ]
+   [ [ [ second ] [ drop [ "malformed input" throw ] "Malformed Input" alert ] recover ] card ]
+   [ '[ |<< [ it get [
+      _ value>> swap remove
+      [ [ it get go-back ] "Drill Complete" alert return ] when-empty
+   ] change-model ] with-return ] "Yes" op ]
+   [ '[ |<< it get _ model-changed ] "No" op ] } cleave
+2array { 1 0 } <track> swap [ 0.5 track-add ] each
+3array <book*> <frame> { 450 175 } >>pref-dim swap @center grid-add
+it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <filter> <label-control> @bottom grid-add ;
+
+: drill ( -- ) [ 
+   open-panel [
+      [ utf8 file-lines [ "\t" split
+         [ " " split 4 group [ " " join ] map ] map ] map ] map concat dup [ [ first ] [ second ] bi swap 2array ] map append
+         [ length startLength set-global ] keep <history> [ add-history ] [ show ] bi
+      "Got it?" open-window
+   ] when*
+] with-ui ;
+
+
+MAIN: drill
+
+    
+! FIXME: command-line opening
+! TODO: Menu bar
+! TODO: Pious hot-buttons
\ No newline at end of file

From cccaff40b1d3baf8af7a100ea65a5278a4d094b6 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 10 Mar 2009 11:27:19 -0500
Subject: [PATCH 06/10] added peg-lexer info

---
 extra/peg-lexer/authors.txt                 | 1 +
 {basis => extra}/peg-lexer/peg-lexer.factor | 0
 extra/peg-lexer/summary.txt                 | 1 +
 extra/peg-lexer/tags.txt                    | 1 +
 4 files changed, 3 insertions(+)
 create mode 100644 extra/peg-lexer/authors.txt
 rename {basis => extra}/peg-lexer/peg-lexer.factor (100%)
 create mode 100755 extra/peg-lexer/summary.txt
 create mode 100644 extra/peg-lexer/tags.txt

diff --git a/extra/peg-lexer/authors.txt b/extra/peg-lexer/authors.txt
new file mode 100644
index 0000000000..ce0899f16e
--- /dev/null
+++ b/extra/peg-lexer/authors.txt
@@ -0,0 +1 @@
+Sam Anklesaria
\ No newline at end of file
diff --git a/basis/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
similarity index 100%
rename from basis/peg-lexer/peg-lexer.factor
rename to extra/peg-lexer/peg-lexer.factor
diff --git a/extra/peg-lexer/summary.txt b/extra/peg-lexer/summary.txt
new file mode 100755
index 0000000000..2de36bada4
--- /dev/null
+++ b/extra/peg-lexer/summary.txt
@@ -0,0 +1 @@
+Use peg to write parsing words
diff --git a/extra/peg-lexer/tags.txt b/extra/peg-lexer/tags.txt
new file mode 100644
index 0000000000..47619a17f8
--- /dev/null
+++ b/extra/peg-lexer/tags.txt
@@ -0,0 +1 @@
+reflection
\ No newline at end of file

From 995d28fb2fdb74d96ea5b72b4537cf6a0a99c335 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 10 Mar 2009 16:14:39 -0500
Subject: [PATCH 07/10] debugging, documentation for peg-lexer

---
 extra/peg-lexer/peg-lexer-docs.factor | 11 +++++++++++
 extra/peg-lexer/peg-lexer.factor      |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 extra/peg-lexer/peg-lexer-docs.factor

diff --git a/extra/peg-lexer/peg-lexer-docs.factor b/extra/peg-lexer/peg-lexer-docs.factor
new file mode 100644
index 0000000000..7b45ffb87d
--- /dev/null
+++ b/extra/peg-lexer/peg-lexer-docs.factor
@@ -0,0 +1,11 @@
+USING: peg.ebnf help.syntax help.markup strings ;
+IN: peg-lexer
+ABOUT: "peg-lexer"
+
+HELP: ON-BNF:
+{ $syntax "ON-BNF: word ... ;ON-BNF" }
+{ $description "Creates a parsing word using a parser for lexer control, adding the resulting ast to the stack.  Parser syntax is as in " { $link POSTPONE: EBNF: } } ;
+
+HELP: create-bnf
+{ $values { "word" string } { "parser" parser } }
+{ $description "Runtime equivalent of ON-BNF- also useful with manually constructed parsers." } ;
\ No newline at end of file
diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
index 52cc5861b6..bc191fd878 100644
--- a/extra/peg-lexer/peg-lexer.factor
+++ b/extra/peg-lexer/peg-lexer.factor
@@ -38,11 +38,11 @@ M: lex-hash at* swap {
    [ execute [ error-stack get first throw ] unless* ] with-global-lexer
    ast>> ;
 
-: create-bnf ( name parser -- ) [ lexer get skip-blank parse* dup V{ } = [ parsed ] unless ] curry
-    define POSTPONE: parsing ;
-
+: create-bnf ( name parser -- ) reset-tokenizer [ lexer get skip-blank parse* dup V{ } = [ parsed ] unless ] curry
+    define word make-parsing ;
+    
 : ON-BNF: CREATE-WORD reset-tokenizer ";ON-BNF" parse-multiline-string parse-ebnf
-    main swap at reset-tokenizer create-bnf ; parsing
+    main swap at create-bnf ; parsing
 
 ! Tokenizer like standard factor lexer
 EBNF: factor

From 8eee229655a9a66db277faae4f740cf72b3ae493 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Tue, 10 Mar 2009 18:22:31 -0500
Subject: [PATCH 08/10] added test parsers, fixed doc links

---
 extra/peg-lexer/peg-lexer-docs.factor           |  5 ++++-
 extra/peg-lexer/peg-lexer.factor                |  6 +-----
 .../peg-lexer/test-parsers/test-parsers.factor  | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 extra/peg-lexer/test-parsers/test-parsers.factor

diff --git a/extra/peg-lexer/peg-lexer-docs.factor b/extra/peg-lexer/peg-lexer-docs.factor
index 7b45ffb87d..22e620235d 100644
--- a/extra/peg-lexer/peg-lexer-docs.factor
+++ b/extra/peg-lexer/peg-lexer-docs.factor
@@ -8,4 +8,7 @@ HELP: ON-BNF:
 
 HELP: create-bnf
 { $values { "word" string } { "parser" parser } }
-{ $description "Runtime equivalent of ON-BNF- also useful with manually constructed parsers." } ;
\ No newline at end of file
+{ $description "Runtime equivalent of " { $link POSTPONE: ON-BNF: } " also useful with manually constructed parsers." } ;
+
+HELP: factor
+{ $description "Tokenizer that acts like standard factor lexer, separating tokens by whitespace." } ;
\ No newline at end of file
diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
index bc191fd878..f4bed6c5ef 100644
--- a/extra/peg-lexer/peg-lexer.factor
+++ b/extra/peg-lexer/peg-lexer.factor
@@ -30,15 +30,11 @@ M: lex-hash at* swap {
         H{ } clone \ packrat set ] f make-assoc <lex-hash>
    swap bind ; inline
 
-! Usage:
-! ON-BNF: word expr= [1-9] ;ON-BNF
-! << name parser create-bnf >>
-
 : parse* ( parser -- ast ) compile
    [ execute [ error-stack get first throw ] unless* ] with-global-lexer
    ast>> ;
 
-: create-bnf ( name parser -- ) reset-tokenizer [ lexer get skip-blank parse* dup V{ } = [ parsed ] unless ] curry
+: create-bnf ( name parser -- ) reset-tokenizer [ lexer get skip-blank parse* parsed ] curry
     define word make-parsing ;
     
 : ON-BNF: CREATE-WORD reset-tokenizer ";ON-BNF" parse-multiline-string parse-ebnf
diff --git a/extra/peg-lexer/test-parsers/test-parsers.factor b/extra/peg-lexer/test-parsers/test-parsers.factor
new file mode 100644
index 0000000000..83c9f85933
--- /dev/null
+++ b/extra/peg-lexer/test-parsers/test-parsers.factor
@@ -0,0 +1,17 @@
+USING: peg-lexer math.parser strings ;
+IN: peg-lexer.test-parsers
+
+ON-BNF: test1
+      num = [1-4]* => [[ >string ]]
+      expr = num ( "-end" | "-done" )
+;ON-BNF
+
+ON-BNF: test2
+      num = [1-4]* => [[ >string string>number ]]
+      expr= num [5-9]
+;ON-BNF
+
+ON-BNF: test3
+      tokenizer = <foreign factor>
+      expr= "heavy" "duty" "testing"
+;ON-BNF
\ No newline at end of file

From b7284d8772720fd63f6232ef89d4f3667274736d Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Wed, 11 Mar 2009 18:36:55 -0500
Subject: [PATCH 09/10] HUGE bug fixes, unit tests added

---
 extra/peg-lexer/peg-lexer-tests.factor | 14 ++++++++++++++
 extra/peg-lexer/peg-lexer.factor       | 18 +++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 extra/peg-lexer/peg-lexer-tests.factor

diff --git a/extra/peg-lexer/peg-lexer-tests.factor b/extra/peg-lexer/peg-lexer-tests.factor
new file mode 100644
index 0000000000..99a1397273
--- /dev/null
+++ b/extra/peg-lexer/peg-lexer-tests.factor
@@ -0,0 +1,14 @@
+USING: tools.test peg-lexer.test-parsers ;
+IN: peg-lexer.tests
+
+{ V{ "1234" "-end" } } [
+   test1 1234-end
+] unit-test
+
+{ V{ 1234 53 } } [
+   test2 12345
+] unit-test
+
+{ V{ "heavy" "duty" "testing" } } [
+   test3 heavy duty testing
+] unit-test
\ No newline at end of file
diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
index f4bed6c5ef..032e542bcb 100644
--- a/extra/peg-lexer/peg-lexer.factor
+++ b/extra/peg-lexer/peg-lexer.factor
@@ -1,5 +1,6 @@
 USING: hashtables assocs sequences locals math accessors multiline delegate strings
-delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words ;
+delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words
+tools.annotations prettyprint ;
 IN: peg-lexer
 
 TUPLE: lex-hash hash ;
@@ -8,20 +9,23 @@ CONSULT: assoc-protocol lex-hash hash>> ;
 
 : pos-or-0 ( neg? -- pos/0 ) dup 0 < [ drop 0 ] when ;
 
-:: store-pos ( v a -- )
-   [let | n [ input a at v head-slice ] |
-      v "\n" n last-index 0 or - lexer get (>>column)
-      n [ "\n" = ] filter length 1 + lexer get (>>line) ] ;
+:: prepare-pos ( v i -- c l )
+ [let | n [ i v head-slice ] |
+      v CHAR: \n n last-index -1 or 1+ -
+      n [ CHAR: \n = ] count 1+ ] ;
+      
+: store-pos ( v a -- ) input swap at prepare-pos
+   lexer get [ (>>line) ] keep (>>column) ;
 
 M: lex-hash set-at swap {
    { pos [ store-pos ] }
    [ swap hash>> set-at ] } case ;
 
-:: at-pos ( t l c -- p ) t l 1 - head-slice [ length ] map sum pos-or-0 c + ;
+:: at-pos ( t l c -- p ) t l head-slice [ length ] map sum l 1- + c + ;
 
 M: lex-hash at* swap {
       { input [ drop lexer get text>> "\n" join t ] }
-      { pos [ drop lexer get [ text>> ] [ line>> ] [ column>> ] tri at-pos t ] }
+      { pos [ drop lexer get [ text>> ] [ line>> 1- ] [ column>> 1+ ] tri at-pos t ] }
       [ swap hash>> at* ] } case ;
 
 : with-global-lexer ( quot -- result )

From 6c3083a108c0db55fcd45d5742ddce14029f3b11 Mon Sep 17 00:00:00 2001
From: Sam Anklesaria <sam@Tintin.local>
Date: Wed, 11 Mar 2009 18:40:14 -0500
Subject: [PATCH 10/10] cleaned peg-lexer debugging dependencies

---
 extra/peg-lexer/peg-lexer.factor | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extra/peg-lexer/peg-lexer.factor b/extra/peg-lexer/peg-lexer.factor
index 032e542bcb..d48d67cfd4 100644
--- a/extra/peg-lexer/peg-lexer.factor
+++ b/extra/peg-lexer/peg-lexer.factor
@@ -1,6 +1,5 @@
 USING: hashtables assocs sequences locals math accessors multiline delegate strings
-delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words
-tools.annotations prettyprint ;
+delegate.protocols kernel peg peg.ebnf lexer namespaces combinators parser words ;
 IN: peg-lexer
 
 TUPLE: lex-hash hash ;