From e4b1417dd259f13f3464d92684402752d5bb8bff Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 6 Jun 2011 16:27:56 -0700 Subject: [PATCH 1/2] math.functions: fix documentation for 10^ --- basis/math/functions/functions-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/math/functions/functions-docs.factor b/basis/math/functions/functions-docs.factor index 5f7c066efa..414228b54e 100644 --- a/basis/math/functions/functions-docs.factor +++ b/basis/math/functions/functions-docs.factor @@ -267,7 +267,7 @@ HELP: nth-root HELP: 10^ { $values { "x" number } { "y" number } } -{ $description "Raises " { $snippet "x" } " to the power of 10. If " { $snippet "x" } " is an integer the answer is computed exactly, otherwise a floating point approximation is used." } ; +{ $description "Raises 10 to the power of " { $snippet "x" } ". If " { $snippet "x" } " is an integer the answer is computed exactly, otherwise a floating point approximation is used." } ; HELP: gcd { $values { "x" integer } { "y" integer } { "a" integer } { "d" integer } } From 27f5f07dbcf74041330753fd6eade93743601620 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 6 Jun 2011 16:32:19 -0700 Subject: [PATCH 2/2] peg.ebnf: add rule~ syntax to discard a matching subrule from the AST; document (grouping) and {grouping} syntax --- basis/peg/ebnf/ebnf-docs.factor | 36 ++++++++++++++++++++++++ basis/peg/ebnf/ebnf-tests.factor | 48 ++++++++++++++++++++++++++++++++ basis/peg/ebnf/ebnf.factor | 13 ++++++++- 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/basis/peg/ebnf/ebnf-docs.factor b/basis/peg/ebnf/ebnf-docs.factor index b03ec45526..26d8a3d0b6 100644 --- a/basis/peg/ebnf/ebnf-docs.factor +++ b/basis/peg/ebnf/ebnf-docs.factor @@ -94,6 +94,28 @@ ARTICLE: "peg.ebnf.sequence" "Sequence" } ; +ARTICLE: "peg.ebnf.grouping" "Group" +"Any sequence of rules may be grouped using parentheses (" { $snippet "()" } "). " +"The parenthesized sequence can then be modified as a group. Parentheses also " +"delimit sets of choices separated by pipe (|) characters." +$nl +"A group can also be delimited with curly braces (" { $snippet "{}" } "), in " +"which case an implicit optional whitespace-matching rule will be inserted between " +"rules sequenced within the braces." +{ $examples + { $example + "USING: prettyprint peg.ebnf ;" + "\"abcca\" [EBNF rule=\"a\" (\"b\" | \"c\")* \"a\" EBNF] ." + "V{ \"a\" V{ \"b\" \"c\" \"c\" } \"a\" }" + } + { $example + "USING: prettyprint peg.ebnf ;" + "\"ab c\nd \" [EBNF rule={\"a\" \"b\" \"c\" \"d\"} EBNF] ." + "V{ \"a\" \"b\" \"c\" \"d\" }" + } +} +; + ARTICLE: "peg.ebnf.choice" "Choice" "Any rule element separated by a pipe character (|) is considered a choice. Choices " "are matched against the input stream in order. If a match succeeds then the remaining " @@ -117,6 +139,18 @@ ARTICLE: "peg.ebnf.choice" "Choice" } ; +ARTICLE: "peg.ebnf.ignore" "Ignore" +"Any rule element followed by a tilde (~) will be matched, and its results " +"discarded from the AST." +{ $examples + { $example + "USING: prettyprint peg.ebnf ;" + "\"abc\" [EBNF rule=\"a\" \"b\"~ \"c\" EBNF] ." + "V{ \"a\" \"c\" }" + } +} +; + ARTICLE: "peg.ebnf.option" "Option" "Any rule element followed by a question mark (?) is considered optional. The " "rule is tested against the input. If it succeeds the result is stored in the AST. " @@ -452,7 +486,9 @@ ARTICLE: "peg.ebnf" "EBNF" { $subsections "peg.ebnf.strings" "peg.ebnf.any" "peg.ebnf.sequence" +"peg.ebnf.grouping" "peg.ebnf.choice" +"peg.ebnf.ignore" "peg.ebnf.option" "peg.ebnf.one-or-more" "peg.ebnf.zero-or-more" diff --git a/basis/peg/ebnf/ebnf-tests.factor b/basis/peg/ebnf/ebnf-tests.factor index 897746a9c9..f267f69255 100644 --- a/basis/peg/ebnf/ebnf-tests.factor +++ b/basis/peg/ebnf/ebnf-tests.factor @@ -84,6 +84,26 @@ IN: peg.ebnf.tests "one ((two | three) four)*" 'choice' parse ] unit-test +{ + T{ ebnf-sequence f + V{ + T{ ebnf-non-terminal f "one" } + T{ ebnf-ignore f + T{ ebnf-sequence f + V{ + T{ ebnf-choice f + V{ T{ ebnf-non-terminal f "two" } T{ ebnf-non-terminal f "three" } } + } + T{ ebnf-non-terminal f "four" } + } + } + } + } + } +} [ + "one ((two | three) four)~" 'choice' parse +] unit-test + { T{ ebnf-sequence f V{ @@ -304,6 +324,26 @@ main = Primary "abc" [EBNF a="a" "b" foo=(a "c") EBNF] ] unit-test +{ V{ "a" "c" } } [ + "abc" [EBNF a="a" "b"~ foo=(a "c") EBNF] +] unit-test + +{ V{ V{ "a" V{ "b" "b" } } "c" } } [ + "abbc" [EBNF a=("a" "b"*) foo=(a "c") EBNF] +] unit-test + +{ V{ "a" "c" } } [ + "abc" [EBNF a=("a" ("b")~) foo=(a "c") EBNF] +] unit-test + +{ V{ "a" "c" } } [ + "abc" [EBNF a=("a" "b"~) foo=(a "c") EBNF] +] unit-test + +{ "c" } [ + "abc" [EBNF a=("a" "b")~ foo=(a "c") EBNF] +] unit-test + { V{ V{ "a" "b" } "c" } } [ "abc" [EBNF a="a" "b" foo={a "c"} EBNF] ] unit-test @@ -360,6 +400,14 @@ main = Primary "ab c ab c" [EBNF a="a" "b" foo={a "c"}* EBNF] ] unit-test +{ V{ V{ "a" "c" } V{ "a" "c" } } } [ + "ab c ab c" [EBNF a="a" "b"~ foo={a "c"}* EBNF] +] unit-test + +{ V{ } } [ + "ab c ab c" [EBNF a="a" "b" foo=(a "c")* EBNF] +] unit-test + { V{ } } [ "ab c ab c" [EBNF a="a" "b" foo=(a "c")* EBNF] ] unit-test diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor index 045b0a588d..eac9c21fd6 100644 --- a/basis/peg/ebnf/ebnf.factor +++ b/basis/peg/ebnf/ebnf.factor @@ -61,6 +61,7 @@ TUPLE: ebnf-ensure group ; TUPLE: ebnf-ensure-not group ; TUPLE: ebnf-choice options ; TUPLE: ebnf-sequence elements ; +TUPLE: ebnf-ignore group ; TUPLE: ebnf-repeat0 group ; TUPLE: ebnf-repeat1 group ; TUPLE: ebnf-optional group ; @@ -81,6 +82,7 @@ C: ebnf-ensure C: ebnf-ensure-not C: ebnf-choice C: ebnf-sequence +C: ebnf-ignore C: ebnf-repeat0 C: ebnf-repeat1 C: ebnf-optional @@ -215,6 +217,7 @@ PEG: escaper ( string -- ast ) 'range-parser' , 'any-character' , ] choice* + [ dup , "~" token hide , ] seq* [ first ] action , [ dup , "*" token hide , ] seq* [ first ] action , [ dup , "+" token hide , ] seq* [ first ] action , [ dup , "?[" token ensure-not , "?" token hide , ] seq* [ first ] action , @@ -257,11 +260,15 @@ DEFER: 'choice' : 'group' ( -- parser ) #! A grouping with no suffix. Used for precedence. [ ] [ + "~" token sp ensure-not , "*" token sp ensure-not , "+" token sp ensure-not , "?" token sp ensure-not , ] seq* hide grouped ; +: 'ignore' ( -- parser ) + [ ] "~" syntax grouped ; + : 'repeat0' ( -- parser ) [ ] "*" syntax grouped ; @@ -305,6 +312,7 @@ DEFER: 'choice' 'ensure' sp , 'element' sp , 'group' sp , + 'ignore' sp , 'repeat0' sp , 'repeat1' sp , 'optional' sp , @@ -425,6 +433,9 @@ M: ebnf-ensure (transform) ( ast -- parser ) M: ebnf-ensure-not (transform) ( ast -- parser ) transform-group ensure-not ; +M: ebnf-ignore (transform) ( ast -- parser ) + transform-group [ drop ignore ] action ; + M: ebnf-repeat0 (transform) ( ast -- parser ) transform-group repeat0 ; @@ -532,7 +543,7 @@ M: ebnf-non-terminal (transform) ( ast -- parser ) dup remaining>> [ blank? ] trim [ [ "Unable to fully parse EBNF. Left to parse was: " % - remaining>> % + % ] "" make throw ] unless-empty ] [