Merge branch 'master' into go-scanner

Conflicts:
	lib/coderay/helpers/file_type.rb

1 files changed, 16 insertions, 0 deletions

diff --git a/test/samples/scanner.expected b/test/samples/scanner.expected
new file mode 100644
index 0000000..5015168
--- /dev/null
+++ b/test/samples/scanner.expected
@@ -0,0 +1,16 @@
+C Code: if (*p == '{') nest++;
+
+> print only operators:
+(*==)++;
+------------------------------
+
+Ruby Code: ruby_code(:can, BE, %r[q[ui]te #{ /comple/x },] => $-s, &?\xee)
+
+> has a string?
+false
+
+> number of regexps?
+2
+
+> has a string?
+"ruby_code" (ident), "(" (operator), ":can" (symbol), "," (operator), " " (space), "BE" (constant), "," (operator), " " (space), "%r[" (delimiter), "q" (content), "[" (nesting_delimiter), "ui" (content), "]" (nesting_delimiter), "te " (content), "#{" (inline_delimiter), " " (space), "/" (delimiter), "comple" (content), "/" (delimiter), "x" (modifier), " " (space), "}" (inline_delimiter), "," (content), "]" (delimiter), " " (space), "=" (operator), ">" (operator), " " (space), "$-s" (global_variable), "," (operator), " " (space), "&" (operator), "?\xee" (integer), ")" (operator)