spec/embedded_spec.rb in nydp-0.4.2 vs spec/embedded_spec.rb in nydp-0.4.3

- old
+ new

@@ -44,14 +44,14 @@ end it "should parse a string with embedded code, delimited by eof" do x1 = sym('string-pieces') x2 = Nydp::StringFragmentToken.new('a fluffy bunny! ','a fluffy bunny! ~') - x2 = Nydp::StringAtom.new(x2.string, x2) + x2 = Nydp::StringAtom.new(x2.string) x3 = sym('expr') x4 = Nydp::StringFragmentCloseToken.new(' a purple cow!',' a purple cow!') - x4 = Nydp::StringAtom.new(x4.string, x4) + x4 = Nydp::StringAtom.new(x4.string) expected = pair_list([x1,x2,x3,x4]) actual = parse_string "a fluffy bunny! ~expr a purple cow!" expect(actual).to eq expected end @@ -62,14 +62,14 @@ n3 = Nydp::StringAtom.new 'an embedded bunny :)' n4 = sym(:zop) x1 = sym('string-pieces') x2 = Nydp::StringFragmentToken.new('a fluffy bunny! ','a fluffy bunny! ~') - x2 = Nydp::StringAtom.new(x2.string, x2) + x2 = Nydp::StringAtom.new(x2.string) x3 = pair_list [n1, n2, n3, n4] x4 = Nydp::StringFragmentCloseToken.new(' a purple cow!',' a purple cow!') - x4 = Nydp::StringAtom.new(x4.string, x4) + x4 = Nydp::StringAtom.new(x4.string) expected = pair_list([x1,x2,x3,x4]) actual = parse_string 'a fluffy bunny! ~(foo bar "an embedded bunny :)" zop) a purple cow!' expect(actual).to eq expected end @@ -78,25 +78,25 @@ e1 = sym(:describe) e2 = sym(:bunny) s1 = sym('string-pieces') s2 = Nydp::StringFragmentToken.new('a rather ','a rather ~') - s2 = Nydp::StringAtom.new(s2.string, s2) + s2 = Nydp::StringAtom.new(s2.string) s3 = pair_list [e1, e2] s4 = Nydp::StringFragmentCloseToken.new(' bunny :)',' bunny :)"') - s4 = Nydp::StringAtom.new(s4.string, s4) + s4 = Nydp::StringAtom.new(s4.string) n1 = sym(:foo) n2 = sym(:bar) n3 = pair_list [s1, s2, s3, s4] n4 = sym(:zop) x1 = sym('string-pieces') x2 = Nydp::StringFragmentToken.new('a fluffy bunny! ','a fluffy bunny! ~') - x2 = Nydp::StringAtom.new(x2.string, x2) + x2 = Nydp::StringAtom.new(x2.string) x3 = pair_list [n1, n2, n3, n4] x4 = Nydp::StringFragmentCloseToken.new(' a purple cow!',' a purple cow!') - x4 = Nydp::StringAtom.new(x4.string, x4) + x4 = Nydp::StringAtom.new(x4.string) expected = pair_list([x1,x2,x3,x4]) actual = parse_string "a fluffy bunny! ~(foo bar \"a rather ~(describe bunny) bunny :)\" zop) a purple cow!" expect(actual).to eq expected end