rubylexer 0.7.4 → 0.7.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.7.5/5-23-2009
+* 1 Bugfix:
+  * fixed problem with parsing shebang lines
+
 === 0.7.4/5-20-2009
 * 2 Major Enhancements:
   * preliminary support for ruby 1.9

data/lib/rubylexer.rb

@@ -202,7 +202,7 @@ class RubyLexer
      if @file.skip( /\A#!/ )
        loop do
          til_charset( /[\s\v]/ )
-         break if @file.skip( / ([^-\s\v]|--[\s\v])/,4 )
+         break if @file.match( / ([^-\s\v]|--[\s\v])/,4 )
          if @file.skip( /.-K(.)/ )
            case $1
            when 'u'; @encoding=:utf8
@@ -977,7 +977,6 @@ private
          loop do
            offset=input_position
            @file.scan(/\A(#@@WSTOKS)?(#@@UCLETTER#@@LETTER_DIGIT*)(::)?/o)
-           #this regexp---^ will need to change in order to support utf8 properly.
            md=@file.last_match
            all,ws,name,dc=*md
            if ws
@@ -1020,13 +1019,14 @@ private
          @parsestack.push ExpectThenOrNlContext.new(str,@linenum)
          return result
    end
+
    def keyword_begin(str,offset,result)   
          result.first.has_end!
          @parsestack.push WantsEndContext.new(str,@linenum)
          return result
    end
-
    alias keyword_case keyword_begin
+
    def keyword_while(str,offset,result) #could be infix form without end
          if after_nonid_op?{false} #prefix form
            result.first.has_end!
@@ -1038,7 +1038,6 @@ private
          end
          return result
    end
-
    alias keyword_until keyword_while
 
    def keyword_for(str,offset,result)
@@ -1050,6 +1049,7 @@ private
          @parsestack.push ForSMContext.new(@linenum)
          return result
    end
+
    def keyword_do(str,offset,result)
          result.unshift(*abort_noparens_for_do!(str))
          if ExpectDoOrNlContext===@parsestack.last
@@ -2153,7 +2153,6 @@ end
       @offset_adjust=@min_offset_adjust
 
       @moretokens.unshift(*optional_here_bodies)
-      result=@moretokens.shift
 
       #adjust line count in fal to account for newlines in here bodys
       i=@moretokens.size-1
@@ -2168,12 +2167,13 @@ end
       end
 
       if pre_fal
-        @moretokens.unshift result
+        result=@moretokens.first
         pre.offset=result.offset
-        result=pre
+        @moretokens.unshift pre
       end
       start_of_line_directives
 
+      result=@moretokens.shift
       return result
    end
 

data/lib/rubylexer/version.rb

@@ -1,3 +1,3 @@
 class RubyLexer
-  VERSION='0.7.4'
+  VERSION='0.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubylexer
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Caleb Clausen
@@ -9,7 +9,7 @@ autorequire:
 bindir: ""
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency