bibtex-ruby 1.3.11 → 1.3.12

data/lib/bibtex/lexer.rb

@@ -17,7 +17,6 @@
 #++
 
 require 'strscan'
-require 'forwardable'
 
 module BibTeX
 	
@@ -26,13 +25,11 @@ module BibTeX
 	#
 	class Lexer
 	  extend Forwardable
-    include Enumerable
 
 		attr_reader :options, :stack, :mode, :scanner
 		attr_writer :mode
 		
     def_delegator :@scanner, :string, :data
-    def_delegators :@stack, :each
 
     DEFAULTS = { :include => [:errors], :strict => true }.freeze
     

data/lib/bibtex/name_parser.rb

@@ -11,7 +11,7 @@ require 'strscan'
 module BibTeX
   class NameParser < Racc::Parser
 
-module_eval(<<'...end names.y/module_eval...', 'names.y', 78)
+module_eval(<<'...end names.y/module_eval...', 'names.y', 94)
   
   def initialize(options = {})
     self.options.merge!(options)
@@ -104,18 +104,18 @@ module_eval(<<'...end names.y/module_eval...', 'names.y', 78)
   def scan_literal
     @brace_level = 1
 
- 		while @brace_level > 0
-			@word[1] << @src.scan_until(/[\{\}]/o).to_s
-
-    	case @src.matched
-			when '{'
-				@brace_level += 1
-			when '}'
-				@brace_level -= 1
-			else
-				@brace_level = 0
-				error_unbalanced
-			end
+    while @brace_level > 0
+      @word[1] << @src.scan_until(/[\{\}]/o).to_s
+
+      case @src.matched
+      when '{'
+        @brace_level += 1
+      when '}'
+        @brace_level -= 1
+      else
+        @brace_level = 0
+        error_unbalanced
+      end
     end
   end
 
@@ -186,7 +186,7 @@ racc_goto_default = [
 racc_reduce_table = [
   0, 0, :racc_error,
   0, 9, :_reduce_1,
-  1, 9, :_reduce_2,
+  1, 9, :_reduce_none,
   1, 10, :_reduce_3,
   3, 10, :_reduce_4,
   1, 11, :_reduce_5,
@@ -196,24 +196,24 @@ racc_reduce_table = [
   3, 11, :_reduce_9,
   4, 11, :_reduce_10,
   5, 11, :_reduce_11,
-  1, 14, :_reduce_12,
+  1, 14, :_reduce_none,
   2, 14, :_reduce_13,
   3, 14, :_reduce_14,
-  1, 15, :_reduce_15,
-  1, 15, :_reduce_16,
+  1, 15, :_reduce_none,
+  1, 15, :_reduce_none,
   1, 16, :_reduce_17,
   3, 16, :_reduce_18,
-  1, 13, :_reduce_19,
+  1, 13, :_reduce_none,
   2, 13, :_reduce_20,
-  1, 18, :_reduce_21,
-  1, 18, :_reduce_22,
-  1, 19, :_reduce_23,
+  1, 18, :_reduce_none,
+  1, 18, :_reduce_none,
+  1, 19, :_reduce_none,
   2, 19, :_reduce_24,
-  0, 17, :_reduce_25,
-  1, 17, :_reduce_26,
-  1, 12, :_reduce_27,
-  1, 12, :_reduce_28,
-  1, 12, :_reduce_29 ]
+  0, 17, :_reduce_none,
+  1, 17, :_reduce_none,
+  1, 12, :_reduce_none,
+  1, 12, :_reduce_none,
+  1, 12, :_reduce_none ]
 
 racc_reduce_n = 30
 
@@ -284,201 +284,143 @@ module_eval(<<'.,.,', 'names.y', 31)
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 32)
-  def _reduce_2(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 2 omitted
 
-module_eval(<<'.,.,', 'names.y', 34)
+module_eval(<<'.,.,', 'names.y', 33)
   def _reduce_3(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 35)
+module_eval(<<'.,.,', 'names.y', 34)
   def _reduce_4(val, _values, result)
      result << val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 37)
+module_eval(<<'.,.,', 'names.y', 38)
   def _reduce_5(val, _values, result)
-     result = Name.new(:last => val[0]) 
+             result = Name.new(:last => val[0])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 38)
+module_eval(<<'.,.,', 'names.y', 42)
   def _reduce_6(val, _values, result)
-     result = Name.new(:first => val[0], :last => val[1]) 
+             result = Name.new(:first => val[0], :last => val[1])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 39)
+module_eval(<<'.,.,', 'names.y', 46)
   def _reduce_7(val, _values, result)
-     result = Name.new(:first => val[0], :von => val[1], :last => val[2]) 
+             result = Name.new(:first => val[0], :von => val[1], :last => val[2])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 40)
+module_eval(<<'.,.,', 'names.y', 50)
   def _reduce_8(val, _values, result)
-     result = Name.new(:von => val[0], :last => val[1]) 
+             result = Name.new(:von => val[0], :last => val[1])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 41)
+module_eval(<<'.,.,', 'names.y', 54)
   def _reduce_9(val, _values, result)
-     result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1]) 
+             result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 42)
+module_eval(<<'.,.,', 'names.y', 58)
   def _reduce_10(val, _values, result)
-     result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1]) 
+             result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 43)
+module_eval(<<'.,.,', 'names.y', 62)
   def _reduce_11(val, _values, result)
-     result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1]) 
+             result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1])
+       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 45)
-  def _reduce_12(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 12 omitted
 
-module_eval(<<'.,.,', 'names.y', 46)
+module_eval(<<'.,.,', 'names.y', 67)
   def _reduce_13(val, _values, result)
      result = val.join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 47)
+module_eval(<<'.,.,', 'names.y', 68)
   def _reduce_14(val, _values, result)
      result = val.join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 49)
-  def _reduce_15(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 15 omitted
 
-module_eval(<<'.,.,', 'names.y', 50)
-  def _reduce_16(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 16 omitted
 
-module_eval(<<'.,.,', 'names.y', 52)
+module_eval(<<'.,.,', 'names.y', 72)
   def _reduce_17(val, _values, result)
      result = [nil,val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 53)
+module_eval(<<'.,.,', 'names.y', 73)
   def _reduce_18(val, _values, result)
      result = [val[0],val[2]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 55)
-  def _reduce_19(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 19 omitted
 
-module_eval(<<'.,.,', 'names.y', 56)
+module_eval(<<'.,.,', 'names.y', 76)
   def _reduce_20(val, _values, result)
-     result = val[0,2].join(' ') 
+     result = val.join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 58)
-  def _reduce_21(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 21 omitted
 
-module_eval(<<'.,.,', 'names.y', 59)
-  def _reduce_22(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 22 omitted
 
-module_eval(<<'.,.,', 'names.y', 61)
-  def _reduce_23(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 23 omitted
 
-module_eval(<<'.,.,', 'names.y', 62)
+module_eval(<<'.,.,', 'names.y', 81)
   def _reduce_24(val, _values, result)
-     result = val[0,2].join(' ') 
+     result = val.join(' ') 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'names.y', 64)
-  def _reduce_25(val, _values, result)
-     result = nil 
-    result
-  end
-.,.,
+# reduce 25 omitted
 
-module_eval(<<'.,.,', 'names.y', 65)
-  def _reduce_26(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 26 omitted
 
-module_eval(<<'.,.,', 'names.y', 67)
-  def _reduce_27(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 27 omitted
 
-module_eval(<<'.,.,', 'names.y', 68)
-  def _reduce_28(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 28 omitted
 
-module_eval(<<'.,.,', 'names.y', 69)
-  def _reduce_29(val, _values, result)
-     result = val[0] 
-    result
-  end
-.,.,
+# reduce 29 omitted
 
 def _reduce_none(val, _values, result)
   val[0]

data/lib/bibtex/names.y

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 #
-# A BibTeX grammar for the parser generator +racc+
+# A BibTeX Names grammar for the parser generator +racc+
 #
 
 # -*- racc -*-
@@ -29,45 +29,61 @@ expect 0
 
 rule
 
-  result :                           { result = [] }
-         | names                     { result = val[0] }
+  result : { result = [] } | names
 
-  names : name                       { result = [val[0]] }
-        | names AND name             { result << val[2] }
+  names : name           { result = [val[0]] }
+        | names AND name { result << val[2] }
   
-	name : word                          { result = Name.new(:last => val[0]) }
-       | u_words word                  { result = Name.new(:first => val[0], :last => val[1]) }
-       | u_words von last              { result = Name.new(:first => val[0], :von => val[1], :last => val[2]) }
-       | von last                      { result = Name.new(:von => val[0], :last => val[1]) }
-       | last COMMA first              { result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1]) }
-       | von last COMMA first          { result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1]) }
-       | u_words von last COMMA first  { result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1]) }
-
-  von : LWORD                        { result = val[0] }
-      | von LWORD                    { result = val.join(' ') }
-      | von u_words LWORD            { result = val.join(' ') }
-
-	last : LWORD                       { result = val[0] }
-	     | u_words                     { result = val[0] }
+  name : word
+       {
+         result = Name.new(:last => val[0])
+       }
+       | u_words word
+       {
+         result = Name.new(:first => val[0], :last => val[1])
+       }
+       | u_words von last
+       {
+         result = Name.new(:first => val[0], :von => val[1], :last => val[2])
+       }
+       | von last
+       {
+         result = Name.new(:von => val[0], :last => val[1])
+       }
+       | last COMMA first
+       {
+         result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1])
+       }
+       | von last COMMA first
+       {
+         result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1])
+       }
+       | u_words von last COMMA first
+       {
+         result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1])
+       }
+       ;
+
+  von : LWORD
+      | von LWORD         { result = val.join(' ') }
+      | von u_words LWORD { result = val.join(' ') }
+
+  last : LWORD | u_words
   
-  first : opt_words                  { result = [nil,val[0]] }
-        | opt_words COMMA opt_words  { result = [val[0],val[2]] }
+  first : opt_words                 { result = [nil,val[0]] }
+        | opt_words COMMA opt_words { result = [val[0],val[2]] }
   
-  u_words : u_word                   { result = val[0] }
-          | u_words u_word           { result = val[0,2].join(' ') }
+  u_words : u_word
+          | u_words u_word { result = val.join(' ') }
 
-  u_word : UWORD                     { result = val[0] }
-         | PWORD                     { result = val[0] }
+  u_word : UWORD | PWORD
 
-  words : word                       { result = val[0] }
-        | words word                 { result = val[0,2].join(' ') }
+  words : word
+        | words word { result = val.join(' ') }
 
-  opt_words :                        { result = nil }
-            | words                  { result = val[0] }
+  opt_words : /* empty */ | words
   
-  word : LWORD                       { result = val[0] }
-       | UWORD                       { result = val[0] }
-       | PWORD                       { result = val[0] }
+  word : LWORD | UWORD | PWORD
 
 end
 
@@ -167,18 +183,18 @@ require 'strscan'
   def scan_literal
     @brace_level = 1
 
- 		while @brace_level > 0
-			@word[1] << @src.scan_until(/[\{\}]/o).to_s
-
-    	case @src.matched
-			when '{'
-				@brace_level += 1
-			when '}'
-				@brace_level -= 1
-			else
-				@brace_level = 0
-				error_unbalanced
-			end
+    while @brace_level > 0
+      @word[1] << @src.scan_until(/[\{\}]/o).to_s
+
+      case @src.matched
+      when '{'
+        @brace_level += 1
+      when '}'
+        @brace_level -= 1
+      else
+        @brace_level = 0
+        error_unbalanced
+      end
     end
   end