statsailr 0.7.4 → 0.7.5

data/lib/statsailr/scanner/sts_scanner.rb

@@ -9,49 +9,8 @@ SQ_STR_PATTERN = /'(\\'|[^'\n])*'/
 DQ_STR_PATTERN = /"(\\"|[^"\n])*"/
 end
 
-module STSScannerSupport
-  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
-end
-
 class STSScanner
   include ::STSConstants
-  include ::STSScannerSupport
 
   # Initialization & Terminating methods
 
@@ -151,9 +110,9 @@ class STSScanner
       when scan(INT_PATTERN)
         tokens << [:NUMBER, matched.to_i ]
       when scan(SQ_STR_PATTERN)
-        tokens << [:STRING, matched[Range.new(1, -2)] ]
+        tokens << [:SQ_STRING, matched[Range.new(1, -2)] ]
       when scan(DQ_STR_PATTERN)
-        tokens << [:STRING, interpret_escape_sequences(matched[Range.new(1, -2)]) ]
+        tokens << [:DQ_STRING, matched[Range.new(1, -2)] ]
       when scan(/[ \t]/)
         #ignore
       else
@@ -221,6 +180,8 @@ class STSScanner
 
   def scan_proc_special()
     case
+    when scan(/\=\=/)
+       return :P_DEQ
     when scan(/\=/)
       return :P_EQ
     when scan(/\*/)
@@ -229,14 +190,32 @@ class STSScanner
       return :P_PLUS
     when scan(/\-/)
       return :P_MINUS
-    when scan(/\^/)
-      return :P_HAT
+    when scan(/%%/)
+      return :P_INTDEV
+    when scan(/%\/%/)
+      return :P_MOD
     when scan(/\%in\%/)
       return :P_IN
-    when scan(/\%in\%/)
-      return :P_PERC
+    when scan(/&&/)
+      return :P_DAND
+    when scan(/\|\|/)
+      return :P_DOR
+    when scan(/&/)
+      return :P_AND
+    when scan(/\|/)
+      return :P_OR
+    when scan(/>/)
+      return :P_LT
+    when scan(/</)
+      return :P_ST
+    when scan(/>=/)
+      return :P_LTE
+    when scan(/<=/)
+      return :P_STE
+    when scan(/\^/)
+      return :P_HAT
     when scan(/\~/)
-      return :P_TILDA
+      return :P_TILDE
     when scan(/\:/)
       return :P_COLON
     when scan(/\(/)
@@ -265,9 +244,9 @@ class STSScanner
       when scan(INT_PATTERN)
         tokens << [:NUMBER, matched.to_i ]
       when scan(SQ_STR_PATTERN)
-        tokens << [:STRING, matched[Range.new(1, -2)] ]
+        tokens << [:SQ_STRING, matched[Range.new(1, -2)] ]
       when scan(DQ_STR_PATTERN)
-        tokens << [:STRING, interpret_escape_sequences(matched[Range.new(1, -2)]) ]
+        tokens << [:DQ_STRING, matched[Range.new(1, -2)] ]
       when type = scan_proc_special()
         tokens << [ type , matched ]
       when scan(/[ \t]/)  # Separators
@@ -279,7 +258,7 @@ class STSScanner
         @scanner.unscan
         break
       when scan(/\//)  # slash to start options
-        tokens << [:SEP_SLASH, matched]
+        tokens << [:P_SLASH, matched]
       else
         scan(/.*\n/)
         raise "Current PROC line cannot be tokenized." + matched

data/lib/statsailr/version.rb

@@ -1,3 +1,3 @@
 module StatSailr
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statsailr
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Toshihiro Umehara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r_bridge