diff options
| -rw-r--r-- | test/scanners/coderay_suite.rb | 14 | ||||
| -rw-r--r-- | test/scanners/nitro/tags.expected.raydebug | 92 | ||||
| -rw-r--r-- | test/scanners/rhtml/day.expected.raydebug | 22 |
3 files changed, 64 insertions, 64 deletions
diff --git a/test/scanners/coderay_suite.rb b/test/scanners/coderay_suite.rb index 3c3cbe0..82236c9 100644 --- a/test/scanners/coderay_suite.rb +++ b/test/scanners/coderay_suite.rb @@ -97,12 +97,12 @@ module CodeRay if ENV['deluxe'] MAX_CODE_SIZE_TO_HIGHLIGHT = 200_000 - MAX_CODE_SIZE_TO_TEST = 3_000_000 - DEFAULT_MAX = 1024 + MAX_CODE_SIZE_TO_TEST = 1_000_000 + DEFAULT_MAX = 512 else - MAX_CODE_SIZE_TO_HIGHLIGHT = 1024 - MAX_CODE_SIZE_TO_TEST = 200_000 - DEFAULT_MAX = 256 + MAX_CODE_SIZE_TO_HIGHLIGHT = 20_000 + MAX_CODE_SIZE_TO_TEST = 100_000 + DEFAULT_MAX = 128 end class << self @@ -173,8 +173,8 @@ module CodeRay time_for_file = Benchmark.realtime do example_test example_filename, name, scanner, max end - print 'finished.'.green - puts ' [%0.2fs]'.white % time_for_file + print 'finished in '.green + '%0.2fs'.white % time_for_file + puts '.'.green end end end diff --git a/test/scanners/nitro/tags.expected.raydebug b/test/scanners/nitro/tags.expected.raydebug index 7ce6076..f5804c5 100644 --- a/test/scanners/nitro/tags.expected.raydebug +++ b/test/scanners/nitro/tags.expected.raydebug @@ -1,84 +1,84 @@ tag(<Page) attribute_name(title)operator(=)string<delimiter(")content(Questions and Tips by Tags)delimiter(")>tag(>) tag(<div) attribute_name(id)operator(=)string<delimiter(")content(left)delimiter(")>tag(>) - inline<delimiter(<?r) reserved(if) instance_variable(@tags) delimiter(?>)> - tag(<h1>)plain(Questions with Tags: )inline<delimiter(#{)instance_variable(@tags)operator(.)ident(join)operator(()string<delimiter(")content( )delimiter(")>operator(\))delimiter(})>tag(</h1>) + inline<inline_delimiter(<?r) reserved(if) instance_variable(@tags) inline_delimiter(?>)> + tag(<h1>)plain(Questions with Tags: )inline<inline_delimiter(#{)instance_variable(@tags)operator(.)ident(join)operator(()string<delimiter(")content( )delimiter(")>operator(\))inline_delimiter(})>tag(</h1>) - inline<delimiter(<?r) reserved(if) instance_variable(@questions) operator(&&) instance_variable(@questions)operator(.)ident(size) operator(>) integer(0) delimiter(?>)> - inline<delimiter(<?r) reserved(if) instance_variable(@qtags) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(if) instance_variable(@questions) operator(&&) instance_variable(@questions)operator(.)ident(size) operator(>) integer(0) inline_delimiter(?>)> + inline<inline_delimiter(<?r) reserved(if) instance_variable(@qtags) inline_delimiter(?>)> plain(Too many results for that Tag, please reduce the number by using one of the following Tags: - )inline<delimiter(#{)ident(cloud_of)operator(()instance_variable(@qtags)operator(\))delimiter(})> - inline<delimiter(<?r) reserved(end) delimiter(?>)> + )inline<inline_delimiter(#{)ident(cloud_of)operator(()instance_variable(@qtags)operator(\))inline_delimiter(})> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(<div) attribute_name(class)operator(=)string<delimiter(")content(results)delimiter(")>tag(>) - inline<delimiter(<?r) instance_variable(@questions)operator(.)ident(each) reserved(do) operator(|)ident(q)operator(|) delimiter(?>)> - tag(<h2>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/question/)inline<delimiter(#{)ident(q)operator(.)ident(oid)delimiter(})>delimiter(")>tag(>)inline<delimiter(#{)ident(q)operator(.)ident(question)delimiter(})>tag(</a>)tag(</h2>) + inline<inline_delimiter(<?r) instance_variable(@questions)operator(.)ident(each) reserved(do) operator(|)ident(q)operator(|) inline_delimiter(?>)> + tag(<h2>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/question/)inline<inline_delimiter(#{)ident(q)operator(.)ident(oid)inline_delimiter(})>delimiter(")>tag(>)inline<inline_delimiter(#{)ident(q)operator(.)ident(question)inline_delimiter(})>tag(</a>)tag(</h2>) tag(<p>) - inline<delimiter(<?r) ident(excerpt) operator(=) ident(excerpt_with_words)operator(()ident(q)operator(.)ident(text)operator(,) instance_variable(@tags)operator(\)) delimiter(?>)> - inline<delimiter(#{)ident(excerpt)delimiter(})> + inline<inline_delimiter(<?r) ident(excerpt) operator(=) ident(excerpt_with_words)operator(()ident(q)operator(.)ident(text)operator(,) instance_variable(@tags)operator(\)) inline_delimiter(?>)> + inline<inline_delimiter(#{)ident(excerpt)inline_delimiter(})> tag(</p>) - tag(<p) attribute_name(style)operator(=)string<delimiter(")content(float:right;)delimiter(")>tag(>)inline<delimiter(#{)ident(q)operator(.)ident(answers)operator(.)ident(size)operator(.)ident(to_i)delimiter(})> plain(answers)tag(</p>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + tag(<p) attribute_name(style)operator(=)string<delimiter(")content(float:right;)delimiter(")>tag(>)inline<inline_delimiter(#{)ident(q)operator(.)ident(answers)operator(.)ident(size)operator(.)ident(to_i)inline_delimiter(})> plain(answers)tag(</p>) + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(</div>) tag(<div) attribute_name(class)operator(=)string<delimiter(")content(pager)delimiter(")>tag(>) - inline<delimiter(#{)instance_variable(@qpager)operator(.)ident(navigation)delimiter(})> + inline<inline_delimiter(#{)instance_variable(@qpager)operator(.)ident(navigation)inline_delimiter(})> tag(</div>) - inline<delimiter(<?r) reserved(else) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(else) inline_delimiter(?>)> tag(<div) attribute_name(class)operator(=)string<delimiter(")content(results_none)delimiter(")>tag(>) tag(<h2>)plain(no question with this/these tag(s\) found)tag(</h2>) tag(<p>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/ask)delimiter(")>tag(>)plain(Ask a question here.)tag(</a>)tag(</p>) tag(</div>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> - inline<delimiter(<?r) reserved(if) instance_variable(@tips) operator(&&) instance_variable(@tips)operator(.)ident(size) operator(>) integer(0) delimiter(?>)> - tag(<h1>)plain(Tips with Tags: )inline<delimiter(#{)instance_variable(@tags)operator(.)ident(join)operator(()string<delimiter(")content( )delimiter(")>operator(\))delimiter(})>tag(</h1>) - inline<delimiter(<?r) reserved(if) instance_variable(@ttags) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(if) instance_variable(@tips) operator(&&) instance_variable(@tips)operator(.)ident(size) operator(>) integer(0) inline_delimiter(?>)> + tag(<h1>)plain(Tips with Tags: )inline<inline_delimiter(#{)instance_variable(@tags)operator(.)ident(join)operator(()string<delimiter(")content( )delimiter(")>operator(\))inline_delimiter(})>tag(</h1>) + inline<inline_delimiter(<?r) reserved(if) instance_variable(@ttags) inline_delimiter(?>)> plain(Too many results for that Tag, please reduce the number by using one of the following Tags: - )inline<delimiter(#{)ident(cloud_of)operator(()instance_variable(@ttags)operator(\))delimiter(})> - inline<delimiter(<?r) reserved(end) delimiter(?>)> + )inline<inline_delimiter(#{)ident(cloud_of)operator(()instance_variable(@ttags)operator(\))inline_delimiter(})> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(<div) attribute_name(class)operator(=)string<delimiter(")content(results)delimiter(")>tag(>) - inline<delimiter(<?r) instance_variable(@tips)operator(.)ident(each) reserved(do) operator(|)ident(t)operator(|) delimiter(?>)> - tag(<h2>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/tip/)inline<delimiter(#{)ident(t)operator(.)ident(oid)delimiter(})>delimiter(")>tag(>)inline<delimiter(#{)ident(t)operator(.)ident(title)delimiter(})>tag(</a>)tag(</h2>) + inline<inline_delimiter(<?r) instance_variable(@tips)operator(.)ident(each) reserved(do) operator(|)ident(t)operator(|) inline_delimiter(?>)> + tag(<h2>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/tip/)inline<inline_delimiter(#{)ident(t)operator(.)ident(oid)inline_delimiter(})>delimiter(")>tag(>)inline<inline_delimiter(#{)ident(t)operator(.)ident(title)inline_delimiter(})>tag(</a>)tag(</h2>) tag(<p>) - inline<delimiter(<?r) ident(excerpt) operator(=) ident(excerpt_with_words)operator(()ident(t)operator(.)ident(text)operator(,) instance_variable(@tags)operator(\)) delimiter(?>)> - inline<delimiter(#{)ident(excerpt)delimiter(})> + inline<inline_delimiter(<?r) ident(excerpt) operator(=) ident(excerpt_with_words)operator(()ident(t)operator(.)ident(text)operator(,) instance_variable(@tags)operator(\)) inline_delimiter(?>)> + inline<inline_delimiter(#{)ident(excerpt)inline_delimiter(})> tag(</p>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(</div>) tag(<div) attribute_name(class)operator(=)string<delimiter(")content(pager)delimiter(")>tag(>) - inline<delimiter(#{)instance_variable(@tpager)operator(.)ident(navigation)delimiter(})> + inline<inline_delimiter(#{)instance_variable(@tpager)operator(.)ident(navigation)inline_delimiter(})> tag(</div>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> - inline<delimiter(<?r) reserved(if) instance_variable(@tutorials) operator(&&) instance_variable(@tutorials)operator(.)ident(size) operator(>) integer(0) delimiter(?>)> - tag(<h1>)plain(Tutorials with Tags: )inline<delimiter(#{)instance_variable(@tags)operator(.)ident(join)operator(()string<delimiter(")content( )delimiter(")>operator(\))delimiter(})>tag(</h1>) - inline<delimiter(<?r) reserved(if) instance_variable(@tuttags) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(if) instance_variable(@tutorials) operator(&&) instance_variable(@tutorials)operator(.)ident(size) operator(>) integer(0) inline_delimiter(?>)> + tag(<h1>)plain(Tutorials with Tags: )inline<inline_delimiter(#{)instance_variable(@tags)operator(.)ident(join)operator(()string<delimiter(")content( )delimiter(")>operator(\))inline_delimiter(})>tag(</h1>) + inline<inline_delimiter(<?r) reserved(if) instance_variable(@tuttags) inline_delimiter(?>)> plain(Too many results for that Tag, please reduce the number by using one of the following Tags: - )inline<delimiter(#{)ident(cloud_of)operator(()instance_variable(@tuttags)operator(\))delimiter(})> - inline<delimiter(<?r) reserved(end) delimiter(?>)> + )inline<inline_delimiter(#{)ident(cloud_of)operator(()instance_variable(@tuttags)operator(\))inline_delimiter(})> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(<div) attribute_name(class)operator(=)string<delimiter(")content(results)delimiter(")>tag(>) - inline<delimiter(<?r) instance_variable(@tutorials)operator(.)ident(each) reserved(do) operator(|)ident(t)operator(|) delimiter(?>)> - tag(<h2>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/tutorial/)inline<delimiter(#{)ident(t)operator(.)ident(oid)delimiter(})>delimiter(")>tag(>)inline<delimiter(#{)ident(t)operator(.)ident(title)delimiter(})>tag(</a>)tag(</h2>) + inline<inline_delimiter(<?r) instance_variable(@tutorials)operator(.)ident(each) reserved(do) operator(|)ident(t)operator(|) inline_delimiter(?>)> + tag(<h2>)tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/tutorial/)inline<inline_delimiter(#{)ident(t)operator(.)ident(oid)inline_delimiter(})>delimiter(")>tag(>)inline<inline_delimiter(#{)ident(t)operator(.)ident(title)inline_delimiter(})>tag(</a>)tag(</h2>) tag(<p>) - inline<delimiter(<?r) ident(excerpt) operator(=) ident(excerpt_with_words)operator(()ident(t)operator(.)ident(text)operator(,) instance_variable(@tags)operator(\)) delimiter(?>)> - inline<delimiter(#{)ident(excerpt)delimiter(})> + inline<inline_delimiter(<?r) ident(excerpt) operator(=) ident(excerpt_with_words)operator(()ident(t)operator(.)ident(text)operator(,) instance_variable(@tags)operator(\)) inline_delimiter(?>)> + inline<inline_delimiter(#{)ident(excerpt)inline_delimiter(})> tag(</p>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(</div>) tag(<div) attribute_name(class)operator(=)string<delimiter(")content(pager)delimiter(")>tag(>) - inline<delimiter(#{)instance_variable(@tpager)operator(.)ident(navigation)delimiter(})> + inline<inline_delimiter(#{)instance_variable(@tpager)operator(.)ident(navigation)inline_delimiter(})> tag(</div>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> - inline<delimiter(<?r) reserved(else) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(else) inline_delimiter(?>)> tag(<div) attribute_name(class)operator(=)string<delimiter(")content(cloud)delimiter(")>tag(>) - inline<delimiter(<?r) + inline<inline_delimiter(<?r) ident(sum) operator(=) ident(all_tags)operator(.)ident(inject)operator(()integer(0)operator(\)) operator({) operator(|)ident(sum)operator(,) ident(t)operator(|) ident(sum) operator(+) ident(t)operator(.)ident(popularity)operator(.)ident(to_i) operator(}) - delimiter(?>)> - inline<delimiter(<?r) ident(all_tags)operator(.)ident(each) reserved(do) operator(|)ident(t)operator(|) delimiter(?>)> - tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/tags/)inline<delimiter(#{)ident(t)operator(.)ident(name)delimiter(})>delimiter(")> attribute_name(style)operator(=)string<delimiter(")content(font-size:)inline<delimiter(#{)operator(()integer(1)operator(+)operator(()operator(()ident(t)operator(.)ident(popularity)operator(.)ident(to_i)operator(/)ident(sum)operator(.)ident(to_f)operator(\))operator(*)integer(2)operator(\))operator(\))operator(.)ident(to_s)operator([)integer(0)operator(..)integer(3)operator(])delimiter(})>content(em;)delimiter(")>tag(>)inline<delimiter(#{)ident(t)operator(.)ident(name)delimiter(})>tag(</a>) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline_delimiter(?>)> + inline<inline_delimiter(<?r) ident(all_tags)operator(.)ident(each) reserved(do) operator(|)ident(t)operator(|) inline_delimiter(?>)> + tag(<a) attribute_name(href)operator(=)string<delimiter(")content(/tags/)inline<inline_delimiter(#{)ident(t)operator(.)ident(name)inline_delimiter(})>delimiter(")> attribute_name(style)operator(=)string<delimiter(")content(font-size:)inline<inline_delimiter(#{)operator(()integer(1)operator(+)operator(()operator(()ident(t)operator(.)ident(popularity)operator(.)ident(to_i)operator(/)ident(sum)operator(.)ident(to_f)operator(\))operator(*)integer(2)operator(\))operator(\))operator(.)ident(to_s)operator([)integer(0)operator(..)integer(3)operator(])inline_delimiter(})>content(em;)delimiter(")>tag(>)inline<inline_delimiter(#{)ident(t)operator(.)ident(name)inline_delimiter(})>tag(</a>) + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(</div>) comment(<!-- #cloud -->) - inline<delimiter(<?r) reserved(end) delimiter(?>)> + inline<inline_delimiter(<?r) reserved(end) inline_delimiter(?>)> tag(</div>) comment(<!-- #left -->) tag(<render) attribute_name(href)operator(=)string<delimiter(")content(/right)delimiter(")> tag(/>) diff --git a/test/scanners/rhtml/day.expected.raydebug b/test/scanners/rhtml/day.expected.raydebug index 7440d64..9fe6074 100644 --- a/test/scanners/rhtml/day.expected.raydebug +++ b/test/scanners/rhtml/day.expected.raydebug @@ -1,26 +1,26 @@ -inline<delimiter(<%) ident(day)operator(,) ident(auftritte) operator(=) operator(*)ident(day) delimiter(-%>)> -inline<delimiter(<%) +inline<inline_delimiter(<%) ident(day)operator(,) ident(auftritte) operator(=) operator(*)ident(day) inline_delimiter(-%>)> +inline<inline_delimiter(<%) reserved(for) ident(auftritt) reserved(in) ident(auftritte) -delimiter(-%>)> +inline_delimiter(-%>)> tag(<tr>) tag(<td) attribute_name(class)operator(=)string<delimiter(")content(pplan_datum)delimiter(")>tag(>) - inline<delimiter(<%=) ident(colorize) ident(day)operator(.)ident(to_s)operator(()symbol(:dots)operator(\)) reserved(if) ident(day) delimiter(%>)> - inline<delimiter(<%) reserved(if) ident(day) reserved(and) ident(day)operator(.)ident(wday) operator(==) integer(6) delimiter(%>)>tag(<br) tag(/>)tag(<em>)plain(Samstag)tag(</em>)inline<delimiter(<%) reserved(end) delimiter(%>)> + inline<inline_delimiter(<%=) ident(colorize) ident(day)operator(.)ident(to_s)operator(()symbol(:dots)operator(\)) reserved(if) ident(day) inline_delimiter(%>)> + inline<inline_delimiter(<%) reserved(if) ident(day) reserved(and) ident(day)operator(.)ident(wday) operator(==) integer(6) inline_delimiter(%>)>tag(<br) tag(/>)tag(<em>)plain(Samstag)tag(</em>)inline<inline_delimiter(<%) reserved(end) inline_delimiter(%>)> tag(</td>) tag(<td) attribute_name(class)operator(=)string<delimiter(")content(pplan_zeit)delimiter(")>tag(>) - inline<delimiter(<%=) ident(colorize) ident(auftritt)operator(.)ident(time) delimiter(%>)> + inline<inline_delimiter(<%=) ident(colorize) ident(auftritt)operator(.)ident(time) inline_delimiter(%>)> tag(</td>) tag(<td) attribute_name(class)operator(=)string<delimiter(")content(pplan_stueck)delimiter(")>tag(>) - inline<delimiter(<%=) ident(colorize) ident(auftritt)operator(.)ident(program) delimiter(%>)> - inline<delimiter(<%=) ident(link_to) string<delimiter(')content(E)delimiter(')>operator(,) symbol(:controller) operator(=)operator(>) string<delimiter(')content(admin/auftritte)delimiter(')>operator(,) symbol(:action) operator(=)operator(>) symbol(:edit)operator(,) symbol(:id) operator(=)operator(>) ident(auftritt) delimiter(%>)> + inline<inline_delimiter(<%=) ident(colorize) ident(auftritt)operator(.)ident(program) inline_delimiter(%>)> + inline<inline_delimiter(<%=) ident(link_to) string<delimiter(')content(E)delimiter(')>operator(,) symbol(:controller) operator(=)operator(>) string<delimiter(')content(admin/auftritte)delimiter(')>operator(,) symbol(:action) operator(=)operator(>) symbol(:edit)operator(,) symbol(:id) operator(=)operator(>) ident(auftritt) inline_delimiter(%>)> tag(</td>) tag(<td) attribute_name(class)operator(=)string<delimiter(")content(pplan_besetzung)delimiter(")>tag(>) - inline<delimiter(<%=) ident(colorize)operator(()ident(auftritt)operator(.)ident(place)operator(,) string<delimiter(')content(Ort: )delimiter(')>operator(\)) operator(+) string<delimiter(')content(<br />)delimiter(')> reserved(unless) ident(auftritt)operator(.)ident(place)operator(.)ident(blank?) delimiter(%>)> + inline<inline_delimiter(<%=) ident(colorize)operator(()ident(auftritt)operator(.)ident(place)operator(,) string<delimiter(')content(Ort: )delimiter(')>operator(\)) operator(+) string<delimiter(')content(<br />)delimiter(')> reserved(unless) ident(auftritt)operator(.)ident(place)operator(.)ident(blank?) inline_delimiter(%>)> tag(</td>) tag(</tr>) -inline<delimiter(<%) +inline<inline_delimiter(<%) ident(day) operator(=) pre_constant(nil) reserved(end) -delimiter(-%>)> +inline_delimiter(-%>)> |