interscript 2.1.0b4 → 2.1.0rc4

data/lib/interscript/node.rb

@@ -4,6 +4,10 @@ class Interscript::Node
     raise NotImplementedError, "You can't construct a Node directly"
   end
 
+  def ==(other)
+    self.class == other.class
+  end
+
   def to_hash
     { :class => self.class.to_s,
       :question => "is something missing?"

data/lib/interscript/node/alias_def.rb

@@ -7,6 +7,12 @@ class Interscript::Node::AliasDef < Interscript::Node
     @data = data
   end
 
+  def ==(other)
+    super &&
+    self.name == other.name &&
+    self.data == other.data
+  end
+
   def to_hash
     { :class => self.class.to_s,
       :name => @name,

data/lib/interscript/node/dependency.rb

@@ -4,6 +4,22 @@ class Interscript::Node::Dependency < Interscript::Node
   def initialize
   end
 
+  def reverse
+    rdep = self.class.new
+    rdep.name = name
+    rdep.full_name = Interscript::Node::Document.reverse_name(full_name)
+    rdep.import = import
+    rdep.document = document&.reverse
+    rdep
+  end
+
+  def ==(other)
+    super &&
+    self.full_name == other.full_name &&
+    self.import == other.import &&
+    self.name == other.name
+  end
+
   def to_hash
     { :class => self.class.to_s,
       :name => @name,

data/lib/interscript/node/document.rb

@@ -1,6 +1,7 @@
 class Interscript::Node::Document
   attr_accessor :metadata, :tests, :name
   attr_accessor :dependencies, :aliases, :stages, :dep_aliases
+  attr_accessor :reversed_from
 
   def initialize
     puts "Interscript::Node::Document.new " if $DEBUG
@@ -34,6 +35,39 @@ class Interscript::Node::Document
     end
   end
 
+  def reverse
+    @reverse ||= self.class.new.tap do |rdoc|
+      rdoc.name = self.class.reverse_name(name)
+      rdoc.metadata = metadata&.reverse
+      rdoc.tests = tests&.reverse
+      rdoc.dependencies = dependencies.map(&:reverse)
+      rdoc.stages = stages.transform_values(&:reverse)
+      rdoc.dep_aliases = dep_aliases.transform_values(&:reverse)
+      rdoc.aliases = aliases
+    end
+  end
+
+  def self.reverse_name(name)
+    newname = (name || "noname").split("-")
+    newname[2], newname[3] = newname[3], newname[2] if newname.length >= 4
+    newname = newname.join("-")
+    if newname == name
+      newname.gsub!("-reverse", "")
+    end
+    if newname == name
+      newname += "-reverse"
+    end
+    newname
+  end
+
+  def ==(other)
+    self.class == other.class &&
+    self.metadata == other.metadata &&
+    self.tests == other.tests &&
+    self.stages == other.stages &&
+    self.aliases == other.aliases
+  end
+
   def to_hash
     { :class => self.class.to_s, :metadata => @metadata&.to_hash,
       :tests => @tests&.to_hash,

data/lib/interscript/node/group.rb

@@ -1,7 +1,8 @@
 class Interscript::Node::Group < Interscript::Node
-  attr_accessor :children
+  attr_accessor :children, :reverse_run
 
-  def initialize
+  def initialize(reverse_run: nil)
+    @reverse_run = reverse_run
     @children = []
   end
 
@@ -20,11 +21,21 @@ class Interscript::Node::Group < Interscript::Node
     self
   end
 
+  def reverse
+    self.class.new(reverse_run: reverse_run.nil? ? nil : !reverse_run).tap do |r|
+      r.children = self.children.reverse.map(&:reverse)
+    end
+  end
+
   def to_hash
     { :class => self.class.to_s,
       :children => @children.map{|x| x.to_hash} }
   end
 
+  def ==(other)
+    super && self.children == other.children && self.reverse_run == other.reverse_run
+  end
+
   def inspect
     @children.map(&:inspect).join("\n").gsub(/^/, "  ")
   end

data/lib/interscript/node/item.rb

@@ -36,6 +36,10 @@ class Interscript::Node::Item < Interscript::Node
       :item => self.item }
   end
 
+  def ==(other)
+    super
+  end
+
   def self.try_convert(i)
     i = Interscript::Node::Item::String.new(i) if i.class == ::String
     raise TypeError, "Wrong type #{i.class}, expected I::Node::Item" unless Interscript::Node::Item === i

data/lib/interscript/node/item/alias.rb

@@ -10,6 +10,10 @@ class Interscript::Node::Item::Alias < Interscript::Node::Item
     !map && Interscript::Stdlib::ALIASES.has_key?(name)
   end
 
+  def boundary_like?
+    Interscript::Stdlib.boundary_like_alias?(name)
+  end
+
   def max_length
     if stdlib?
       ([:none].include? name) ? 0 : 1
@@ -19,6 +23,10 @@ class Interscript::Node::Item::Alias < Interscript::Node::Item
     end
   end
 
+  # Not implemented properly
+  def downcase; self; end
+  def upcase; self; end
+
   def first_string
     self
   end
@@ -32,6 +40,10 @@ class Interscript::Node::Item::Alias < Interscript::Node::Item
     }
   end
 
+  def ==(other)
+    super && self.name == other.name && self.map == other.map
+  end
+
   def inspect
     if map
       "map.#{map}.#{name}"

data/lib/interscript/node/item/any.rb

@@ -25,6 +25,9 @@ class Interscript::Node::Item::Any < Interscript::Node::Item
     end
   end
 
+  def downcase; self.class.new(self.data.map(&:downcase)); end
+  def upcase; self.class.new(self.data.map(&:upcase)); end
+
   def first_string
     case @value
     when Array
@@ -70,6 +73,10 @@ class Interscript::Node::Item::Any < Interscript::Node::Item
     hash
   end
 
+  def ==(other)
+    super && self.data == other.data
+  end
+
   def inspect
     "any(#{value.inspect})"
   end

data/lib/interscript/node/item/capture.rb

@@ -15,11 +15,18 @@ class Interscript::Node::Item::CaptureGroup < Interscript::Node::Item
     data.nth_string
   end
 
+  def downcase; self.dup.tap { |i| i.data = i.data.downcase }; end
+  def upcase; self.dup.tap { |i| i.data = i.data.upcase }; end
+
   def to_hash
     { :class => self.class.to_s,
       :data => self.data.to_hash }
   end
 
+  def ==(other)
+    super && self.data == other.data
+  end
+
   def inspect
     "capture(#{@data.inspect})"
   end
@@ -44,6 +51,10 @@ class Interscript::Node::Item::CaptureRef < Interscript::Node::Item
       :id => self.id }
   end
 
+  def ==(other)
+    super && self.id == other.id
+  end
+
   def inspect
     "ref(#{@id.inspect})"
   end

data/lib/interscript/node/item/group.rb

@@ -10,11 +10,35 @@ class Interscript::Node::Item::Group < Interscript::Node::Item
   def +(item)
     item = Interscript::Node::Item.try_convert(item)
     out = self.dup
-    out.children << item
+    if Interscript::Node::Item::Group === item
+      out.children += item.children
+    else
+      out.children << item
+    end
     out.verify!
     out
   end
 
+  def compact
+    out = self.dup do |n|
+      n.children = n.children.reject do |i|
+        (Interscript::Node::Alias === i && i.name == :none) ||
+        (Interscript::Node::String === i && i.data == "")
+      end
+    end
+
+    if out.children.count == 0
+      Interscript::Node::Alias.new(:none)
+    elsif out.children.count == 1
+      out.children.first
+    else
+      out
+    end
+  end
+
+  def downcase; self.dup.tap { |i| i.children = i.children.map(&:downcase) }; end
+  def upcase; self.dup.tap { |i| i.children = i.children.map(&:upcase) }; end
+
   # Verify if a group is valid
   def verify!
     wrong = @children.find do |i|
@@ -45,6 +69,10 @@ class Interscript::Node::Item::Group < Interscript::Node::Item
       :children => self.children.map{|x| x.to_hash} }
   end
 
+  def ==(other)
+    super && self.children == other.children
+  end
+
   def inspect
     @children.map(&:inspect).join("+")
   end

data/lib/interscript/node/item/repeat.rb

@@ -22,6 +22,10 @@ class Interscript::Node::Item::Repeat < Interscript::Node::Item
       :data => self.data.to_hash }
   end
 
+  def ==(other)
+    super && self.data == other.data
+  end
+
   def inspect
     str = case self
     when Interscript::Node::Item::Maybe

data/lib/interscript/node/item/stage.rb

@@ -13,6 +13,10 @@ class Interscript::Node::Item::Stage < Interscript::Node::Item
     }
   end
 
+  def ==(other)
+    super && self.name == other.name && self.map == other.map
+  end
+
   def inspect
     if map
       "map.#{@map}.stage.#{@name}"

data/lib/interscript/node/item/string.rb

@@ -17,6 +17,9 @@ class Interscript::Node::Item::String < Interscript::Node::Item
     self.data
   end
 
+  def downcase; self.dup.tap { |i| i.data = i.data.downcase }; end
+  def upcase; self.dup.tap { |i| i.data = i.data.upcase }; end
+
   alias nth_string first_string
 
   def + other
@@ -33,6 +36,10 @@ class Interscript::Node::Item::String < Interscript::Node::Item
     end
   end
 
+  def ==(other)
+    super && self.data == other.data
+  end
+
   def inspect
     @data.inspect
   end

data/lib/interscript/node/metadata.rb

@@ -11,6 +11,16 @@ class Interscript::Node::MetaData < Interscript::Node
     @data[k]
   end
 
+  def reverse
+    self.class.new(data.dup, **{}).tap do |rmd|
+      rmd[:source_script], rmd[:destination_script] = rmd[:destination_script], rmd[:source_script]
+    end
+  end
+
+  def ==(other)
+    super && self.data == other.data
+  end
+
   def to_hash
     {:class => self.class.to_s,
       :data => @data}

data/lib/interscript/node/rule.rb

@@ -1,4 +1,7 @@
 class Interscript::Node::Rule < Interscript::Node
+  def ==(other)
+    super && self.reverse_run == other.reverse_run
+  end
 end
 
 require "interscript/node/rule/sub"

data/lib/interscript/node/rule/funcall.rb

@@ -1,7 +1,8 @@
 class Interscript::Node::Rule::Funcall < Interscript::Node::Rule
-  attr_accessor :name, :kwargs
-  def initialize name, **kwargs
+  attr_accessor :name, :kwargs, :reverse_run
+  def initialize name, reverse_run: nil, **kwargs
     @name = name
+    @reverse_run = reverse_run
     @kwargs = kwargs
   end
 
@@ -12,6 +13,15 @@ class Interscript::Node::Rule::Funcall < Interscript::Node::Rule
     }
   end
 
+  def reverse
+    self.class.new(Interscript::Stdlib.reverse_function[@name.to_sym],
+      reverse_run: reverse_run.nil? ? nil : !reverse_run, **kwargs)
+  end
+
+  def ==
+    super && self.name == other.name && self.kwargs == other.kwargs
+  end
+
   def inspect
     "#{@name} #{kwargs.inspect[1..-2]}"
   end

data/lib/interscript/node/rule/run.rb

@@ -1,7 +1,8 @@
 class Interscript::Node::Rule::Run < Interscript::Node::Rule
-  attr_accessor :stage
-  def initialize stage
+  attr_accessor :stage, :reverse_run
+  def initialize stage, reverse_run: nil
     @stage = stage
+    @reverse_run = reverse_run
   end
 
   def to_hash
@@ -9,7 +10,19 @@ class Interscript::Node::Rule::Run < Interscript::Node::Rule
       :stage => self.stage.to_hash }
   end
 
+  def reverse
+    Interscript::Node::Rule::Run.new(stage,
+      reverse_run: reverse_run.nil? ? nil : !reverse_run
+    )
+  end
+
+  def ==(other)
+    super && self.stage == other.stage
+  end
+
   def inspect
-    "run #{@stage.inspect}"
+    out = "run #{@stage.inspect}"
+    out += ", reverse_run: #{@reverse_run.inspect}" unless reverse_run.nil?
+    out
   end
 end

data/lib/interscript/node/rule/sub.rb

@@ -1,12 +1,19 @@
 class Interscript::Node::Rule::Sub < Interscript::Node::Rule
   attr_accessor :from, :to
   attr_accessor :before, :not_before, :after, :not_after
+  attr_accessor :reverse_before, :reverse_not_before, :reverse_after, :reverse_not_after
+  attr_accessor :reverse_run
   attr_accessor :priority
 
-  def initialize from, to, before: nil, not_before: nil, after: nil, not_after: nil, priority: nil
+  def initialize (from, to,
+                  before: nil, not_before: nil,
+                  after: nil, not_after: nil,
+                  priority: nil, reverse_run: nil)
     self.from = Interscript::Node::Item.try_convert from
     if to == :upcase
       self.to = :upcase
+    elsif to == :downcase
+      self.to = :downcase
     else
       self.to = Interscript::Node::Item.try_convert to
     end
@@ -16,6 +23,8 @@ class Interscript::Node::Rule::Sub < Interscript::Node::Rule
     #raise TypeError, "Can't supply both before and not_before" if before && not_before
     #raise TypeError, "Can't supply both after and not_after" if after && not_after
 
+    self.reverse_run = reverse_run
+
     self.before = Interscript::Node::Item.try_convert(before) if before
     self.after = Interscript::Node::Item.try_convert(after) if after
     self.not_before = Interscript::Node::Item.try_convert(not_before) if not_before
@@ -37,7 +46,13 @@ class Interscript::Node::Rule::Sub < Interscript::Node::Rule
     puts params.inspect if $DEBUG
     hash = { :class => self.class.to_s,
       :from => self.from.to_hash,
-      :to => Symbol === self.to ? self.to : self.to.to_hash
+      :to => Symbol === self.to ? self.to : self.to.to_hash,
+      :reverse_run => self.reverse_run,
+      :before => self.before&.to_hash,
+      :not_before => self.not_before&.to_hash,
+      :after => self.after&.to_hash,
+      :not_after => self.not_after&.to_hash,
+      :priority => self.priority
     }
 
     hash[:before] = self.before&.to_hash if self.before
@@ -49,19 +64,165 @@ class Interscript::Node::Rule::Sub < Interscript::Node::Rule
     hash
   end
 
+  def reverse
+    if to == :upcase
+      xfrom = from.downcase
+      xto = :downcase
+    elsif to == :downcase
+      xfrom = from.upcase
+      xto = :upcase
+    else
+      xto, xfrom = reverse_transfer(from, to)
+    end
+
+    # A special case: sub "a", "" shouldn't be present in a reverse map
+    rrun = self.reverse_run.nil? ? nil : !self.reverse_run
+    if rrun.nil? && !has_assertions? &&
+      (xfrom == "" ||
+        (Interscript::Node::Item::String === xfrom && xfrom.data == '') ||
+        (Interscript::Node::Item::Alias === xfrom && xfrom.name == :none)
+      )
+
+      rrun = true
+    end
+
+    Interscript::Node::Rule::Sub.new(xfrom, xto,
+      before: before, after: after,
+      not_before: not_before, not_after: not_after,
+
+      reverse_run: rrun,
+
+      priority: priority ? -priority : nil
+    )
+  end
+  
+  def has_assertions?
+    !!(before || not_before || not_after || after)
+  end
+
+  # Attempt to transfer some references to boundary/line_begin around.
+  # Those in general should go into before/after clauses, but for now
+  # let's try to get the best compatibility possible. Also, CaptureGroup,
+  # CaptureRef need to be shifted around
+  def reverse_transfer from, to
+    # This part is about moving initial and final boundary like aliases
+    case from
+    when Interscript::Node::Item::Group
+      first = from.children.first
+      last = from.children.last
+
+      if Interscript::Node::Item::Alias === first && first.boundary_like?
+        out = Interscript::Node::Item::Group.new + first + to
+        to = out.compact
+
+        from = from.dup.tap do |i|
+          i.children = i.children[1..-1]
+        end.compact
+      end
+
+      if Interscript::Node::Item::Alias === last && last.boundary_like?
+        out = Interscript::Node::Item::Group.new + to + last
+        to = out.compact
+
+        from = from.dup.tap do |i|
+          i.children = i.children[0..-2]
+        end.compact
+      end
+    when Interscript::Node::Item::Alias
+      if from.boundary_like?
+        to = if from.name.to_s.end_with? "_end"
+          Interscript::Node::Item::Group.new + to + from
+        else
+          Interscript::Node::Item::Group.new + from + to
+        end
+        from = Interscript::Node::Item::Alias.new(:none)
+      end
+    end
+
+    # This part is about moving backreferences
+    state = {left:[], right:[]}
+
+    from  = reverse_transfer_visit(from, :from, state)
+    to    = reverse_transfer_visit(to,   :to,   state)
+
+    [from, to]
+  end
+
+  private def reverse_transfer_visit(node, type, state)
+    node = Interscript::Node::Item.try_convert(node)
+
+    case node
+    when Interscript::Node::Item::Alias
+      if node.name == :kor_maybedash
+        state[:left] << node
+        Interscript::Node::Item::CaptureRef.new(state[:left].length)
+      else
+        node
+      end
+    when Interscript::Node::Item::String
+      node
+    when Interscript::Node::Item::Any
+      if Array === node.value
+        node.dup.tap do |i|
+          i.value = i.value.map { |c| reverse_transfer_visit(c, type, state) }
+        end
+      else
+        node
+      end
+    when Interscript::Node::Item::Group
+      node.dup.tap do |i|
+        i.children = i.children.map { |c| reverse_transfer_visit(c, type, state) }
+      end
+    when Interscript::Node::Item::Repeat
+      node.dup.tap do |i|
+        i.data = reverse_transfer_visit(i.data, type, state)
+      end
+    when Interscript::Node::Item::CaptureRef
+      if type == :from
+        node
+      elsif state[:right][node.id]
+        node
+      else
+        state[:right][node.id] = true
+        state[:left][node.id - 1] or raise "Capture count doesn't match"
+      end
+    when Interscript::Node::Item::CaptureGroup
+      state[:left] << node
+      out = Interscript::Node::Item::CaptureRef.new(state[:left].length)
+      reverse_transfer_visit(node.data, type, state) # Visit but don't care
+      out
+    else
+      raise "Type #{node.class} unhandled!"
+    end
+  end
+
+  def ==(other)
+    super &&
+    self.from == other.from &&
+    self.to == other.to &&
+    self.before == other.before &&
+    self.after == other.after &&
+    self.not_before == other.not_before &&
+    self.not_after == other.not_after &&
+    self.priority == other.priority
+  end
+
   def inspect
     out = "sub "
     params = []
     params << @from.inspect
-    if @to == :upcase
-      params << "upcase"
+    if Symbol === @to
+      params << @to.to_s
     else
       params << @to.inspect
     end
+    params << "reverse_run: #{@reverse_run.inspect}" unless @reverse_run.nil?
+
     params << "before: #{@before.inspect}" if @before
     params << "after: #{@after.inspect}" if @after
     params << "not_before: #{@not_before.inspect}" if @not_before
     params << "not_after: #{@not_after.inspect}" if @not_after
+
     params << "priority: #{@priority.inspect}" if @priority
     out << params.join(", ")
   end