glaemscribe 1.1.2 → 1.1.3

data/lib/api/mode_parser.rb

@@ -207,11 +207,12 @@ module Glaemscribe
         return @mode if(@mode.errors.any?)
         
         # Get the attributes of the mode
-        @mode.language    = doc.root_node.gpath('language').first.args.first
-        @mode.writing     = doc.root_node.gpath('writing').first.args.first
-        @mode.human_name  = doc.root_node.gpath('mode').first.args.first
-        @mode.authors     = doc.root_node.gpath('authors').first.args.first
-        @mode.version     = doc.root_node.gpath('version').first.args.first
+        @mode.language      = doc.root_node.gpath('language').first.args.first
+        @mode.writing       = doc.root_node.gpath('writing').first.args.first
+        @mode.human_name    = doc.root_node.gpath('mode').first.args.first
+        @mode.authors       = doc.root_node.gpath('authors').first.args.first
+        @mode.version       = doc.root_node.gpath('version').first.args.first
+        @mode.raw_mode_name = doc.root_node.gpath('raw_mode').first.args.first if doc.root_node.gpath('raw_mode').first
                 
         doc.root_node.gpath("options.option").each{ |option_element|
           values      = {}

data/lib/api/object_additions.rb

@@ -0,0 +1,22 @@
+# From http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/43424
+class Object
+  def deep_clone
+    return @deep_cloning_obj if @deep_cloning
+    @deep_cloning_obj = clone
+    @deep_cloning_obj.instance_variables.each do |var|
+      val = @deep_cloning_obj.instance_variable_get(var)
+      begin
+        @deep_cloning = true
+        val = val.deep_clone
+      rescue TypeError
+        next
+      ensure
+        @deep_cloning = false
+      end
+      @deep_cloning_obj.instance_variable_set(var, val)
+    end
+    deep_cloning_obj = @deep_cloning_obj
+    @deep_cloning_obj = nil
+    deep_cloning_obj
+  end
+end

data/lib/api/post_processor/resolve_virtuals.rb

@@ -38,7 +38,7 @@ module Glaemscribe
       end
       
       def apply_loop(charset, tokens, new_tokens, reversed, token, idx)
-        if token == '*SPACE'
+        if token == '*SPACE' || token =='*LF'
           reset_trigger_states(charset)
           return
         end

data/lib/api/sheaf.rb

@@ -31,6 +31,7 @@ module Glaemscribe
   module API
     class Sheaf
       
+      attr_reader :linkable
       attr_reader :fragments
       attr_reader :sheaf_chain 
       attr_reader :mode
@@ -44,8 +45,9 @@ module Glaemscribe
       def dst?; @sheaf_chain.dst?; end
             
       # Should pass a sheaf expression, e.g. : "h, s, t"
-      def initialize(sheaf_chain, expression)
+      def initialize(sheaf_chain, expression, linkable)
         
+        @linkable     = linkable
         @sheaf_chain  = sheaf_chain
         @mode         = sheaf_chain.mode
         @rule         = sheaf_chain.rule

data/lib/api/sheaf_chain.rb

@@ -65,12 +65,16 @@ module Glaemscribe
         sheaf_exps = expression.split(SHEAF_REGEXP_OUT).map{ |elt| elt.strip }.reject{ |elt| elt.empty? }
         sheaf_exps = sheaf_exps.map { |sheaf_exp| 
           sheaf_exp =~ SHEAF_REGEXP_IN
-          sheaf_exp = $1 if $1 # Take the interior of the brackets it was a [...] expression
-          sheaf_exp.strip
+          linkable = false
+          if $1 # Take the interior of the brackets it was a [...] expression
+            sheaf_exp = $1 
+            linkable = true
+          end
+          { exp: sheaf_exp.strip, linkable: linkable }
         }
             
-        @sheaves    = sheaf_exps.map{ |sheaf_exp| Sheaf.new(self,sheaf_exp) }
-        @sheaves    = [Sheaf.new(self,"")] if @sheaves.empty?         
+        @sheaves    = sheaf_exps.map{ |sd| Sheaf.new(self, sd[:exp], sd[:linkable]) }
+        @sheaves    = [Sheaf.new(self,"",false)] if @sheaves.empty?         
       end
       
       def p

data/lib/api/sheaf_chain_iterator.rb

@@ -27,6 +27,8 @@ module Glaemscribe
       attr_accessor :sheaf_chain
       attr_accessor :cross_map
       attr_accessor :errors
+      
+      attr_reader   :prototype
   
       # If a cross schema is passed, the prototype of the chain will be permutated
       def initialize(sheaf_chain, cross_schema = nil)
@@ -41,40 +43,57 @@ module Glaemscribe
         # Construct the identity array
         identity_cross_array    = []
         sheaf_count             = sheaf_chain.sheaves.count
-        sheaf_count.times{|i| identity_cross_array << i+1}  
+        sheaf_count.times { |i| identity_cross_array << i }  
 
+        # Make a list of iterable sheaves
+        iterable_idxs     = []
+        prototype_array   = []
+        sheaf_chain.sheaves.each_with_index { |sheaf,i| 
+          if sheaf.linkable 
+            iterable_idxs.push(i) 
+            prototype_array.push(sheaf.fragments.count)
+          end
+        }
+
+        @cross_array = identity_cross_array
+        @prototype   = prototype_array.join('x') || 'CONST'  
+ 
         # Construct the cross array
         if cross_schema
-          @cross_array          = cross_schema.split(",").map{ |i| i.to_i }
-          ca_count              = @cross_array.count
-          @errors << "#{sheaf_count} sheafs found in right predicate, but #{ca_count} elements in cross rule."  if ca_count != sheaf_count  
-          @errors << "Cross rule should contain each element of #{identity_cross_array} once and only once."    if identity_cross_array != @cross_array.sort
-        else
-          @cross_array = identity_cross_array
-        end    
-      end
-  
-      # Calculate the prototype of the chain
-      def prototype
-        res   = @sizes.clone
-        res2  = @sizes.clone 
         
-        res.count.times{ |i| res2[i] = res[@cross_array[i]-1] }
-        res   = res2
-    
-        # Remove all sheaves of size 1 (which are constant)
-        res.delete(1)
+          cross_schema          = cross_schema.split(",").map{ |i| i.to_i - 1 }
+              
+          # Verify that the number of iterables is equal to the cross schema length
+          it_count              = iterable_idxs.count
+          ca_count              = cross_schema.count
+          @errors << "#{it_count} linkable sheaves found in right predicate, but #{ca_count} elements in cross rule." and return  if ca_count != it_count
+          
+          # Verify that the cross schema is correct (should be a permutation of the identity)
+          it_identity_array = []
+          it_count.times { |i| it_identity_array << i }     
+          @errors << "Cross rule schema should be a permutation of the identity (it should contain 1,2,..,n numbers once and only once)." and return  if it_identity_array != cross_schema.sort
+  
+          proto_array_permutted = prototype_array.clone
+          
+          # Now calculate the cross array
+          cross_schema.each_with_index{ |to,from|
+            to_permut = iterable_idxs[from]
+            permut    = iterable_idxs[to]
+            @cross_array[to_permut] = permut
+ 
+            proto_array_permutted[from] = prototype_array[to] 
+          }  
+          prototype_array = proto_array_permutted
+        end  
         
-        # Create a prototype string
-        res = res.join("x")
-        res = "1" if res.empty?
-        res
+        # Recalculate prototype
+        @prototype = prototype_array.join('x') || 'CONST'  
       end
   
       def iterate
         pos = 0
         while pos < @sizes.count do
-          realpos = @cross_array[pos]-1
+          realpos = @cross_array[pos]
           @iterators[realpos] += 1
           if @iterators[realpos] >= @sizes[realpos]
             @iterators[realpos] = 0

data/lib/glaemscribe.rb

@@ -32,6 +32,7 @@ module Glaemscribe
     
     require API_PATH + "/api/debug.rb"
     require API_PATH + "/api/constants.rb"
+    require API_PATH + "/api/object_additions.rb"
     
     require API_PATH + "/api/fragment.rb"
     require API_PATH + "/api/sheaf_chain_iterator.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glaemscribe
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Benjamin 'Talagan' Babut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -58,6 +58,7 @@ files:
 - glaemresources/modes/mercian.glaem
 - glaemresources/modes/quenya-sarati.glaem
 - glaemresources/modes/quenya.glaem
+- glaemresources/modes/raw-tengwar.glaem
 - glaemresources/modes/rlyehian.glaem
 - glaemresources/modes/sindarin-beleriand.glaem
 - glaemresources/modes/sindarin-daeron.glaem
@@ -76,6 +77,7 @@ files:
 - lib/api/if_tree.rb
 - lib/api/mode.rb
 - lib/api/mode_parser.rb
+- lib/api/object_additions.rb
 - lib/api/option.rb
 - lib/api/post_processor/resolve_virtuals.rb
 - lib/api/post_processor/reverse.rb