visionmedia-lightr 0.0.3 → 0.0.4

data/History.rdoc

@@ -1,4 +1,10 @@
 
+=== 0.0.4 / 2009-03-07
+
+* Added ruby string alternative (:"foo bar")
+* Added class / inst vars for Ruby grammar
+* Fixed; Ids should start with alpha / _
+
 === 0.0.3 / 2009-03-07
 
 * Added C example

data/examples/ruby.rb

@@ -12,6 +12,10 @@ module Foo
       @n = n  
     end
     
+    def foo
+      return :"this works too"
+    end
+    
   end
 end
 }

data/lib/lightr/grammars/c.rb

@@ -4,7 +4,8 @@
 
 module Lightr
   class C
-    include Grammar 
+    include Grammar
+    id  = /\w[\w\d]*/
     int = /\d+/
     match :keyword, /(NULL|if|else|asm|auto|break|case|char|const|continue|default|do|double|enum|extern|float|for|goto|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)(?:\n|\z| )/
     match :string,  /'.*?'|".*?"/

data/lib/lightr/grammars/javascript.rb

@@ -2,7 +2,7 @@
 module Lightr
   class JavaScript
     include Grammar 
-    id  = /[\w\d]*/
+    id  = /\w[\w\d]*/
     int = /\d+/
     match :keyword,     /(if|else|throw|break|case|catch|continue|default|delete|do|double|true|false|final|finally|float|for|function|int|instanceof|in|long|new|null|return|short|switch|throw|try|typeof|var|void|while|with)(?:\n|\z| )/
     match :string,      /'.*?'|".*?"/

data/lib/lightr/grammars/ruby.rb

@@ -10,15 +10,17 @@
 module Lightr
   class Ruby
     include Grammar 
-    id  = /[\w\d]*/
+    id  = /\w[\w\d]*/
     int = /\d[\d_]*/
+    string = /'.*?'|".*?"/
     match :keyword,  /(if|else|elsif|unless|retry|super|then|true|while|until|class|module|defined|end|in|alias|BEGIN|END|begin|break|def|do|nil|not|or|and|redo|rescue|return|yield)(?:\n|\z| )/
-    match :string,   /'.*?'|".*?"/
+    match :symbol,   /:(#{id}|#{string})/
+    match :string,   string
     match :regexp,   %r{/.*?/[\w]*}
     match :self,     /self/
     match :comment,  /#.*?(\n|\z)/
     match :constant, /[A-Z]#{id}/
-    match :symbol,   /:#{id}/
+    match :variable, /@@?#{id}/
     match :number,   /-?#{int}(?:\.#{int})?/
     match nil,       /\n|\s|.+?/
   end

data/lib/lightr/version.rb

@@ -1,4 +1,4 @@
 
 module Lightr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lightr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lightr}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

data/spec/grammars/ruby_spec.rb

@@ -9,6 +9,7 @@ describe Lightr::Ruby do
 
     it 'symbols' do
       parse('a :symbol').should include('class="symbol">:symbol')
+      parse(':"foo bar" test').should include('class="symbol">:&quot;foo bar&quot;<')
     end
     
     it 'strings' do
@@ -33,6 +34,14 @@ describe Lightr::Ruby do
       parse('/test/sex test').should include('class="regexp">/test/sex<')
     end
     
+    it "instance variables" do
+      parse('@foo_1').should include('class="variable">@foo_1<')
+    end
+    
+    it "class variables" do
+      parse('@@__bar').should include('class="variable">@@__bar<')
+    end
+    
     %w( 11 1_000 1.1 1.100_00 ).each do |number|
       it "#{number} as number" do
         parse(number).should include('class="number"')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-lightr
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - TJ Holowaychuk