zenlish 0.2.02 → 0.2.06

data/lib/zenlish/inflect/atomic_o_expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'output_expression'
 
 module Zenlish
@@ -6,4 +8,3 @@ module Zenlish
     end # class
   end # module
 end # module
-

data/lib/zenlish/inflect/composite_o_expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'output_expression'
 
 module Zenlish
@@ -6,9 +8,9 @@ module Zenlish
       attr_reader :children
 
       def initialize(theChildren)
+        super()
         @children = theChildren.dup
       end
     end # class
   end # module
 end # module
-

data/lib/zenlish/inflect/concatenation.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'literal_asis'
 require_relative 'composite_o_expression'
 
 module Zenlish
   module Inflect
     class Concatenation < CompositeOExpression
-
       def initialize(argument1, argument2)
         super([validated_argument(argument1), validated_argument(argument2)])
       end
@@ -33,4 +34,4 @@ module Zenlish
       end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/equals_literal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'unary_input_expression'
 
 module Zenlish
@@ -17,7 +19,11 @@ module Zenlish
           feat_def.domain.include?(literal)
         else
           val = actuals[argument.index]
-          val == literal
+          if val.kind_of?(Feature::FeatureDef)
+            val.domain.include?(literal)
+          else
+            val == literal
+          end
         end
       end
     end # class

data/lib/zenlish/inflect/feature_heading.rb

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
+
 require_relative 'heading'
 
 module Zenlish
   module Inflect
     class FeatureHeading < Heading
-
-      def initialize(aLabel)
-        super(aLabel)
-      end
-      
       def evaluate_for(aFeatureBearer)
         aFeatureBearer[label]
       end
+
+      def all_matches(aFeatureBearer)
+        feat = aFeatureBearer[label]
+        if feat.kind_of?(Feature::FeatureDef)
+          feat.domain.to_a
+        else
+          [feat]
+        end
+      end
     end # class
   end # module
 end # module

data/lib/zenlish/inflect/formal_argument.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Zenlish
   module Inflect
     class FormalArgument
       attr_reader :index
-      
+
       def initialize(anIndex)
         @index = anIndex
       end

data/lib/zenlish/inflect/function_call.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'atomic_o_expression'
 
 module Zenlish
@@ -6,6 +8,7 @@ module Zenlish
       attr_reader :mth_name
 
       def initialize(aMethodName)
+        super()
         @mth_name = aMethodName
       end
 
@@ -14,4 +17,4 @@ module Zenlish
       end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/heading.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+require_relative '../feature/feature'
+require_relative '../feature/feature_def'
+
 module Zenlish
   module Inflect
     class Heading

data/lib/zenlish/inflect/inflection_rule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zenlish
   module Inflect
     # An inflection rule has two-parts:

data/lib/zenlish/inflect/inflection_table.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Zenlish
   module Inflect
@@ -26,8 +27,9 @@ module Zenlish
         else
           theConstraints
         end
-        err_msg = "Table has #{headings.size} headings."
+        err_msg = "Table has #{headings.size} headings, instead of #{constraints.size}"
         raise StandardError, err_msg if constraints.size != headings.size
+
         actuals = []
         headings.each_with_index do |hd, idx|
           if constraints[idx]
@@ -37,8 +39,8 @@ module Zenlish
           end
         end
         # Hit policy: first
-        matching_rule = rules.find do |rule| 
-          rule.success?(headings, aLexeme, actuals) 
+        matching_rule = rules.find do |rule|
+          rule.success?(headings, aLexeme, actuals)
         end
         unless matching_rule
           err_msg = "No rule in table covers case: lexeme #{aLexeme}, actuals: #{p actuals}."
@@ -46,6 +48,29 @@ module Zenlish
         end
         matching_rule.apply(headings, aLexeme, actuals)
       end
+
+      def all_inflections(aLexeme)
+        constraints = Array.new(headings.size) { |_i| nil }
+        heading_matches = []
+        headings.each_with_index do |hd, _idx|
+          heading_matches << hd.all_matches(aLexeme)
+        end
+        w_forms = nil
+        if constraints.size == 1
+          all_combos = heading_matches
+          w_forms = all_combos.first.map do |item|
+            inflect(aLexeme, [item])
+          end
+        else
+          vector1 = heading_matches.shift
+          all_combos = vector1.product(*heading_matches)
+          w_forms = all_combos.map do |combination|
+            inflect(aLexeme, combination)
+          end
+        end
+
+        w_forms.uniq
+      end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/inflection_table_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'feature_heading'
 require_relative 'method_heading'
 require_relative 'formal_argument'
@@ -13,19 +15,19 @@ require_relative 'substitution'
 require_relative 'inflection_rule'
 require_relative 'inflection_table'
 
-        # DecisionTable: Common_form
-        # | NUMBER   | .base_form      | Common_form                |
-        # | singular | X               | base_form                  |
-        # | plural   | ~ /[^aeiouy]y$/ | sub(base_form, /y$/, "ies")|
-        # | plural   | X               | base_form + "s"            |
-        # build('Common_form') do
-        #   feature_heading 'NUMBER'
-        #   method_heading  'base_form'
-        #       | NUMBER          | base_form             | Common_form               |
-        #   rule [equals(:singular), dont_care             ], col('base_form')
-        #   rule [equals(:plural)  , matches(/[^aeiouy]y$/)], sub(col('base_form'), /y$/, 'ies')
-        #   rule [equals(:plural)  , dont_care             ], concat(col('base_form'), 's')
-        # end
+# DecisionTable: Common_form
+# | NUMBER   | .base_form      | Common_form                |
+# | singular | X               | base_form                  |
+# | plural   | ~ /[^aeiouy]y$/ | sub(base_form, /y$/, "ies")|
+# | plural   | X               | base_form + "s"            |
+# build('Common_form') do
+#   feature_heading 'NUMBER'
+#   method_heading  'base_form'
+#       | NUMBER          | base_form              | Common_form               |
+#   rule [equals(:singular), dont_care             ], col('base_form')
+#   rule [equals(:plural)  , matches(/[^aeiouy]y$/)], sub(col('base_form'), /y$/, 'ies')
+#   rule [equals(:plural)  , dont_care             ], concat(col('base_form'), 's')
+# end
 
 module Zenlish
   module Inflect
@@ -50,20 +52,20 @@ module Zenlish
       def feature_heading(aFeatureName)
         hd = FeatureHeading.new(aFeatureName)
         headings << hd
-        table.add_heading(hd) if table
+        table&.add_heading(hd)
       end
 
       def method_heading(aMethodName)
         hd = MethodHeading.new(aMethodName)
         headings << hd
-        table.add_heading(hd) if table
+        table&.add_heading(hd)
       end
 
       def rule(conditions, consequent)
         @conds = []
         rl = InflectionRule.new(conditions.dup, consequent)
         rules << rl
-        table.add_rule(rl) if table
+        table&.add_rule(rl)
 
         rl
       end
@@ -83,13 +85,13 @@ module Zenlish
 
         inequality_cond
       end
-      
+
       def in?(*theMembers)
         arg = FormalArgument.new(conds.size)
         membership_cond = Membership.new(arg, theMembers)
         conds << membership_cond
 
-        membership_cond      
+        membership_cond
       end
 
       def dont_care
@@ -99,10 +101,15 @@ module Zenlish
         item
       end
 
+      def literal(aLiteral)
+        LiteralAsIs.new(aLiteral)
+      end
+
       def col(aColName)
         col_index = headings.find_index { |hd| hd.label == aColName }
         err_msg = "Cannot find heading named '#{aColName}'."
         raise StandardError, err_msg if col_index.nil?
+
         formal = FormalArgument.new(col_index)
         InputAsIs.new(formal)
       end
@@ -128,7 +135,7 @@ module Zenlish
 
       private
 
-      def reset()
+      def reset
         @table = nil
         @headings = []
         @conds = []
@@ -140,4 +147,4 @@ module Zenlish
       # end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/input_asis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'atomic_o_expression'
 
 module Zenlish
@@ -6,6 +8,7 @@ module Zenlish
       attr_reader :formal
 
       def initialize(anArgument)
+        super()
         @formal = anArgument
       end
 

data/lib/zenlish/inflect/input_expression.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Zenlish
   module Inflect
     class InputExpression
       def success?(_lexeme, _heading_values)
         raise NotImplementedError, 'Method must be implemented in subclass(es).'
-      end    
+      end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/literal_asis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'atomic_o_expression'
 
 module Zenlish
@@ -6,6 +8,7 @@ module Zenlish
       attr_reader :text
 
       def initialize(aLiteralValue)
+        super()
         @text = aLiteralValue
       end
 
@@ -14,4 +17,4 @@ module Zenlish
       end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/matches_pattern.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'unary_input_expression'
 
 module Zenlish

data/lib/zenlish/inflect/membership.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'unary_input_expression'
 
 module Zenlish

data/lib/zenlish/inflect/method_heading.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 require_relative 'heading'
 
 module Zenlish
   module Inflect
     class MethodHeading < Heading
-
-      def initialize(aLabel)
-        super(aLabel)
-      end
-      
       def evaluate_for(aFeatureBearer)
         aFeatureBearer.send(label)
-      end      
+      end
+
+      def all_matches(aFeatureBearer)
+        [evaluate_for(aFeatureBearer)]
+      end
     end # class
   end # module
 end # module

data/lib/zenlish/inflect/not_equals_literal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'unary_input_expression'
 
 module Zenlish

data/lib/zenlish/inflect/nullary_input_expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'input_expression'
 
 module Zenlish
@@ -5,4 +7,4 @@ module Zenlish
     class NullaryInputExpression < InputExpression
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/output_expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Zenlish
   module Inflect
     class OutputExpression

data/lib/zenlish/inflect/substitution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'literal_asis'
 require_relative 'composite_o_expression'
 
@@ -62,4 +64,4 @@ module Zenlish
       end
     end # class
   end # module
-end # module
+end # module

data/lib/zenlish/inflect/unary_input_expression.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 require_relative 'input_expression'
 
 module Zenlish
   module Inflect
     class UnaryInputExpression < InputExpression
       attr_reader :argument
-      
+
       def initialize(anArgument)
+        super()
         @argument = anArgument
       end
     end # class