statsailr 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f27292effff5ace93fcbae7cecd0a62615450ff496ba1c2bdc03b3824894a56
-  data.tar.gz: 7a13e3905398a04bde7f3dd0719576bcfc92a6b95b62e2a34071eca9db0086c0
+  metadata.gz: 8701d54a846ae0d81c7f91080586c7dd81b05c081743ba84606c46ecc53f25a8
+  data.tar.gz: 7f2636ea0b00008f160e303b389d977b94e7698a1eb800603850cff38901b14e
 SHA512:
-  metadata.gz: 356f45dd828c22c84071879e6d0a9a16ec215adf5f3894d37b6a292a6189dde7e211a12aea4697e5695a21cc8d6848c57ae5156d263b035c5b2eed667abb7300
-  data.tar.gz: 1f94bb8192f0af9d20ee9a79600a8db9278d17c4a323da274e8aad6e6ad3318368d070422fd30c631da75ac845773810708999d92a066ebcff0e2dce9bb8be59
+  metadata.gz: 4007addec1d2a15f05c62bef40850a31648b4e2099ac7cf79890f0cb480854561990b478420bf3ab750089c88b1013b7fe4261c15738cb608b893257c2ef5134
+  data.tar.gz: e38f0f64d035ab90bfdd8c052f63c1b4f0cd605cac841ddaefa18de6af127658f2c6453b4fbd74b7dfcf31e29920ba26c9b6db8b8211ee452ad983dce8c0ae3e

data/README.md

@@ -254,7 +254,7 @@ END
             + How main argument part is parsed varies on each instruction. This is defined in main_arg_and_how_to_treat variable in setting.
         + opt_args
             + Optional arguments. Values specified in opt_args are also passed to R function's argument.
-            + opt_args part consists of (a) key-value(s) or key(s).
+            + opt_args part consists of (a) key-value(s).
             + Internally, this argument parsing is conducted by methods in STSBlockParseProcOpts.
 
 

data/lib/statsailr/block_builder/sts_block.rb

@@ -1,8 +1,82 @@
 require "r_bridge"
 require_relative "./sts_block_parse_proc_opts.rb"
 
+module QuotedStringSupport
+  def interpret_escape_sequences(str)
+    # This deals with escape sequences in double quoted string literals
+    # The behavior should be same as libsailr (or datasailr)
+    new_str = ""
+    str_array = str.split(//)
+    idx = 0
+    while( idx < str_array.size) do
+      c = str_array[idx]
+      if(c == "\\")
+        idx = idx + 1
+        c = str_array[idx]
+        raise "Tokenizer error: double quoted string literal should never end with \\" if idx >= str_array.size
+        case c
+        when 't'
+          new_str << "\t"
+        when 'n'
+          new_str << "\n"
+        when 'r'
+          new_str << "\r"
+        when "\\"
+          new_str << "\\"
+        when "\'"
+          new_str << "\'"
+        when "\""
+          new_str << "\""
+        when '?'
+          new_str << '?'
+        else
+          new_str << c
+        end
+      else
+        new_str << c
+      end
+      idx = idx + 1
+    end
+    return new_str
+  end
+
+  def escape_backslashes(str)
+    str.gsub("\\", "\\\\")
+  end
+end
+
 module BlockSupport
-  def type_adjust(obj , type)
+  include QuotedStringSupport
+  class QuotedStringR
+    include QuotedStringSupport
+    def initialize(str, quote_type)
+      raise ":dq or :sq should be specified for quote_type" unless [:dq, :sq].include? quote_type
+      @ori_str = str
+      @quote_type = quote_type
+    end
+
+    def to_s
+      to_s_for_r_bridge
+    end
+
+    def to_s_for_r_bridge
+      if @quote_type == :dq
+        interpret_escape_sequences( @ori_str )
+      elsif
+        @ori_str
+      end
+    end
+
+    def to_s_for_r_parsing
+      if @quote_type == :dq
+        %q{"} + @ori_str + %q{"}
+      elsif @quote_type == :sq
+        %q{'} + escape_backslashes( @ori_str ) + %q{'}
+      end
+    end
+  end
+
+  def type_adjust(obj , type , *opts)
     case type
     when :ident
       if obj.is_a?(String)
@@ -22,6 +96,28 @@ module BlockSupport
       else
         raise "GramNode with inconsistent type(#{type.to_s}) and object(#{obj.class})"
       end
+    when :sq_string
+      if obj.is_a?(String)
+        unless opts.include?( :retain_input_string )
+          # default behavior
+          result = obj
+        else
+          result = QuotedStringR.new( obj, :sq )
+        end
+      else
+        raise "GramNode with inconsistent type(#{type.to_s}) and object(#{obj.class})"
+      end
+    when :dq_string
+      if obj.is_a?(String)
+        unless opts.include?( :retain_input_string )
+          # default behavior
+          result = interpret_escape_sequences( obj )
+        else
+          result = QuotedStringR.new( obj, :dq )
+        end
+      else
+        raise "GramNode with inconsistent type(#{type.to_s}) and object(#{obj.class})"
+      end
     when :sign
       if obj.is_a?(String)
         result = RBridge::SignR.new(obj)
@@ -137,10 +233,16 @@ class ProcBlock
           idx = 0
           while idx < proc_stmt_arg_ori.size() do
             elem = proc_stmt_arg_ori[idx]
-            if( elem.type == :sign && elem.e1 == "/" )
-              break
+            next_elem = proc_stmt_arg_ori[idx + 1]
+            next_next_elem = proc_stmt_arg_ori[idx + 2]
+            if(elem.type == :sign && elem.e1 == "/" ) then
+               if( ! next_elem.nil? && next_elem.type == :ident &&   # After /, optional arguments start
+                   ! next_next_elem.nil? && next_next_elem.type == :sign && next_next_elem.e1 == "=") ||
+                   next_elem.nil? then  # After /, there is nothing
+                 break
+               end
             else
-              x = type_adjust( elem.e1, elem.type )
+              x = type_adjust( elem.e1, elem.type, :retain_input_string )
               proc_stmt_arg << x
               idx = idx + 1
             end

data/lib/statsailr/block_builder/sts_block_parse_proc_opts.rb

@@ -50,7 +50,6 @@ class STSBlockParseProcOpts
 # arg_opt  : IDENT = primary
 #          | IDENT = array
 #          | IDENT = func 
-#          | IDENT
 #
 # parimary : STRING
 #          | NUM
@@ -87,15 +86,15 @@ class STSBlockParseProcOpts
         else
           opt_value = ident() # According to BNF, this should be parimary(). However, ident() is more direct and makes sense here.
         end
-      elsif [:string, :num].include? peek.type
+      elsif [:dq_string, :sq_string, :num].include? peek.type
          next_token()
          opt_value = primary()
       else
         p current_token()
-        raise "the token should be :ident or primaries such as :ident, :num and :string after = . Current token: " + current_token().type.to_s
+        raise "the token should be :ident or primaries such as :ident, :num and :string after = . Next token: " + peek.type.to_s
       end
     else
-      opt_value = true
+      raise "proc instruction optional argumeents should be in the form of a sequence of 'key = value'"
     end
     @result_hash[opt_key.to_s] = opt_value
   end
@@ -127,12 +126,14 @@ class STSBlockParseProcOpts
     case current_token.type
     when :ident
       return ident()
-    when :string
+    when :dq_string
+      return string()
+    when :sq_string
       return string()
     when :num
       return num()
     else
-      raise "the current token should be :ident, :string or :num."
+      raise "the current token should be :ident, :dq_string, :sq_string or :num."
     end
   end
 
@@ -155,8 +156,13 @@ class STSBlockParseProcOpts
   end
 
   def string()
-    raise "the current token should be string" if current_token.type != :string 
-    return type_adjust( current_token.e1, :string)
+    if (current_token.type != :dq_string)
+      return type_adjust( current_token.e1, :dq_string)
+    elsif (current_token.type != :sq_string)
+      return type_adjust( current_token.e1, :sq_string)
+    else
+      raise "the current token should be string (:dq_string or :sq_string)"
+    end
   end
 
   def num()

data/lib/statsailr/block_to_r/sts_lazy_func_gen.rb

@@ -40,6 +40,50 @@ module LazyFuncGeneratorSettingUtility
     return RBridge.create_strvec( ary.map(){|elem| elem.to_s } )
   end
 
+  def read_symbols_or_functions_as_strvec(ary)
+    deapth_ary = Array.new( ary.size )
+    idx = 0
+    last_idx = ary.size - 1
+    deapth = 0
+    while( idx <= last_idx )
+      if( ary[idx].is_a?(RBridge::SymbolR) && (ary[idx + 1].is_a?(RBridge::SignR) && ary[idx + 1].to_s == "("))
+        # function starts
+        deapth_ary[idx] = deapth
+        deapth = deapth + 1
+        idx = idx + 1
+        deapth_ary[idx] = deapth
+      elsif( ary[idx].is_a?(RBridge::SignR) && ary[idx].to_s == "(")
+        # parenthesis starts
+        deapth = deapth + 1
+        deapth_ary[idx] = deapth
+      elsif( ary[idx].is_a?(RBridge::SignR) && ary[idx].to_s == ")")
+        # parenthesis ends or function ends
+        deapth_ary[idx] = deapth
+        deapth = deapth - 1
+      else
+        deapth_ary[idx] = deapth
+      end
+      idx = idx + 1
+    end
+
+    result_ary = []
+    ary.zip( deapth_ary).each(){|elem, deapth|
+      if elem.respond_to? :to_s_for_r_parsing
+        elem_str = elem.to_s_for_r_parsing
+      else
+        elem_str = elem.to_s
+      end
+
+      if( deapth == 0)
+        result_ary.push( elem_str )
+      else
+        result_ary.last << " " << elem_str
+      end
+    }
+
+    return RBridge.create_strvec( result_ary )
+  end
+
   def result( name , *addl )
     if addl.empty?
       return RBridge::RResultName.new(name)