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

lexer: each-token and map-tokens did not handle EOF properly

release
Slava Pestov 2010-03-26 03:42:07 -04:00
parent 63c7513e2d
commit a566d8cc6b
3 changed files with 268 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/lexer/lexer.factor
View File

@ -86,8 +86,7 @@ M: lexer skip-word ( lexer -- )
: scan ( -- str/f ) lexer get parse-token ; : scan ( -- str/f ) lexer get parse-token ;
PREDICATE: unexpected-eof < unexpected PREDICATE: unexpected-eof < unexpected got>> not ;
got>> not ;
: unexpected-eof ( word -- * ) f unexpected ; : unexpected-eof ( word -- * ) f unexpected ;
@ -97,14 +96,15 @@ PREDICATE: unexpected-eof < unexpected
[ unexpected-eof ] [ unexpected-eof ]
if* ; if* ;
: (each-token) ( end quot -- pred quot )
[ [ [ scan dup ] ] dip [ = not ] curry [ [ f ] if* ] curry compose ] dip ; inline
: each-token ( ... end quot: ( ... token -- ... ) -- ... ) : each-token ( ... end quot: ( ... token -- ... ) -- ... )
(each-token) while drop ; inline [ scan ] 2dip {
{ [ 2over = ] [ 3drop ] }
{ [ pick not ] [ drop unexpected-eof ] }
[ [ nip call ] [ each-token ] 2bi ]
} cond ; inline recursive
: map-tokens ( ... end quot: ( ... token -- ... elt ) -- ... seq ) : map-tokens ( ... end quot: ( ... token -- ... elt ) -- ... seq )
(each-token) produce nip ; inline collector [ each-token ] dip ; inline
: parse-tokens ( end -- seq ) : parse-tokens ( end -- seq )
[ ] map-tokens ; [ ] map-tokens ;
@ -112,6 +112,7 @@ PREDICATE: unexpected-eof < unexpected
TUPLE: lexer-error line column line-text parsing-words error ; TUPLE: lexer-error line column line-text parsing-words error ;
M: lexer-error error-file error>> error-file ; M: lexer-error error-file error>> error-file ;
M: lexer-error error-line [ error>> error-line ] [ line>> ] bi or ; M: lexer-error error-line [ error>> error-line ] [ line>> ] bi or ;
: <lexer-error> ( msg -- error ) : <lexer-error> ( msg -- error )

318
core/parser/parser-tests.factor
View File

@ -7,332 +7,334 @@ vocabs.parser words.symbol multiline source-files.errors
tools.crossref grouping ; tools.crossref grouping ;
IN: parser.tests IN: parser.tests
[ 1 [ 2 [ 3 ] 4 ] 5 ]
[ "1\n[\n2\n[\n3\n]\n4\n]\n5" eval( -- a b c ) ]
unit-test
[ t t f f ]
[ "t t f f" eval( -- ? ? ? ? ) ]
unit-test
[ "hello world" ]
[ "\"hello world\"" eval( -- string ) ]
unit-test
[ "\n\r\t\\" ]
[ "\"\\n\\r\\t\\\\\"" eval( -- string ) ]
unit-test
[ "hello world" ]
[ [
[ 1 [ 2 [ 3 ] 4 ] 5 ]
[ "1\n[\n2\n[\n3\n]\n4\n]\n5" eval( -- a b c ) ]
unit-test
[ t t f f ]
[ "t t f f" eval( -- ? ? ? ? ) ]
unit-test
[ "hello world" ]
[ "\"hello world\"" eval( -- string ) ]
unit-test
[ "\n\r\t\\" ]
[ "\"\\n\\r\\t\\\\\"" eval( -- string ) ]
unit-test
[ "hello world" ]
[
"IN: parser.tests : hello ( -- str ) \"hello world\" ;" "IN: parser.tests : hello ( -- str ) \"hello world\" ;"
eval( -- ) "USE: parser.tests hello" eval( -- string ) eval( -- ) "USE: parser.tests hello" eval( -- string )
] unit-test ] unit-test
[ ] [ ]
[ "! This is a comment, people." eval( -- ) ] [ "! This is a comment, people." eval( -- ) ]
unit-test unit-test
! Test escapes ! Test escapes
[ " " ] [ " " ]
[ "\"\\u000020\"" eval( -- string ) ] [ "\"\\u000020\"" eval( -- string ) ]
unit-test unit-test
[ "'" ] [ "'" ]
[ "\"\\u000027\"" eval( -- string ) ] [ "\"\\u000027\"" eval( -- string ) ]
unit-test unit-test
! Test EOL comments in multiline strings. ! Test EOL comments in multiline strings.
[ "Hello" ] [ "#! This calls until-eol.\n\"Hello\"" eval( -- string ) ] unit-test [ "Hello" ] [ "#! This calls until-eol.\n\"Hello\"" eval( -- string ) ] unit-test
[ word ] [ \ f class ] unit-test [ word ] [ \ f class ] unit-test
! Test stack effect parsing ! Test stack effect parsing
: effect-parsing-test ( a b -- c ) + ; : effect-parsing-test ( a b -- c ) + ;
[ t ] [ [ t ] [
"effect-parsing-test" "parser.tests" lookup "effect-parsing-test" "parser.tests" lookup
\ effect-parsing-test eq? \ effect-parsing-test eq?
] unit-test ] unit-test
[ T{ effect f { "a" "b" } { "c" } f } ] [ T{ effect f { "a" "b" } { "c" } f } ]
[ \ effect-parsing-test "declared-effect" word-prop ] unit-test [ \ effect-parsing-test "declared-effect" word-prop ] unit-test
: baz ( a b -- * ) 2array throw ; : baz ( a b -- * ) 2array throw ;
[ t ] [ t ]
[ \ baz "declared-effect" word-prop terminated?>> ] [ \ baz "declared-effect" word-prop terminated?>> ]
unit-test unit-test
[ ] [ "IN: parser.tests USE: math : effect-parsing-test ( a b -- d ) - ;" eval( -- ) ] unit-test [ ] [ "IN: parser.tests USE: math : effect-parsing-test ( a b -- d ) - ;" eval( -- ) ] unit-test
[ t ] [ [ t ] [
"effect-parsing-test" "parser.tests" lookup "effect-parsing-test" "parser.tests" lookup
\ effect-parsing-test eq? \ effect-parsing-test eq?
] unit-test ] unit-test
[ T{ effect f { "a" "b" } { "d" } f } ] [ T{ effect f { "a" "b" } { "d" } f } ]
[ \ effect-parsing-test "declared-effect" word-prop ] unit-test [ \ effect-parsing-test "declared-effect" word-prop ] unit-test
! Funny bug [ "IN: parser.tests : missing-- ( a b ) ;" eval( -- ) ] must-fail
[ 2 ] [ "IN: parser.tests : \0. ( -- x ) 2 ; \0." eval( -- n ) ] unit-test
[ "IN: parser.tests : missing-- ( a b ) ;" eval( -- ) ] must-fail ! Funny bug
[ 2 ] [ "IN: parser.tests : \0. ( -- x ) 2 ; \0." eval( -- n ) ] unit-test
! These should throw errors ! These should throw errors
[ "HEX: zzz" eval( -- obj ) ] must-fail [ "HEX: zzz" eval( -- obj ) ] must-fail
[ "OCT: 999" eval( -- obj ) ] must-fail [ "OCT: 999" eval( -- obj ) ] must-fail
[ "BIN: --0" eval( -- obj ) ] must-fail [ "BIN: --0" eval( -- obj ) ] must-fail
DEFER: foo DEFER: foo
"IN: parser.tests USING: math prettyprint ; SYNTAX: foo 2 2 + . ;" eval( -- ) "IN: parser.tests USING: math prettyprint ; SYNTAX: foo 2 2 + . ;" eval( -- )
[ ] [ "USE: parser.tests foo" eval( -- ) ] unit-test [ ] [ "USE: parser.tests foo" eval( -- ) ] unit-test
"IN: parser.tests USING: math prettyprint ; : foo ( -- ) 2 2 + . ;" eval( -- ) "IN: parser.tests USING: math prettyprint ; : foo ( -- ) 2 2 + . ;" eval( -- )
[ t ] [ [ t ] [
"USE: parser.tests \\ foo" eval( -- word ) "USE: parser.tests \\ foo" eval( -- word )
"foo" "parser.tests" lookup eq? "foo" "parser.tests" lookup eq?
] unit-test ] unit-test
! Test smudging ! parse-tokens should do the right thing on EOF
[ "USING: kernel" eval( -- ) ]
[ error>> T{ unexpected { want ";" } } = ] must-fail-with
[ 1 ] [ ! Test smudging
[ 1 ] [
"IN: parser.tests : smudge-me ( -- ) ;" <string-reader> "foo" "IN: parser.tests : smudge-me ( -- ) ;" <string-reader> "foo"
parse-stream drop parse-stream drop
"foo" source-file definitions>> first assoc-size "foo" source-file definitions>> first assoc-size
] unit-test ] unit-test
[ t ] [ "smudge-me" "parser.tests" lookup >boolean ] unit-test [ t ] [ "smudge-me" "parser.tests" lookup >boolean ] unit-test
[ ] [ [ ] [
"IN: parser.tests : smudge-me-more ( -- ) ;" <string-reader> "foo" "IN: parser.tests : smudge-me-more ( -- ) ;" <string-reader> "foo"
parse-stream drop parse-stream drop
] unit-test ] unit-test
[ t ] [ "smudge-me-more" "parser.tests" lookup >boolean ] unit-test [ t ] [ "smudge-me-more" "parser.tests" lookup >boolean ] unit-test
[ f ] [ "smudge-me" "parser.tests" lookup >boolean ] unit-test [ f ] [ "smudge-me" "parser.tests" lookup >boolean ] unit-test
[ 3 ] [ [ 3 ] [
"IN: parser.tests USING: math strings ; GENERIC: smudge-me ( a -- b ) M: integer smudge-me ; M: string smudge-me ;" <string-reader> "foo" "IN: parser.tests USING: math strings ; GENERIC: smudge-me ( a -- b ) M: integer smudge-me ; M: string smudge-me ;" <string-reader> "foo"
parse-stream drop parse-stream drop
"foo" source-file definitions>> first assoc-size "foo" source-file definitions>> first assoc-size
] unit-test ] unit-test
[ 1 ] [ [ 1 ] [
"IN: parser.tests USING: arrays ; M: array smudge-me ;" <string-reader> "bar" "IN: parser.tests USING: arrays ; M: array smudge-me ;" <string-reader> "bar"
parse-stream drop parse-stream drop
"bar" source-file definitions>> first assoc-size "bar" source-file definitions>> first assoc-size
] unit-test ] unit-test
[ 2 ] [ [ 2 ] [
"IN: parser.tests USING: math strings ; GENERIC: smudge-me ( a -- b ) M: integer smudge-me ;" <string-reader> "foo" "IN: parser.tests USING: math strings ; GENERIC: smudge-me ( a -- b ) M: integer smudge-me ;" <string-reader> "foo"
parse-stream drop parse-stream drop
"foo" source-file definitions>> first assoc-size "foo" source-file definitions>> first assoc-size
] unit-test ] unit-test
[ t ] [ [ t ] [
array "smudge-me" "parser.tests" lookup order member-eq? array "smudge-me" "parser.tests" lookup order member-eq?
] unit-test ] unit-test
[ t ] [ [ t ] [
integer "smudge-me" "parser.tests" lookup order member-eq? integer "smudge-me" "parser.tests" lookup order member-eq?
] unit-test ] unit-test
[ f ] [ [ f ] [
string "smudge-me" "parser.tests" lookup order member-eq? string "smudge-me" "parser.tests" lookup order member-eq?
] unit-test ] unit-test
[ ] [ [ ] [
"IN: parser.tests USE: math 2 2 +" <string-reader> "a" "IN: parser.tests USE: math 2 2 +" <string-reader> "a"
parse-stream drop parse-stream drop
] unit-test ] unit-test
[ t ] [ [ t ] [
"a" <pathname> \ + usage member? "a" <pathname> \ + usage member?
] unit-test ] unit-test
[ ] [ [ ] [
"IN: parser.tests USE: math 2 2 -" <string-reader> "a" "IN: parser.tests USE: math 2 2 -" <string-reader> "a"
parse-stream drop parse-stream drop
] unit-test ] unit-test
[ f ] [ [ f ] [
"a" <pathname> \ + usage member? "a" <pathname> \ + usage member?
] unit-test ] unit-test
[ ] [ [ ] [
"a" source-files get delete-at "a" source-files get delete-at
2 [ 2 [
"IN: parser.tests DEFER: x : y ( -- ) x ; : x ( -- ) y ;" "IN: parser.tests DEFER: x : y ( -- ) x ; : x ( -- ) y ;"
<string-reader> "a" parse-stream drop <string-reader> "a" parse-stream drop
] times ] times
] unit-test ] unit-test
"a" source-files get delete-at "a" source-files get delete-at
[ [
"IN: parser.tests : x ( -- ) ; : y ( -- * ) 3 throw ; this is an error" "IN: parser.tests : x ( -- ) ; : y ( -- * ) 3 throw ; this is an error"
<string-reader> "a" parse-stream <string-reader> "a" parse-stream
] [ source-file-error? ] must-fail-with ] [ source-file-error? ] must-fail-with
[ t ] [ [ t ] [
"y" "parser.tests" lookup >boolean "y" "parser.tests" lookup >boolean
] unit-test ] unit-test
[ f ] [ [ f ] [
"IN: parser.tests : x ( -- ) ;" "IN: parser.tests : x ( -- ) ;"
<string-reader> "a" parse-stream drop <string-reader> "a" parse-stream drop
"y" "parser.tests" lookup "y" "parser.tests" lookup
] unit-test ] unit-test
! Test new forward definition logic ! Test new forward definition logic
[ ] [ [ ] [
"IN: axx : axx ( -- ) ;" "IN: axx : axx ( -- ) ;"
<string-reader> "axx" parse-stream drop <string-reader> "axx" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"USE: axx IN: bxx : bxx ( -- ) ; : cxx ( -- ) axx bxx ;" "USE: axx IN: bxx : bxx ( -- ) ; : cxx ( -- ) axx bxx ;"
<string-reader> "bxx" parse-stream drop <string-reader> "bxx" parse-stream drop
] unit-test ] unit-test
! So we move the bxx word to axx... ! So we move the bxx word to axx...
[ ] [ [ ] [
"IN: axx : axx ( -- ) ; : bxx ( -- ) ;" "IN: axx : axx ( -- ) ; : bxx ( -- ) ;"
<string-reader> "axx" parse-stream drop <string-reader> "axx" parse-stream drop
] unit-test ] unit-test
[ t ] [ "bxx" "axx" lookup >boolean ] unit-test [ t ] [ "bxx" "axx" lookup >boolean ] unit-test
! And reload the file that uses it... ! And reload the file that uses it...
[ ] [ [ ] [
"USE: axx IN: bxx ( -- ) : cxx ( -- ) axx bxx ;" "USE: axx IN: bxx ( -- ) : cxx ( -- ) axx bxx ;"
<string-reader> "bxx" parse-stream drop <string-reader> "bxx" parse-stream drop
] unit-test ] unit-test
! And hope not to get a forward-error! ! And hope not to get a forward-error!
! Turning a generic into a non-generic could cause all ! Turning a generic into a non-generic could cause all
! kinds of funnyness ! kinds of funnyness
[ ] [ [ ] [
"IN: ayy USE: kernel GENERIC: ayy ( a -- b ) M: object ayy ;" "IN: ayy USE: kernel GENERIC: ayy ( a -- b ) M: object ayy ;"
<string-reader> "ayy" parse-stream drop <string-reader> "ayy" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"IN: ayy USE: kernel : ayy ( -- ) ;" "IN: ayy USE: kernel : ayy ( -- ) ;"
<string-reader> "ayy" parse-stream drop <string-reader> "ayy" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"IN: azz TUPLE: my-class ; GENERIC: a-generic ( a -- b )" "IN: azz TUPLE: my-class ; GENERIC: a-generic ( a -- b )"
<string-reader> "azz" parse-stream drop <string-reader> "azz" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"USE: azz M: my-class a-generic ;" "USE: azz M: my-class a-generic ;"
<string-reader> "azz-2" parse-stream drop <string-reader> "azz-2" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"IN: azz GENERIC: a-generic ( a -- b )" "IN: azz GENERIC: a-generic ( a -- b )"
<string-reader> "azz" parse-stream drop <string-reader> "azz" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"USE: azz USE: math M: integer a-generic ;" "USE: azz USE: math M: integer a-generic ;"
<string-reader> "azz-2" parse-stream drop <string-reader> "azz-2" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"IN: parser.tests : <bogus-error> ( -- ) ; : bogus ( -- error ) <bogus-error> ;" "IN: parser.tests : <bogus-error> ( -- ) ; : bogus ( -- error ) <bogus-error> ;"
<string-reader> "bogus-error" parse-stream drop <string-reader> "bogus-error" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"IN: parser.tests TUPLE: bogus-error ; C: <bogus-error> bogus-error : bogus ( -- error ) <bogus-error> ;" "IN: parser.tests TUPLE: bogus-error ; C: <bogus-error> bogus-error : bogus ( -- error ) <bogus-error> ;"
<string-reader> "bogus-error" parse-stream drop <string-reader> "bogus-error" parse-stream drop
] unit-test ] unit-test
! Problems with class predicates -vs- ordinary words ! Problems with class predicates -vs- ordinary words
[ ] [ [ ] [
"IN: parser.tests TUPLE: killer ;" "IN: parser.tests TUPLE: killer ;"
<string-reader> "removing-the-predicate" parse-stream drop <string-reader> "removing-the-predicate" parse-stream drop
] unit-test ] unit-test
[ ] [ [ ] [
"IN: parser.tests GENERIC: killer? ( a -- b )" "IN: parser.tests GENERIC: killer? ( a -- b )"
<string-reader> "removing-the-predicate" parse-stream drop <string-reader> "removing-the-predicate" parse-stream drop
] unit-test ] unit-test
[ t ] [ [ t ] [
"killer?" "parser.tests" lookup >boolean "killer?" "parser.tests" lookup >boolean
] unit-test ] unit-test
[ [
"IN: parser.tests TUPLE: another-pred-test ; GENERIC: another-pred-test? ( a -- b )" "IN: parser.tests TUPLE: another-pred-test ; GENERIC: another-pred-test? ( a -- b )"
<string-reader> "removing-the-predicate" parse-stream <string-reader> "removing-the-predicate" parse-stream
] [ error>> error>> error>> redefine-error? ] must-fail-with ] [ error>> error>> error>> redefine-error? ] must-fail-with
[ [
"IN: parser.tests TUPLE: class-redef-test ; TUPLE: class-redef-test ;" "IN: parser.tests TUPLE: class-redef-test ; TUPLE: class-redef-test ;"
<string-reader> "redefining-a-class-1" parse-stream <string-reader> "redefining-a-class-1" parse-stream
] [ error>> error>> error>> redefine-error? ] must-fail-with ] [ error>> error>> error>> redefine-error? ] must-fail-with
[ ] [ [ ] [
"IN: parser.tests TUPLE: class-redef-test ; SYMBOL: class-redef-test" "IN: parser.tests TUPLE: class-redef-test ; SYMBOL: class-redef-test"
<string-reader> "redefining-a-class-2" parse-stream drop <string-reader> "redefining-a-class-2" parse-stream drop
] unit-test ] unit-test
[ [
"IN: parser.tests TUPLE: class-redef-test ; SYMBOL: class-redef-test : class-redef-test ( -- ) ;" "IN: parser.tests TUPLE: class-redef-test ; SYMBOL: class-redef-test : class-redef-test ( -- ) ;"
<string-reader> "redefining-a-class-3" parse-stream drop <string-reader> "redefining-a-class-3" parse-stream drop
] [ error>> error>> error>> redefine-error? ] must-fail-with ] [ error>> error>> error>> redefine-error? ] must-fail-with
[ ] [ [ ] [
"IN: parser.tests TUPLE: class-fwd-test ;" "IN: parser.tests TUPLE: class-fwd-test ;"
<string-reader> "redefining-a-class-3" parse-stream drop <string-reader> "redefining-a-class-3" parse-stream drop
] unit-test ] unit-test
[ [
"IN: parser.tests \\ class-fwd-test" "IN: parser.tests \\ class-fwd-test"
<string-reader> "redefining-a-class-3" parse-stream drop <string-reader> "redefining-a-class-3" parse-stream drop
] [ error>> error>> error>> no-word-error? ] must-fail-with ] [ error>> error>> error>> no-word-error? ] must-fail-with
[ ] [ [ ] [
"IN: parser.tests TUPLE: class-fwd-test ; SYMBOL: class-fwd-test" "IN: parser.tests TUPLE: class-fwd-test ; SYMBOL: class-fwd-test"
<string-reader> "redefining-a-class-3" parse-stream drop <string-reader> "redefining-a-class-3" parse-stream drop
] unit-test ] unit-test
[ [
"IN: parser.tests \\ class-fwd-test" "IN: parser.tests \\ class-fwd-test"
<string-reader> "redefining-a-class-3" parse-stream drop <string-reader> "redefining-a-class-3" parse-stream drop
] [ error>> error>> error>> no-word-error? ] must-fail-with ] [ error>> error>> error>> no-word-error? ] must-fail-with
[ [
"IN: parser.tests : foo ( -- ) ; TUPLE: foo ;" "IN: parser.tests : foo ( -- ) ; TUPLE: foo ;"
<string-reader> "redefining-a-class-4" parse-stream drop <string-reader> "redefining-a-class-4" parse-stream drop
] [ error>> error>> error>> redefine-error? ] must-fail-with ] [ error>> error>> error>> redefine-error? ] must-fail-with
[ ] [ [ ] [
"IN: parser.tests : foo ( x y -- z ) 1 2 ; : bar ( a -- b ) ;" eval( -- ) "IN: parser.tests : foo ( x y -- z ) 1 2 ; : bar ( a -- b ) ;" eval( -- )
] unit-test ] unit-test
[ [
"IN: parser.tests : foo ( x y -- z) 1 2 ; : bar ( a -- b ) ;" eval( -- ) "IN: parser.tests : foo ( x y -- z) 1 2 ; : bar ( a -- b ) ;" eval( -- )
] must-fail ] must-fail
] with-file-vocabs
[ ] [ [ ] [
"IN: parser.tests USE: kernel PREDICATE: foo < object ( x -- y ) ;" eval( -- ) "IN: parser.tests USE: kernel PREDICATE: foo < object ( x -- y ) ;" eval( -- )

4
core/syntax/syntax.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2004, 2009 Slava Pestov. ! Copyright (C) 2004, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors alien arrays byte-arrays byte-vectors definitions generic USING: accessors alien arrays byte-arrays byte-vectors definitions generic
hashtables kernel math namespaces parser lexer sequences strings hashtables kernel math namespaces parser lexer sequences strings
@ -125,7 +125,7 @@ IN: bootstrap.syntax
] define-core-syntax ] define-core-syntax
"SYMBOLS:" [ "SYMBOLS:" [
";" [ create-in dup reset-generic define-symbol ] each-token ";" [ create-in [ reset-generic ] [ define-symbol ] bi ] each-token
] define-core-syntax ] define-core-syntax
"SINGLETONS:" [ "SINGLETONS:" [