rexical 1.0.4 → 1.0.5.beta1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 1.0.5 / Not released
+
+* Bug fixes
+
+  * Scanners with nested classes work better
+
 === 1.0.4
 
 * Bug fixes

data/lib/rexical.rb

@@ -2,7 +2,7 @@ require 'rexical/generator'
 require 'rexical/rexcmd'
 
 module Rexical
-  VERSION = "1.0.4"
+  VERSION = "1.0.5.beta1"
   Copyright = 'Copyright (c) 2005-2006 ARIMA Yasuhiro'
   Mailto    = 'arima.yasuhiro@nifty.com'
 end

data/lib/rexical/generator.rb

@@ -151,13 +151,7 @@ module Rexical
           if ss.scan(/class/)
             state1  =  :CLASS
             st  =  ss.post_match.strip
-            if st =~ /^(\S+)::(\S+)/
-              @module_name  =  $1
-              @class_name  =  $2
-            else
-              @module_name  =  nil
-              @class_name  =  st
-            end
+            @class_name  =  st
           else
             add_header  st
           end
@@ -333,6 +327,7 @@ REX_UTIL = <<-REX_EOT
     scan_setup(str)
     do_parse
   end
+  alias :scan :scan_str
 
   def load_file( filename )
     @filename = filename
@@ -390,9 +385,6 @@ REX_EOT
       @scanner_header.each_line do |s|
         f.print s
       end
-      if @module_name
-        f.puts "module #{@module_name}"
-      end
       if @opt['--independent']
         f.puts "class #{@class_name}"
       else
@@ -484,7 +476,6 @@ REX_EOT
         f.print s
       end
       f.puts "end # class"
-      f.puts "end # module"  if @module_name
 
       ## footer
       @scanner_footer.each_line do |s|

data/lib/rexical/rexcmd.rb

@@ -63,7 +63,7 @@ EOT
   def initialize
     @status  =  2
     @cmd  =  File.basename($0, ".rb")
-    tmp  =  OPTIONS.collect do |line|
+    tmp  =  OPTIONS.lines.collect do |line|
         next if /\A\s*\z/ === line
         disp, sopt, lopt, takearg, doc  =  line.strip.split(/\s+/, 5)
         a  =  []
@@ -91,11 +91,11 @@ EOT
     usage    if @opt['--help']
 
     if @opt['--version']
-      puts "#{@cmd} version #{Rexical::Version}"
+      puts "#{@cmd} version #{Rexical::VERSION}"
       exit 0
     end
     if @opt['--copyright']
-      puts "#{@cmd} version #{Rexical::Version}"
+      puts "#{@cmd} version #{Rexical::VERSION}"
       puts "#{Rexical::Copyright} <#{Rexical::Mailto}>"
       exit 0
     end
@@ -109,7 +109,7 @@ Usage: #{@cmd} [options] <grammar file>
 Options:
     EOT
 
-    OPTIONS.each do |line|
+    OPTIONS.each_line do |line|
       next if line.strip.empty?
       if /\A\s*\z/ === line
         f.puts

data/test/rex-20060125.rb

@@ -99,11 +99,11 @@ def get_options
   usage    if opt['--help']
 
   if opt['--version']
-    puts "#{$cmd} version #{Rex::Version}"
+    puts "#{$cmd} version #{Rex::VERSION}"
     exit 0
   end
   if opt['--copyright']
-    puts "#{$cmd} version #{Rex::Version}"
+    puts "#{$cmd} version #{Rex::VERSION}"
     puts "#{Rex::Copyright} <#{Rex::Mailto}>"
     exit 0
   end

data/test/rex-20060511.rb

@@ -97,11 +97,11 @@ class RexRunner
     usage    if @opt['--help']
 
     if @opt['--version']
-      puts "#{@cmd} version #{Rex::Version}"
+      puts "#{@cmd} version #{Rex::VERSION}"
       exit 0
     end
     if @opt['--copyright']
-      puts "#{@cmd} version #{Rex::Version}"
+      puts "#{@cmd} version #{Rex::VERSION}"
       puts "#{Rex::Copyright} <#{Rex::Mailto}>"
       exit 0
     end

data/test/test_generator.rb

@@ -33,6 +33,20 @@ class TestGenerator < Test::Unit::TestCase
     end
   end
 
+  def test_scanner_nests_classes
+    source = parse_lexer %q{
+module Foo
+class Baz::Calculator < Bar
+rule
+  \d+       { [:NUMBER, text.to_i] }
+  \s+       { [:S, text] }
+end
+end
+    }
+
+    assert_match 'Baz::Calculator < Bar', source
+  end
+
   def test_scanner_inherits
     source = parse_lexer %q{
 class Calculator < Bar

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rexical
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  hash: -1848230071
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 5
+  - beta1
+  version: 1.0.5.beta1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,19 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2010-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.1
-    version: 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id002
 description: |-
   Rexical is a lexical scanner generator.
   It is written in Ruby itself, and generates Ruby program.
@@ -86,21 +115,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ruby-rex
-rubygems_version: 1.3.4
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rexical is a lexical scanner generator