@@ -17,4 +17,10 @@ module RedCloth # for an example. module Ast end +end + +class String + def to_sexp + self + end end \ No newline at end of file lib/redcloth/ast.rb @@ -1,6 +1,6 @@ module RedCloth module Ast - class Element < Inline + class Element attr_reader :contained_elements attr_reader :type @@ -11,7 +11,7 @@ module RedCloth end def to_sexp - [type, @opts, contents_to_sexp] + [type, @opts, contained_elements.map {|e| e.to_sexp }] end def accept(visitor) lib/redcloth/ast/element.rb @@ -2,12 +2,12 @@ module RedCloth module Ast class ListItem - def initialize(opts, inline) - @opts, @inline = opts, inline + def initialize(opts, contained_elements) + @opts, @contained_elements = opts, contained_elements end def to_sexp - [:list_item, @opts, @inline.to_sexp] + [:list_item, @opts, @contained_elements.map {|e| e.to_sexp }] end end lib/redcloth/ast/list_item.rb @@ -11,7 +11,7 @@ module RedCloth def build(filter) Ast::Element.new( {:type => :bold}, - contents.all_inline_elements.map {|e| e.build(filter) } + contents.build(filter) ) end } lib/redcloth/parser/inline/bold.treetop @@ -10,9 +10,18 @@ module RedCloth punct more_elements:(!li_end inline_spaces inline_element punct)* { def build(filter) - Ast::Inline.new( - all_inline_elements.map {|e| e.build(filter) } - ) + all_inline_elements.map {|e| e.build(filter) }.inject([]) do |a, e| + if e.is_a?(String) + if a.last.is_a?(String) + a.last << e + else + a << e unless e.blank? + end + else + a << e + end + a + end end def all_inline_elements [element_1, punct] + more_elements.elements.map {|e| e.elements }.flatten.reject do |e| lib/redcloth/parser/inline/common_inline.treetop @@ -11,7 +11,7 @@ module RedCloth def build(filter) Ast::Element.new( {:type => :strong}, - contents.all_inline_elements.map {|e| e.build(filter) } + contents.build(filter) ) end } lib/redcloth/parser/inline/strong.treetop @@ -12,42 +12,46 @@ module RedCloth @parser.parse_or_fail(string) end + def parsed_sexp(string) + parse(string).map {|e| e.to_sexp} + end + ### plain text ### it "should parse a plain-text phrase" do - parse("Just plain text.").to_sexp.should == + parsed_sexp("Just plain text.").should == ["Just plain text."] end it "should parse a phrase with asterisks that is not a strong phrase" do - parse("yes * we * can").to_sexp.should == + parsed_sexp("yes * we * can").should == ["yes * we * can"] end it "should parse a phrase that is not a strong because it has space at the end" do - parse("yeah *that's * it!").to_sexp.should == + parsed_sexp("yeah *that's * it!").should == ["yeah *that's * it!"] end ### strong ### it "should parse a strong phrase" do - parse("*strong phrase*").to_sexp.should == + parsed_sexp("*strong phrase*").should == [[:strong, {}, ["strong phrase"]]] end it "should parse a strong phrase surrounded by plain text" do - parse("plain *strong phrase* plain").to_sexp.should == + parsed_sexp("plain *strong phrase* plain").should == ["plain ", [:strong, {}, ["strong phrase"]], " plain"] end it "should allow a strong phrase at the end of a sentence before punctuation" do - parse("Are you *veg*an*?").to_sexp.should == + parsed_sexp("Are you *veg*an*?").should == ["Are you ", [:strong, {}, ["veg*an"]], "?"] end it "should parse a bold phrase inside a strong phrase" do - parse("*this is **bold** see*").to_sexp.should == + parsed_sexp("*this is **bold** see*").should == [[:strong, {}, [ "this is ", [:bold, {}, ["bold"]], @@ -56,7 +60,7 @@ module RedCloth it "should parse an emphasized phrase inside a strong phrase" do pending - parse("*_em in strong_*").to_sexp.should == + parsed_sexp("*_em in strong_*").should == [[:strong, {}, [ [:em, {}, ["em in strong"]]]]] end @@ -65,13 +69,13 @@ module RedCloth it "should parse an emphasized phrase" do pending - parse("_emphasized_").to_sexp.should == + parsed_sexp("_emphasized_").should == [[:em, {}, ["emphasized"]]] end it "should parse a strong phrase inside an emphasized phrase" do pending - parse("_*strong in em*_").to_sexp.should == + parsed_sexp("_*strong in em*_").should == [[:em, {}, [ [:strong, {}, ["strong in em"]]]]] end @@ -79,22 +83,22 @@ module RedCloth ### bold ### it "should parse a bold phrase" do - parse("**bold phrase**").to_sexp.should == + parsed_sexp("**bold phrase**").should == [[:bold, {}, ["bold phrase"]]] end it "should parse a bold phrase surrounded by plain text" do - parse("plain **bold phrase** plain").to_sexp.should == + parsed_sexp("plain **bold phrase** plain").should == ["plain ", [:bold, {}, ["bold phrase"]], " plain"] end it "should allow a bold phrase at the end of a sentence before punctuation" do - parse("Are you **veg*an**?").to_sexp.should == + parsed_sexp("Are you **veg*an**?").should == ["Are you ", [:bold, {}, ["veg*an"]], "?"] end it "should parse a strong phrase inside a bold phrase" do - parse("**this is *strong* see**").to_sexp.should == + parsed_sexp("**this is *strong* see**").should == [[:bold, {}, [ "this is ", [:strong, {}, ["strong"]], @@ -103,7 +107,7 @@ module RedCloth it "should parse an emphasized phrase inside a bold phrase" do pending - parse("**_em in bold_**").to_sexp.should == + parsed_sexp("**_em in bold_**").should == [[:bold, {}, [ [:em, {}, ["em in bold"]]]]] end spec/redcloth/parser/inline_parser_spec.rb lib/redcloth/ast/inline.rb 1726e0b17be4ee1fbb6a901fd37a2d083e21e66c Jason Garber jg@jasongarber.com http://github.com/jgarber/redcloth-treetop/commit/678c92b9c86ef7be0a703d4921f85c158ed791b9 678c92b9c86ef7be0a703d4921f85c158ed791b9 2009-07-02T05:28:03-07:00 2009-07-02T05:28:03-07:00 Remove Inline from the AST. Simplifies things a lot. 039cd3db10519f68ef62efd4f63adc51c837c3b3 Jason Garber jg@jasongarber.com