rouge 0.0.3 → 0.0.4

data/Gemfile

@@ -8,5 +8,7 @@ gem 'wrong', '~> 0.6.2'
 
 gem 'rake'
 
+gem 'redcarpet'
+
 # for visual tests
 gem 'sinatra'

data/lib/rouge.rb

@@ -4,8 +4,8 @@ require 'pathname'
 module Rouge
   class << self
     def highlight(text, lexer, formatter)
-      lexer = Lexer.find(lexer) unless lexer.is_a?(Lexer)
-      raise "unknown lexer #{lexer_name}" unless lexer
+      lexer = Lexer.find(lexer) unless lexer.respond_to? :lex
+      raise "unknown lexer #{lexer}" unless lexer
 
       formatter.render(lexer.lex(text))
     end
@@ -17,11 +17,15 @@ load load_dir.join('rouge/token.rb')
 load load_dir.join('rouge/lexer.rb')
 load load_dir.join('rouge/lexers/text.rb')
 load load_dir.join('rouge/lexers/diff.rb')
+
 load load_dir.join('rouge/lexers/shell.rb')
+
 load load_dir.join('rouge/lexers/javascript.rb')
 load load_dir.join('rouge/lexers/css.rb')
 load load_dir.join('rouge/lexers/html.rb')
 
+load load_dir.join('rouge/lexers/tcl.rb')
+
 load load_dir.join('rouge/formatter.rb')
 load load_dir.join('rouge/formatters/html.rb')
 

data/lib/rouge/lexer.rb

@@ -206,6 +206,14 @@ module Rouge
         stack.push(state.relative_state(state_name))
       end
 
+      def in_state?(state_name)
+        stack.map(&:name).include? state_name.to_s
+      end
+
+      def state?(state_name)
+        state_name.to_s == state.name
+      end
+
       delegate :debug, :lexer
 
       delegate :[], :scanner

data/lib/rouge/lexers/tcl.rb

@@ -0,0 +1,180 @@
+module Rouge
+  module Lexers
+    class TCLLexer < RegexLexer
+      tag 'tcl'
+
+      KEYWORDS = %w(
+        after apply array break catch continue elseif else error
+        eval expr for foreach global if namespace proc rename return
+        set switch then trace unset update uplevel upvar variable
+        vwait while
+      )
+
+      BUILTINS = %w(
+        append bgerror binary cd chan clock close concat dde dict
+        encoding eof exec exit fblocked fconfigure fcopy file
+        fileevent flush format gets glob history http incr info interp
+        join lappend lassign lindex linsert list llength load loadTk
+        lrange lrepeat lreplace lreverse lsearch lset lsort mathfunc
+        mathop memory msgcat open package pid pkg::create pkg_mkIndex
+        platform platform::shell puts pwd re_syntax read refchan
+        regexp registry regsub scan seek socket source split string
+        subst tell time tm unknown unload
+      )
+
+      OPEN =  %w| \( \[ \{ " |
+      CLOSE = %w| \) \] \} |
+      ALL = OPEN + CLOSE
+      END_LINE = CLOSE + %w(; \n)
+      END_WORD = END_LINE + %w(\s)
+
+      CHARS =     lambda { |list| Regexp.new %/[#{list.join}]/  }
+      NOT_CHARS = lambda { |list| Regexp.new %/[^#{list.join}]/ }
+
+      state :word do
+        rule /\{\*\}/, 'Keyword'
+
+        mixin :brace_abort
+        mixin :interp
+        rule /\{/, 'Punctuation', :brace
+        rule /\(/, 'Punctuation',   :paren
+        rule /"/,  'Literal.String.Double', :string
+        rule /#{NOT_CHARS[END_WORD]}+?(?=#{CHARS[OPEN+['\\\\']]})/, 'Text'
+      end
+
+      def self.gen_command_state(name='')
+        state(:"command#{name}") do
+          mixin :word
+
+          rule /##{NOT_CHARS[END_LINE]}+/, 'Comment.Single'
+
+          rule /(?=#{CHARS[END_WORD]})/ do
+            push :"params#{name}"
+          end
+
+          rule /#{NOT_CHARS[END_WORD]}+/ do |m|
+            if KEYWORDS.include? m[0]
+              token 'Keyword'
+            elsif BUILTINS.include? m[0]
+              token 'Name.Builtin'
+            else
+              token 'Text'
+            end
+          end
+
+          mixin :whitespace
+        end
+      end
+
+      def self.gen_delimiter_states(name, close, opts={})
+        gen_command_state("_in_#{name}")
+
+        state :"params_in_#{name}" do
+          rule close do
+            token 'Punctuation'
+            pop!; pop!
+          end
+
+          # mismatched delimiters.  Braced strings with mismatched
+          # closing delimiters should be okay, since this is standard
+          # practice, like {]]]]}
+          if opts[:strict]
+            rule CHARS[CLOSE - [close]], 'Error'
+          else
+            rule CHARS[CLOSE - [close]], 'Text'
+          end
+
+          mixin :params
+        end
+
+        state name do
+          rule close, 'Punctuation', :pop!
+          mixin :"command_in_#{name}"
+        end
+      end
+
+
+      # tcl is freaking impossible.  If we're in braces and we encounter
+      # a close brace, we have to drop everything and close the brace.
+      # This is so silly things like {abc"def} and {abc]def} don't b0rk
+      # everything after them.
+
+      # TODO: TCL seems to have this aborting behavior quite a lot.
+      # such things as [ abc" ] are a runtime error, but will still
+      # parse.  Currently something like this will muck up the lex.
+      state :brace_abort do
+        rule /}/ do
+          if in_state? :brace
+            pop! until state? :brace
+            pop!
+            token 'Punctuation'
+          else
+            token 'Error'
+          end
+        end
+      end
+
+      state :params do
+        rule /;/, 'Punctuation', :pop!
+        rule /\n/, 'Text', :pop!
+        rule /else|elseif|then/, 'Keyword'
+        mixin :word
+        mixin :whitespace
+        rule /#{NOT_CHARS[END_WORD]}+/, 'Text'
+      end
+
+      gen_delimiter_states :brace,   /\}/, :strict => false
+      gen_delimiter_states :paren,   /\)/, :strict => true
+      gen_delimiter_states :bracket, /\]/, :strict => true
+      gen_command_state
+
+      state :root do
+        mixin :command
+      end
+
+      state :whitespace do
+        # not a multiline regex because we want to capture \n sometimes
+        rule /\s+/, 'Text'
+      end
+
+      state :interp do
+        rule /\[/, 'Punctuation', :bracket
+        rule /\$[a-z0-9.:-]+/, 'Name.Variable'
+        rule /\$\{.*?\}/m, 'Name.Variable'
+        rule /\$/, 'Text'
+
+        # escape sequences
+        rule /\\[0-7]{3}/, 'Literal.String.Escape'
+        rule /\\x[0-9a-f]{2}/i, 'Literal.String.Escape'
+        rule /\\u[0-9a-f]{4}/i, 'Literal.String.Escape'
+        rule /\\./m, 'Literal.String.Escape'
+      end
+
+      state :string do
+        rule /"/, 'Literal.String.Double', :pop!
+        mixin :interp
+        rule /[^\\\[\$"{}]+/m, 'Literal.String.Double'
+
+        # strings have to keep count of their internal braces, to support
+        # for example { "{ }" }.
+        rule /{/ do
+          @brace_count ||= 0
+          @brace_count += 1
+
+          token 'Literal.String.Double'
+        end
+
+        rule /}/ do
+          if in_state? :brace and @brace_count.to_i == 0
+            pop! until state? :brace
+            pop!
+            token 'Punctuation'
+          else
+            @brace_count -= 1
+            token 'Literal.String.Double'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/text.rb

@@ -4,7 +4,7 @@ module Rouge
       tag 'text'
 
       def stream_tokens(stream, &b)
-        yield Token['Text'], stream
+        yield Token['Text'], stream.string
       end
     end
   end

data/lib/rouge/plugins/redcarpet.rb

@@ -0,0 +1,19 @@
+# this file is not require'd from the root.  To use this plugin, run:
+#
+#    require 'rouge/plugins/redcarpet'
+
+# this plugin depends on redcarpet
+require 'redcarpet'
+
+module Rouge
+  module Plugins
+    module Redcarpet
+      def block_code(code, language)
+        lexer = Lexer.find(language) || Lexers::Text
+        formatter = Formatters::HTML.new(:css_class => "highlight #{lexer.tag}")
+
+        Rouge.highlight(code, lexer, formatter)
+      end
+    end
+  end
+end

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.0.3"
+    "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,9 @@ files:
 - lib/rouge/lexers/diff.rb
 - lib/rouge/lexers/text.rb
 - lib/rouge/lexers/html.rb
+- lib/rouge/lexers/tcl.rb
 - lib/rouge/lexers/css.rb
+- lib/rouge/plugins/redcarpet.rb
 - lib/rouge/themes/thankful_eyes.rb
 - lib/rouge/themes/colorful.rb
 - lib/rouge/token.rb