RubyGems - bibtex-ruby - Versions diffs - 1.3.5 → 1.3.6 - Mend

bibtex-ruby 1.3.5 → 1.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of bibtex-ruby might be problematic. Click here for more details.

Files changed (24) hide show

data/Gemfile.lock +4 -2
data/History.txt +5 -0
data/Manifest +4 -0
data/README.md +9 -12
data/bibtex-ruby.gemspec +1 -0
data/features/issues/braced_strings.feature +48 -0
data/features/issues/trailing_comma.feature +21 -0
data/features/step_definitions/bibtex_steps.rb +9 -1
data/features/strings.feature +1 -0
data/lib/bibtex/bibliography.rb +25 -22
data/lib/bibtex/bibtex.y +11 -23
data/lib/bibtex/elements.rb +11 -13
data/lib/bibtex/entry.rb +4 -2
data/lib/bibtex/lexer.rb +142 -163
data/lib/bibtex/names.rb +10 -10
data/lib/bibtex/parser.output +135 -132
data/lib/bibtex/parser.rb +69 -81
data/lib/bibtex/utilities.rb +1 -1
data/lib/bibtex/version.rb +1 -1
data/test/bibtex/test_lexer.rb +11 -0
data/test/fixtures/benchmark.bib +1 -1
data/test/profile.dot +129 -74
data/test/profile.rb +4 -2
metadata +18 -3

data/lib/bibtex/names.rb CHANGED Viewed

@@ -124,13 +124,13 @@ module BibTeX
       [prefix, last, first, suffix].compact.join(' ')
     end
-    alias :display :display_order
+    alias display display_order
     def sort_order
       [[prefix,last].compact.join(' '), suffix, first].compact.join(', ')
     end
-    alias :to_s :sort_order
+    alias to_s sort_order
     def <=>(other)
       other.is_a?(Name) ? [last, prefix, first, suffix].compact.join(' ') <=> [other.last, other.prefix, other.first, other.suffix].compact.join(' ') : super
@@ -158,14 +158,14 @@ module BibTeX
       hash
     end
-    alias :family :last
-    alias :family= :last=
-    alias :given :first
-    alias :given= :first=
-    alias :jr :suffix
-    alias :jr= :suffix=
-    alias :von :prefix
-    alias :von= :prefix=
+    alias family last
+    alias family= last=
+    alias given first
+    alias given= first=
+    alias jr suffix
+    alias jr= suffix=
+    alias von prefix
+    alias von= prefix=
   end
 end

data/lib/bibtex/parser.output CHANGED Viewed

@@ -22,20 +22,20 @@ rule 17 string_assignment: NAME EQ string_value
 rule 18 string_value: string_literal
 rule 19 string_value: string_value SHARP string_literal
 rule 20 string_literal: NAME
-rule 21 string_literal: STRING_LITERAL
-rule 22 entry: entry_head assignments RBRACE
-rule 23 entry: entry_head assignments COMMA RBRACE
-rule 24 entry: entry_head RBRACE
-rule 25 entry_head: NAME LBRACE key COMMA
-rule 26 key: NAME
-rule 27 key: NUMBER
-rule 28 key: NUMBER NAME
-rule 29 assignments: assignment
-rule 30 assignments: assignments COMMA assignment
-rule 31 assignment: NAME EQ value
-rule 32 value: string_value
-rule 33 value: NUMBER
-rule 34 value: LBRACE content RBRACE
+rule 21 string_literal: LBRACE content RBRACE
+rule 22 string_literal: STRING_LITERAL
+rule 23 entry: entry_head assignments RBRACE
+rule 24 entry: entry_head assignments COMMA RBRACE
+rule 25 entry: entry_head RBRACE
+rule 26 entry_head: NAME LBRACE key COMMA
+rule 27 key: NAME
+rule 28 key: NUMBER
+rule 29 key: NUMBER NAME
+rule 30 assignments: assignment
+rule 31 assignments: assignments COMMA assignment
+rule 32 assignment: NAME EQ value
+rule 33 value: string_value
+rule 34 value: NUMBER
 ------- Symbols -------
@@ -67,54 +67,54 @@ rule 34 value: LBRACE content RBRACE
     on left : 15
   entry (25)
     on right: 11
-    on left : 22 23 24
+    on left : 23 24 25
   content (26)
-    on right: 12 34
+    on right: 12 21
     on left : 13 14
   string_value (27)
-    on right: 15 17 19 32
+    on right: 15 17 19 33
     on left : 18 19
   string_assignment (28)
     on right: 16
     on left : 17
   string_literal (29)
     on right: 18 19
-    on left : 20 21
+    on left : 20 21 22
   entry_head (30)
-    on right: 22 23 24
-    on left : 25
+    on right: 23 24 25
+    on left : 26
   assignments (31)
-    on right: 22 23 30
-    on left : 29 30
+    on right: 23 24 31
+    on left : 30 31
   key (32)
-    on right: 25
-    on left : 26 27 28
+    on right: 26
+    on left : 27 28 29
   assignment (33)
-    on right: 29 30
-    on left : 31
+    on right: 30 31
+    on left : 32
   value (34)
-    on right: 31
-    on left : 32 33 34
+    on right: 32
+    on left : 33 34
 **Terminals, with rules where they appear
   $end (0)
   error (1)
   AT (2) 5
-  COMMA (3) 23 25 30
+  COMMA (3) 24 26 31
   COMMENT (4) 12
   CONTENT (5) 14
   ERROR (6) 7
-  EQ (7) 17 31
-  LBRACE (8) 12 15 16 25 34
+  EQ (7) 17 32
+  LBRACE (8) 12 15 16 21 26
   META_CONTENT (9) 6
-  NAME (10) 17 20 25 26 28 31
-  NUMBER (11) 27 28 33
+  NAME (10) 17 20 26 27 29 32
+  NUMBER (11) 28 29 34
   PREAMBLE (12) 15
-  RBRACE (13) 12 15 16 22 23 24 34
+  RBRACE (13) 12 15 16 21 23 24 25
   SHARP (14) 19
   STRING (15) 16
-  STRING_LITERAL (16) 21
+  STRING_LITERAL (16) 22
 --------- State ---------
@@ -256,9 +256,9 @@ state 16
 state 17
-  22) entry : entry_head _ assignments RBRACE
-  23) entry : entry_head _ assignments COMMA RBRACE
-  24) entry : entry_head _ RBRACE
+  23) entry : entry_head _ assignments RBRACE
+  24) entry : entry_head _ assignments COMMA RBRACE
+  25) entry : entry_head _ RBRACE
   NAME          shift, and go to state 26
   RBRACE        shift, and go to state 24
@@ -268,7 +268,7 @@ state 17
 state 18
-  25) entry_head : NAME _ LBRACE key COMMA
+  26) entry_head : NAME _ LBRACE key COMMA
   LBRACE        shift, and go to state 27
@@ -292,8 +292,9 @@ state 21
   15) preamble : PREAMBLE LBRACE _ string_value RBRACE
+  LBRACE        shift, and go to state 33
   NAME          shift, and go to state 32
-  STRING_LITERAL  shift, and go to state 33
+  STRING_LITERAL  shift, and go to state 34
   string_value  go to state 30
   string_literal  go to state 31
@@ -302,55 +303,55 @@ state 22
   16) string : STRING LBRACE _ string_assignment RBRACE
-  NAME          shift, and go to state 35
+  NAME          shift, and go to state 36
-  string_assignment  go to state 34
+  string_assignment  go to state 35
 state 23
-  22) entry : entry_head assignments _ RBRACE
-  23) entry : entry_head assignments _ COMMA RBRACE
-  30) assignments : assignments _ COMMA assignment
+  23) entry : entry_head assignments _ RBRACE
+  24) entry : entry_head assignments _ COMMA RBRACE
+  31) assignments : assignments _ COMMA assignment
-  COMMA         shift, and go to state 37
-  RBRACE        shift, and go to state 36
+  COMMA         shift, and go to state 38
+  RBRACE        shift, and go to state 37
 state 24
-  24) entry : entry_head RBRACE _
+  25) entry : entry_head RBRACE _
-  $default      reduce using rule 24 (entry)
+  $default      reduce using rule 25 (entry)
 state 25
-  29) assignments : assignment _
+  30) assignments : assignment _
-  $default      reduce using rule 29 (assignments)
+  $default      reduce using rule 30 (assignments)
 state 26
-  31) assignment : NAME _ EQ value
+  32) assignment : NAME _ EQ value
-  EQ            shift, and go to state 38
+  EQ            shift, and go to state 39
 state 27
-  25) entry_head : NAME LBRACE _ key COMMA
+  26) entry_head : NAME LBRACE _ key COMMA
-  NAME          shift, and go to state 40
-  NUMBER        shift, and go to state 41
+  NAME          shift, and go to state 41
+  NUMBER        shift, and go to state 42
-  key           go to state 39
+  key           go to state 40
 state 28
   12) comment : COMMENT LBRACE content _ RBRACE
-  RBRACE        shift, and go to state 42
+  RBRACE        shift, and go to state 43
 state 29
@@ -365,8 +366,8 @@ state 30
   15) preamble : PREAMBLE LBRACE string_value _ RBRACE
   19) string_value : string_value _ SHARP string_literal
-  RBRACE        shift, and go to state 43
-  SHARP         shift, and go to state 44
+  RBRACE        shift, and go to state 44
+  SHARP         shift, and go to state 45
 state 31
@@ -385,204 +386,206 @@ state 32
 state 33
-  21) string_literal : STRING_LITERAL _
+  21) string_literal : LBRACE _ content RBRACE
-  $default      reduce using rule 21 (string_literal)
+  CONTENT       shift, and go to state 29
+  $default      reduce using rule 13 (content)
+  content       go to state 46
 state 34
-  16) string : STRING LBRACE string_assignment _ RBRACE
+  22) string_literal : STRING_LITERAL _
-  RBRACE        shift, and go to state 45
+  $default      reduce using rule 22 (string_literal)
 state 35
-  17) string_assignment : NAME _ EQ string_value
+  16) string : STRING LBRACE string_assignment _ RBRACE
-  EQ            shift, and go to state 46
+  RBRACE        shift, and go to state 47
 state 36
-  22) entry : entry_head assignments RBRACE _
+  17) string_assignment : NAME _ EQ string_value
-  $default      reduce using rule 22 (entry)
+  EQ            shift, and go to state 48
 state 37
-  23) entry : entry_head assignments COMMA _ RBRACE
-  30) assignments : assignments COMMA _ assignment
+  23) entry : entry_head assignments RBRACE _
-  NAME          shift, and go to state 26
-  RBRACE        shift, and go to state 47
+  $default      reduce using rule 23 (entry)
-  assignment    go to state 48
 state 38
-  31) assignment : NAME EQ _ value
+  24) entry : entry_head assignments COMMA _ RBRACE
+  31) assignments : assignments COMMA _ assignment
-  LBRACE        shift, and go to state 52
-  NAME          shift, and go to state 32
-  NUMBER        shift, and go to state 51
-  STRING_LITERAL  shift, and go to state 33
+  NAME          shift, and go to state 26
+  RBRACE        shift, and go to state 49
-  string_literal  go to state 31
-  string_value  go to state 49
-  value         go to state 50
+  assignment    go to state 50
 state 39
-  25) entry_head : NAME LBRACE key _ COMMA
+  32) assignment : NAME EQ _ value
-  COMMA         shift, and go to state 53
+  LBRACE        shift, and go to state 33
+  NAME          shift, and go to state 32
+  NUMBER        shift, and go to state 53
+  STRING_LITERAL  shift, and go to state 34
+  string_literal  go to state 31
+  string_value  go to state 51
+  value         go to state 52
 state 40
-  26) key : NAME _
+  26) entry_head : NAME LBRACE key _ COMMA
-  $default      reduce using rule 26 (key)
+  COMMA         shift, and go to state 54
 state 41
-  27) key : NUMBER _
-  28) key : NUMBER _ NAME
+  27) key : NAME _
-  NAME          shift, and go to state 54
   $default      reduce using rule 27 (key)
 state 42
-  12) comment : COMMENT LBRACE content RBRACE _
+  28) key : NUMBER _
+  29) key : NUMBER _ NAME
-  $default      reduce using rule 12 (comment)
+  NAME          shift, and go to state 55
+  $default      reduce using rule 28 (key)
 state 43
-  15) preamble : PREAMBLE LBRACE string_value RBRACE _
+  12) comment : COMMENT LBRACE content RBRACE _
-  $default      reduce using rule 15 (preamble)
+  $default      reduce using rule 12 (comment)
 state 44
-  19) string_value : string_value SHARP _ string_literal
+  15) preamble : PREAMBLE LBRACE string_value RBRACE _
-  NAME          shift, and go to state 32
-  STRING_LITERAL  shift, and go to state 33
+  $default      reduce using rule 15 (preamble)
-  string_literal  go to state 55
 state 45
-  16) string : STRING LBRACE string_assignment RBRACE _
+  19) string_value : string_value SHARP _ string_literal
-  $default      reduce using rule 16 (string)
+  LBRACE        shift, and go to state 33
+  NAME          shift, and go to state 32
+  STRING_LITERAL  shift, and go to state 34
+  string_literal  go to state 56
 state 46
-  17) string_assignment : NAME EQ _ string_value
+  21) string_literal : LBRACE content _ RBRACE
-  NAME          shift, and go to state 32
-  STRING_LITERAL  shift, and go to state 33
+  RBRACE        shift, and go to state 57
-  string_value  go to state 56
-  string_literal  go to state 31
 state 47
-  23) entry : entry_head assignments COMMA RBRACE _
+  16) string : STRING LBRACE string_assignment RBRACE _
-  $default      reduce using rule 23 (entry)
+  $default      reduce using rule 16 (string)
 state 48
-  30) assignments : assignments COMMA assignment _
+  17) string_assignment : NAME EQ _ string_value
-  $default      reduce using rule 30 (assignments)
+  LBRACE        shift, and go to state 33
+  NAME          shift, and go to state 32
+  STRING_LITERAL  shift, and go to state 34
+  string_value  go to state 58
+  string_literal  go to state 31
 state 49
-  19) string_value : string_value _ SHARP string_literal
-  32) value : string_value _
+  24) entry : entry_head assignments COMMA RBRACE _
-  SHARP         shift, and go to state 44
-  $default      reduce using rule 32 (value)
+  $default      reduce using rule 24 (entry)
 state 50
-  31) assignment : NAME EQ value _
+  31) assignments : assignments COMMA assignment _
-  $default      reduce using rule 31 (assignment)
+  $default      reduce using rule 31 (assignments)
 state 51
-  33) value : NUMBER _
+  19) string_value : string_value _ SHARP string_literal
+  33) value : string_value _
+  SHARP         shift, and go to state 45
   $default      reduce using rule 33 (value)
 state 52
-  34) value : LBRACE _ content RBRACE
+  32) assignment : NAME EQ value _
-  CONTENT       shift, and go to state 29
-  $default      reduce using rule 13 (content)
+  $default      reduce using rule 32 (assignment)
-  content       go to state 57
 state 53
-  25) entry_head : NAME LBRACE key COMMA _
+  34) value : NUMBER _
-  $default      reduce using rule 25 (entry_head)
+  $default      reduce using rule 34 (value)
 state 54
-  28) key : NUMBER NAME _
+  26) entry_head : NAME LBRACE key COMMA _
-  $default      reduce using rule 28 (key)
+  $default      reduce using rule 26 (entry_head)
 state 55
-  19) string_value : string_value SHARP string_literal _
+  29) key : NUMBER NAME _
-  $default      reduce using rule 19 (string_value)
+  $default      reduce using rule 29 (key)
 state 56
-  17) string_assignment : NAME EQ string_value _
-  19) string_value : string_value _ SHARP string_literal
+  19) string_value : string_value SHARP string_literal _
-  SHARP         shift, and go to state 44
-  $default      reduce using rule 17 (string_assignment)
+  $default      reduce using rule 19 (string_value)
 state 57
-  34) value : LBRACE content _ RBRACE
+  21) string_literal : LBRACE content RBRACE _
-  RBRACE        shift, and go to state 58
+  $default      reduce using rule 21 (string_literal)
 state 58
-  34) value : LBRACE content RBRACE _
+  17) string_assignment : NAME EQ string_value _
+  19) string_value : string_value _ SHARP string_literal
-  $default      reduce using rule 34 (value)
+  SHARP         shift, and go to state 45
+  $default      reduce using rule 17 (string_assignment)