@@ -3,6 +3,6 @@ grammar SectionContent include Description rule section - line space* '==' space* title:[a-zA-Z\s]+ space* '==' space* text <Section> + line space* '==' space* title:[a-zA-Z0-9\s]+ space* '==' space* text <Section> end end \ No newline at end of file lib/pdoc/parser/treetop_files/section_content.treetop @@ -23,6 +23,16 @@ class EbnfExpressionTest < Test::Unit::TestCase assert_equal "Response", parse(ebnf).klass_name assert_equal "Array | Object | null", parse(ebnf).returns assert_equal ebnf, parse(ebnf).to_s + + ebnf = "a123#b456 -> Array | Object | null" + assert_parsed ebnf + assert_equal InstanceProperty, parse(ebnf).class + assert_equal "a123", parse(ebnf).namespace + assert_equal "b456", parse(ebnf).name + assert_equal "a123#b456", parse(ebnf).full_name + assert_equal "a123", parse(ebnf).klass_name + assert_equal "Array | Object | null", parse(ebnf).returns + assert_equal ebnf, parse(ebnf).to_s end def test_klass_property @@ -192,6 +202,16 @@ class EbnfExpressionTest < Test::Unit::TestCase assert_equal [], parse(ebnf).mixins assert_equal ebnf, parse(ebnf).to_s + ebnf = "scripty2" + assert_parsed ebnf + assert_equal Namespace, parse(ebnf).class + assert_equal "", parse(ebnf).namespace + assert_equal "scripty2", parse(ebnf).name + assert_equal "scripty2", parse(ebnf).full_name + assert_equal nil, parse(ebnf).klass_name + assert_equal [], parse(ebnf).mixins + assert_equal ebnf, parse(ebnf).to_s + ebnf = "Ajax\n * includes Enumerable" assert_parsed ebnf assert_equal Namespace, parse(ebnf).class @@ -243,6 +263,15 @@ class EbnfExpressionTest < Test::Unit::TestCase assert_equal "Prototype.JSONFilter", parse(ebnf).full_name assert_equal "/^\/\*-secure-([\s\S]*)\*\/\s*$/", parse(ebnf).returns assert_equal ebnf, parse(ebnf).to_s + + ebnf = "s2.css.LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/" + assert_parsed ebnf + assert_equal Constant, parse(ebnf).class + assert_equal "s2.css", parse(ebnf).namespace + assert_equal "LENGTH", parse(ebnf).name + assert_equal "s2.css.LENGTH", parse(ebnf).full_name + assert_equal "/^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/", parse(ebnf).returns + assert_equal ebnf, parse(ebnf).to_s end def test_no_arguments test/unit/parser/ebnf_expression_test.rb @@ -30,6 +30,11 @@ class SectionContentTest < Test::Unit::TestCase assert_equal "Some Section", parse(text).name assert_equal "Some Section", parse(text).full_name assert_equal "some_section", parse(text).id + + text = "\n* == scripty2 == \n * hello" + assert_equal "scripty2", parse(text).name + assert_equal "scripty2", parse(text).full_name + assert_equal "scripty2", parse(text).id end def test_description test/unit/parser/section_content_test.rb c508642289d298528a074450b636e580a8042fef Thomas Fuchs thomas@fesch.at http://github.com/tobie/pdoc/commit/1ca2eed4627c978165fa32605b48995559441b19 1ca2eed4627c978165fa32605b48995559441b19 2009-06-11T04:07:44-07:00 2009-06-11T04:04:51-07:00 Fix a problem with section parsing, add more unit tests for numbers in namespaces, classnames, etc. Signed-off-by: Thomas Fuchs <thomas@fesch.at> d0b9440ee500555dd28457470e69e048b8a32dda Thomas Fuchs thomas@fesch.at