ebnf 0.2.1 → 0.2.2

data/lib/ebnf/base.rb

@@ -158,12 +158,7 @@ module EBNF
     # Write out parsed syntax string as an S-Expression
     # @return [String]
     def to_sxp
-      begin
-        require 'sxp'
-        SXP::Generator.string(ast.sort)
-      rescue LoadError
-        ast.sort_by{|r| r.num.to_f}.to_sxp
-      end
+      SXP::Generator.string(ast.sort_by{|r| r.id.to_f}.map(&:for_sxp))
     end
     def to_s; to_sxp; end
 

data/lib/ebnf/ll1/lexer.rb

@@ -42,15 +42,15 @@ module EBNF::LL1
       '\\"'  => '"',    # \u0022 (quotation mark, double quote mark)
       "\\'"  => '\'',   # \u0027 (apostrophe-quote, single quote mark)
       '\\\\' => '\\'    # \u005C (backslash)
-    }
-    ESCAPE_CHAR4        = /\\u(?:[0-9A-Fa-f]{4,4})/           # \uXXXX
-    ESCAPE_CHAR8        = /\\U(?:[0-9A-Fa-f]{8,8})/           # \UXXXXXXXX
+    }.freeze
+    ESCAPE_CHAR4        = /\\u(?:[0-9A-Fa-f]{4,4})/.freeze    # \uXXXX
+    ESCAPE_CHAR8        = /\\U(?:[0-9A-Fa-f]{8,8})/.freeze    # \UXXXXXXXX
     ECHAR               = /\\./                               # More liberal unescaping
-    UCHAR               = /#{ESCAPE_CHAR4}|#{ESCAPE_CHAR8}/
-    COMMENT             = /#.*/
-    WS                  = / |\t|\r|\n/m
+    UCHAR               = /#{ESCAPE_CHAR4}|#{ESCAPE_CHAR8}/.freeze
+    COMMENT             = /#.*/.freeze
+    WS                  = / |\t|\r|\n/m.freeze
 
-    ML_START            = /\'\'\'|\"\"\"/                     # Beginning of terminals that may span lines
+    ML_START            = /\'\'\'|\"\"\"/.freeze              # Beginning of terminals that may span lines
 
     ##
     # @!attribute whitespace

data/lib/ebnf/ll1/parser.rb

@@ -496,7 +496,6 @@ module EBNF::LL1
       @error_log << message unless @recovering
       @recovering = true
       debug(node, message, options.merge(:level => 0))
-      $stderr.puts("[#{@lineno}]#{' ' * depth}#{node}: #{message}")
     end
 
     ##

data/lib/ebnf/rule.rb

@@ -82,22 +82,24 @@ module EBNF
       }.merge(options))
     end
 
-    # Serializes this rule to an S-Expression
-    # @return [String]
-    def to_sxp
+    # Return representation for building S-Expressions
+    # @return [Array]
+    def for_sxp
       elements = [kind, sym, id]
       elements << [:start, true] if start
       elements << first.sort_by(&:to_s).unshift(:first) if first
       elements << follow.sort_by(&:to_s).unshift(:follow) if follow
       elements << expr
-      begin
-        require 'sxp'
-        SXP::Generator.string(elements)
-      rescue LoadError
-        elements.to_sxp
-      end
+      elements
     end
-    def to_s; to_sxp; end
+
+    # Return SXP representation of this rule
+    # @return [String]
+    def to_sxp
+      for_sxp.to_sxp
+    end
+
+    alias_method :to_s, :to_sxp
     
     # Serializes this rule to an Turtle
     # @return [String]

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ebnf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,30 +116,26 @@ files:
 homepage: http://github.com/gkellogg/ebnf
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4479271649691547126
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EBNF parser and parser generator.
 test_files: []
 has_rdoc: false