bel_parser 1.0.0.alpha.56-java → 1.0.0.alpha.57-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b7d1faf3439b77b301a8465b6a6302892ca256
-  data.tar.gz: e25ccf32c170db8fa016617ae6b8294a8bae07cc
+  metadata.gz: 60beaba7ec588b49f39e177c3c2ae31cdf9c48c6
+  data.tar.gz: 47feab6424d1532624d3841f00ae126fd88cc5ff
 SHA512:
-  metadata.gz: 735a3f898e103914def1b14114627329eefe30f6823747142037bc0060de61022cbcdcaae962a18b0bf744c73266b9412dd467f6946a94d83b902a6f473454d2
-  data.tar.gz: ef2463dd17b179952d8a259c2d80f3063cb5a4ba29da9985848e34e9d7217b0177c96f6f3980fc02af5f5cc718c2e5cae03580a1d14d548f3d7c3ddafd53d75f
+  metadata.gz: 258561f22b61be0fdd2d850a2d43b83a4e4248a05ef19a945a755a6826ef72665542ff997ae489bbce2297ee807b529dcbbc2762c57168e586ef5046d93b59bf
+  data.tar.gz: 399dfffc0c57a4d1915a8962e78e81ae163ce214308957dff0f2b4f0386061dd910b578857d66af9a5319ba24e102aa2052ddabf490843644a2619f01d7ddef9

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.56
+1.0.0.alpha.57

data/lib/bel/translator/plugins/bel_script/reader.rb

@@ -11,12 +11,18 @@ module BEL::Translator::Plugins
 
       def initialize(io, options = {})
         @io    = io
+        require 'pry'; binding.pry
+
+        options = {
+          :language => '1.0'
+        }.merge(options)
+
         @state = {
           uri_reader:            BELParser::Resource.default_uri_reader,
           url_reader:            BELParser::Resource.default_url_reader,
-          specification:         BELParser::Language.specification('2.0'),
+          specification:         BELParser::Language.specification(options[:language]),
           namespace_definitions: {}
-        }
+        }.merge(options)
       end
 
       def each

data/lib/bel/translator/plugins/bel_script/translator.rb

@@ -12,7 +12,7 @@ module BEL::Translator::Plugins
       include ::BEL::Translator
 
       def read(data, options = {})
-        Reader.new(data)
+        Reader.new(data, options)
       end
 
       def write(objects, writer = StringIO.new, options = {})

data/lib/bel_parser/expression/model/statement.rb

@@ -80,7 +80,7 @@ module BELParser
         end
 
         def validation(
-          spec       = BELParser::Language.latest_supported_specification,
+          spec       = BELParser::Language.default_specification,
           uri_reader = BELParser::Resource.default_uri_reader,
           url_reader = BELParser::Resource.default_url_reader)
 
@@ -153,7 +153,7 @@ module BELParser
             end
           return nil if statement.nil?
 
-          spec  ||= BELParser::Language.latest_supported_specification
+          spec  ||= BELParser::Language.default_specification
           comment = statement.comment && statement.comment.children[0]
 
           Statement.new(

data/lib/bel_parser/expression/model/term.rb

@@ -52,7 +52,7 @@ module BELParser
         end
 
         def validation(
-          spec       = BELParser::Language.latest_supported_specification,
+          spec       = BELParser::Language.default_specification,
           uri_reader = BELParser::Resource.default_uri_reader,
           url_reader = BELParser::Resource.default_url_reader)
 
@@ -67,7 +67,7 @@ module BELParser
         end
 
         def valid?(
-          spec       = BELParser::Language.latest_supported_specification,
+          spec       = BELParser::Language.default_specification,
           uri_reader = BELParser::Resource.default_uri_reader,
           url_reader = BELParser::Resource.default_url_reader)
 
@@ -75,7 +75,7 @@ module BELParser
         end
 
         def invalid?(
-          spec = BELParser::Language.latest_supported_specification,
+          spec = BELParser::Language.default_specification,
           uri_reader = BELParser::Resource.default_uri_reader,
           url_reader = BELParser::Resource.default_url_reader)
 
@@ -117,7 +117,7 @@ module BELParser
         def ast_to_term(ast, spec, namespaces = {})
           return nil if ast.nil? ||
             !ast.is_a?(BELParser::Parsers::AST::Term)
-          spec    ||= BELParser::Language.latest_supported_specification
+          spec    ||= BELParser::Language.default_specification
           convert   = method(:convert_argument).to_proc.curry[spec][namespaces]
 
           Term.new(

data/lib/bel_parser/expression/parser.rb

@@ -11,7 +11,7 @@ module BELParser
 
     def self.parse(
       input,
-      spec       = BELParser::Language.latest_supported_specification,
+      spec       = BELParser::Language.default_specification,
       namespaces = {})
 
       parser = Parser.new(input, Expression.filter, spec, namespaces)
@@ -20,7 +20,7 @@ module BELParser
 
     def self.parse_parameters(
       input,
-      spec       = BELParser::Language.latest_supported_specification,
+      spec       = BELParser::Language.default_specification,
       namespaces = {})
 
       parser = Parser.new(input, Expression.parameter_filter, spec, namespaces)
@@ -29,7 +29,7 @@ module BELParser
 
     def self.parse_terms(
       input,
-      spec       = BELParser::Language.latest_supported_specification,
+      spec       = BELParser::Language.default_specification,
       namespaces = {})
 
       parser = Parser.new(input, Expression.term_filter, spec, namespaces)
@@ -38,7 +38,7 @@ module BELParser
 
     def self.parse_statements(
       input,
-      spec       = BELParser::Language.latest_supported_specification,
+      spec       = BELParser::Language.default_specification,
       namespaces = {})
 
       parser = Parser.new(input, Expression.statement_filter, spec, namespaces)
@@ -53,7 +53,7 @@ module BELParser
       def initialize(
         input,
         filter     = Expression.filter,
-        spec       = BELParser::Language.latest_supported_specification,
+        spec       = BELParser::Language.default_specification,
         namespaces = {})
 
         @input      = input

data/lib/bel_parser/language.rb

@@ -25,6 +25,8 @@ module BELParser
     LOCK = Mutex.new
     private_constant :LOCK
 
+    DEFAULT_VERSION = '1.0'
+
     # Indicates if +version+ is a defined BEL specification.
     #
     # @param  [#to_s] version the BEL version string (e.g. +"2.0"+)
@@ -53,6 +55,14 @@ module BELParser
       end.sort
     end
 
+    def self.default_version
+      DEFAULT_VERSION
+    end
+
+    def self.default_specification
+      specification(DEFAULT_VERSION)
+    end
+
     # Returns the latest supported version string according to the
     # _MAJOR.MINOR_ pattern.
     #

data/lib/bel_parser/parsers/common/comment_line.rb

@@ -45,7 +45,7 @@ class << self
 end
 self._bel_trans_keys = [
 	0, 0, 9, 35, 9, 35, 
-	9, 32, 10, 10, 0, 
+	10, 10, 10, 10, 0, 
 	0, 0
 ]
 
@@ -54,7 +54,7 @@ class << self
 	private :_bel_key_spans, :_bel_key_spans=
 end
 self._bel_key_spans = [
-	0, 27, 27, 24, 1, 0
+	0, 27, 27, 1, 1, 0
 ]
 
 class << self
@@ -62,7 +62,7 @@ class << self
 	private :_bel_index_offsets, :_bel_index_offsets=
 end
 self._bel_index_offsets = [
-	0, 0, 28, 56, 81, 83
+	0, 0, 28, 56, 58, 60
 ]
 
 class << self
@@ -77,10 +77,7 @@ self._bel_indicies = [
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 0, 1, 1, 2, 1, 
-	5, 6, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 5, 
-	4, 3, 7, 1, 0
+	5, 4, 3, 6, 1, 0
 ]
 
 class << self
@@ -88,7 +85,7 @@ class << self
 	private :_bel_trans_targs, :_bel_trans_targs=
 end
 self._bel_trans_targs = [
-	1, 0, 3, 5, 4, 3, 5, 4
+	1, 0, 3, 5, 4, 5, 4
 ]
 
 class << self
@@ -96,7 +93,7 @@ class << self
 	private :_bel_trans_actions, :_bel_trans_actions=
 end
 self._bel_trans_actions = [
-	0, 0, 0, 1, 3, 3, 4, 5
+	0, 0, 0, 1, 3, 4, 5
 ]
 
 class << self

data/lib/bel_parser/parsers/common/comment_line.rl

@@ -20,7 +20,7 @@
     yield comment_line(utf8_string(cl), complete: completed)
   }
 
-  comment_start = SP* NUMBER_SIGN SP*;
+  comment_start = SP* NUMBER_SIGN;
   comment = comment_start (any - NL)*
             >comment_line_start
             $comment_line_more;

data/lib/bel_parser/script/state/set.rb

@@ -60,7 +60,7 @@ module BELParser
         def self.handle_annotation(name_string, value_node, script_context)
           # add to annotation state
           script_context[:annotations]              ||= Concurrent::Hash.new
-          script_context[:annotations][name_string]   = value_node.children[0].string_literal
+          script_context[:annotations][name_string]   = value_node.children[0]
         end
         private_class_method :handle_annotation
 

data/lib/bel_parser/script/syntax/unsupported_bel_version.rb

@@ -25,9 +25,7 @@ module BELParser
             BELParser::Language.specification(value_string)
             nil
           rescue ArgumentError
-            latest_version = BELParser::Language.latest_supported_version
-            latest_spec    = BELParser::Language.specification(latest_version)
-            script_context[:specification] = latest_spec
+            script_context[:specification] = BELParser::Language.default_specification
             UnsupportedBELVersionWarning.new(ast_node, value_string)
           end
         end
@@ -42,13 +40,13 @@ module BELParser
         def initialize(document_property_node, unsupported_version)
           super(document_property_node, nil)
           @unsupported_version = unsupported_version
-          @latest              = BELParser::Language.latest_supported_version
+          @default             = BELParser::Language.default_version
         end
 
         def msg
           <<-MSG.gsub(/^ +/, '').delete("\n")
             Unsupported BEL version "#@unsupported_version". 
-            Setting BEL version to the latest supported version "#@latest".
+            Setting BEL version to the default version "#@default".
           MSG
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.56
+  version: 1.0.0.alpha.57
 platform: java
 authors:
 - Anthony Bargnesi