interscript 2.1.0b7 → 2.1.0rc4

data/lib/interscript/node/stage.rb

@@ -1,9 +1,11 @@
 class Interscript::Node::Stage < Interscript::Node::Group::Sequential
-  attr_accessor :name, :doc_name
+  attr_accessor :name, :doc_name, :dont_reverse
 
-  def initialize name = :main
+  def initialize(name = :main, reverse_run: nil, doc_name: nil, dont_reverse: false)
     @name = name
-    super()
+    @doc_name = doc_name
+    @dont_reverse = dont_reverse
+    super(reverse_run: reverse_run)
   end
 
   def to_hash
@@ -12,8 +14,32 @@ class Interscript::Node::Stage < Interscript::Node::Group::Sequential
       :children => @children.map{|x| x.to_hash} }
   end
 
+  def reverse
+    return self if dont_reverse
+
+    @reverse ||= begin
+      self.class.new(name,
+        doc_name: Interscript::Node::Document.reverse_name(doc_name),
+        reverse_run: reverse_run.nil? ? nil : !reverse_run
+      ).tap do |r|
+        r.children = self.children.reverse.map(&:reverse)
+      end
+    end
+  end
+
+  def ==(other)
+    super &&
+    self.name == other.name &&
+    self.reverse_run == other.reverse_run &&
+    self.dont_reverse == other.dont_reverse
+  end
+
   def inspect
-    name = "(#{@name})" if @name != :main
+    args = []
+    args << "#{@name}" if @name != :main
+    args << "dont_reverse: true" if dont_reverse
+    name = ""
+    name = "(#{args.join(", ")})" unless args.empty?
     "stage#{name} {\n#{super}\n}"
   end
 end

data/lib/interscript/node/tests.rb

@@ -8,6 +8,16 @@ class Interscript::Node::Tests < Interscript::Node
     @data << pair
   end
 
+  def reverse
+    self.class.new(data.map do |from,to,reverse_run|
+      [to, from, reverse_run == nil ? nil : !reverse_run]
+    end)
+  end
+
+  def ==(other)
+    super && self.data == other.data
+  end
+
   def to_hash
     { :class => self.class.to_s,
       :data => @data }

data/lib/interscript/stdlib.rb

@@ -22,6 +22,10 @@ class Interscript::Stdlib
     ! %i[none space].include?(a)
   end
 
+  def self.boundary_like_alias?(a)
+    %i[line_start line_end string_start string_end boundary non_word_boundary].include?(a)
+  end
+
   @treecache = {}
 
   def self.parallel_regexp_compile(subs_hash)
@@ -167,7 +171,20 @@ class Interscript::Stdlib
   end
 
   def self.available_functions
-    %i[title_case downcase compose decompose separate secryst]
+    %i[title_case downcase compose decompose separate unseparate secryst rababa]
+  end
+
+  def self.reverse_function
+    {
+      title_case: :downcase, # Those two are best-effort,
+      downcase: :title_case, # but probably wrong.
+
+      compose: :decompose,
+      decompose: :compose,
+
+      separate: :unseparate,
+      unseparate: :separate
+    }
   end
 
   module Functions
@@ -177,8 +194,13 @@ class Interscript::Stdlib
       output
     end
 
-    def self.downcase(output, _:nil)
-      output.downcase
+    def self.downcase(output, word_separator: nil)
+      if word_separator
+        output = output.gsub(/^(.)/, &:downcase)
+        output = output.gsub(/#{word_separator}(.)/, &:downcase) unless word_separator == ''
+      else
+        output.downcase
+      end
     end
 
     def self.compose(output, _:nil)
@@ -193,6 +215,10 @@ class Interscript::Stdlib
       output.split("").join(separator)
     end
 
+    def self.unseparate(output, separator: " ")
+      output.split(separator).join("")
+    end
+
     @secryst_models = {}
     def self.secryst(output, model:)
       require "secryst" rescue nil # Try to load secryst, but don't fail hard if not possible.
@@ -207,5 +233,21 @@ class Interscript::Stdlib
         @secryst_models[model].translate(i)
       end.join("\n")
     end
+
+    def self.rababa(output, config:)
+      require "rababa" rescue nil # Try to load rababa, but don't fail hard if not possible.
+      unless defined? Rababa
+        raise StandardError, "Rababa is not loaded. Please read docs/Usage_with_Rababa.adoc"
+      end
+
+      config_value = Interscript.rababa_configs[config]
+      model_uri = config_value['model']
+      rababa_config = config_value['config']
+      model_path = Interscript.rababa_provision(config, model_uri)
+
+      @rababa_diacritizer ||= Rababa::Diacritizer.new(model_path, rababa_config)
+
+      @rababa_diacritizer.diacritize_text(output)
+    end
   end
 end

data/lib/interscript/utils/helpers.rb

@@ -0,0 +1,39 @@
+module Interscript::Utils
+  module Helpers
+    def document name=nil, &block
+      $example_id ||= 0
+      $example_id += 1
+      name ||= "example-#{$example_id}"
+
+      Interscript::DSL::Document.new(name, &block).node.tap do |i|
+        $documents ||= {}
+        $documents[name] = i
+      end
+    end
+
+    def stage &block
+      document {
+        stage(&block)
+      }
+    end
+  end
+end
+
+class Interscript::Node::Document
+  def call(str, stage=:main, compiler=$compiler || Interscript::Interpreter, **kwargs)
+    compiler.(self).(str, stage, **kwargs)
+  end
+end
+
+module Interscript::DSL
+  class << self
+    alias original_parse parse
+    def parse(map_name, **kwargs)
+      if $documents && $documents[map_name]
+        $documents[map_name]
+      else
+        original_parse(map_name, **kwargs)
+      end
+    end
+  end
+end

data/lib/interscript/version.rb

@@ -1,3 +1,3 @@
 module Interscript
-  VERSION = "2.1.0b7"
+  VERSION = "2.1.0rc4"
 end

data/lib/interscript/visualize/json.rb

@@ -10,6 +10,7 @@ class Interscript::Node::Group
         more << "after: #{rule.after.to_html(map)}" if rule.after
         more << "<nobr>not before:</nobr> #{rule.not_before.to_html(map)}" if rule.not_before
         more << "<nobr>not after:</nobr> #{rule.not_after.to_html(map)}" if rule.not_after
+        more << "<nobr>reverse run:</nobr> #{rule.reverse_run}" unless rule.reverse_run.nil?
         more = more.join(", ")
 
         out << {
@@ -24,11 +25,14 @@ class Interscript::Node::Group
           children: rule.to_visualization_array(map)
         }
       when Interscript::Node::Rule::Funcall
+        more = rule.kwargs.map do |k,v|
+          "#{k.to_s.gsub("_", " ")}: #{v}"
+        end
+        more << "<nobr>reverse run:</nobr> #{rule.reverse_run}" unless rule.reverse_run.nil?
+
         out << {
           type: rule.name.to_s.gsub("_", " ").gsub(/^(.)/, &:upcase),
-          more: rule.kwargs.map do |k,v|
-            "#{k.to_s.gsub("_", " ")}: #{v}"
-          end.join(", ")
+          more: more.join(", ")
         }
       when Interscript::Node::Rule::Run
         if rule.stage.map
@@ -39,10 +43,14 @@ class Interscript::Node::Group
           stage = rule.stage.name
         end
 
+        more = []
+        more << "<nobr>reverse run:</nobr> #{rule.reverse_run}" unless rule.reverse_run.nil?
+
         out << {
           type: "Run",
           doc: doc.name,
-          stage: stage
+          stage: stage,
+          more: more.join(", "),
         }
       else
         out << {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interscript
 version: !ruby/object:Gem::Version
-  version: 2.1.0b7
+  version: 2.1.0rc4
 platform: ruby
 authors:
 - Ribose Inc.
@@ -26,6 +26,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: interscript-maps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0a
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0a
+- !ruby/object:Gem::Dependency
+  name: text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,6 +84,7 @@ files:
 - lib/interscript/compiler.rb
 - lib/interscript/compiler/javascript.rb
 - lib/interscript/compiler/ruby.rb
+- lib/interscript/detector.rb
 - lib/interscript/dsl.rb
 - lib/interscript/dsl/aliases.rb
 - lib/interscript/dsl/document.rb
@@ -104,6 +119,7 @@ files:
 - lib/interscript/node/stage.rb
 - lib/interscript/node/tests.rb
 - lib/interscript/stdlib.rb
+- lib/interscript/utils/helpers.rb
 - lib/interscript/utils/regexp_converter.rb
 - lib/interscript/version.rb
 - lib/interscript/visualize.rb