zenlish 0.1.07 → 0.1.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffba9137702021772a218a6fbd3e88b9e42094bd4ae67f88424af1aea08e02e
-  data.tar.gz: a5ea6452d625afcea4fd00c82c644fb76e5f274b5a88cb0b77e09587dbbb89d9
+  metadata.gz: 750e9535d2fb78ea38521e183fdd583c0d654d9ad4111081b261944d15a44775
+  data.tar.gz: b6daa5ab5b66248bdd91c2c3f26e4cc8f552852409cc2c1f5b0fb4b359b7923b
 SHA512:
-  metadata.gz: 54c72b265c4ad2223c5f1bd95ff824dd1d54d556f9f4a517e9ffb6495179c8b07ee1aa33be360f0365225c4716b098b7b68ae0caae06e04e26cab002259ba7d0
-  data.tar.gz: ed998631f3a001a3fdca5e43ff9e8a1b09ee1f931698c5970736bee7f14f3cc68373804874bc674e1ae619eb992be69eccf522e23f3bcb336873e403fbba2090
+  metadata.gz: ba7ad7bcdf5391c95d4ff846484b6b55d403c4b2ffd1e2501c228471b05a14b687339604e390c5d2337eb95d7f47ee4f104b1b7404455816a7d8afe91ee36e0d
+  data.tar.gz: c313789bc4eba7a8d403942f5f53e543730bba60f707fc7fb195851da3fc97d124d7525e1f04ee7494ddb64f89985e8b5793bee190b2f06a4a96b7bd898a0bc3

data/CHANGELOG.md

@@ -1,10 +1,25 @@
 # CHANGELOG
 
+## [0.1.08] - 2019-10-22
+__Zenlish__ can parse all sentences in lesson 1 and 2-A from
+ [Learn These Words First](http://learnthesewordsfirst.com/).
+ 
+### Added
+- Class `ConjunctivePronoun` to represent the conjunctive `what`.
+- Class `IrregularVerbHave` to represent the lexical verb `have`.
+- File `.appveyor.yml`
+
+### Changed
+- File `zparser_spec.rb`: tests include all sentences from lesson 1-H (77 sentences in total).
+- `ZenlishGrammar`: added support for sentence like: "This thing is like two of the other things.".
+- File `minimal_lexicon.rb`: new entries in lexicon `have`, `like`, `part`.
+- File `README.md` Updated the metrics table, added AppVeyor badge
+
 ## [0.1.07] - 2019-10-21
 __Zenlish__ can parse all sentences in lessons 1-A ... 1-H from
  [Learn These Words First](http://learnthesewordsfirst.com/).
 
- ### Added
+### Added
 - Class `ConjunctivePronoun` to represent the conjunctive `what`.
 - Class `IrregularVerbSay` to represent the verb `say`.
 

data/README.md

@@ -1,5 +1,6 @@
 # Zenlish
 [![Linux build Status](https://travis-ci.org/famished-tiger/Zenlish.svg?branch=master)](https://travis-ci.org/famished-tiger/Zenlish)
+[![Build status](https://ci.appveyor.com/api/projects/status/bef59whiacuv51yn?svg=true)](https://ci.appveyor.com/project/famished-tiger/zenlish)
 [![Gem Version](https://badge.fury.io/rb/zenlish.svg)](https://badge.fury.io/rb/zenlish)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/famished-tiger/Zenlish/blob/master/LICENSE.txt)
 ### What is __Zenlish__ ?  
@@ -46,14 +47,14 @@ sentences of the first lesson.
 
 The intent is to deliver gem versions in small increments.
 
-#### Some project metrics (v. 0.1.07)
+#### Some project metrics (v. 0.1.08)
 |Metric|Value|  
 |:-:|:-:|
-| Number of lemmas in lexicon           | 53 |
-| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 26 |
-| Number of production rules in grammar | 74 |
-| Number of lessons covered             |  8 |
-| Number of sentences in spec files     | 70 |
+| Number of lemmas in lexicon           | 56 |
+| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 28 |
+| Number of production rules in grammar | 76 |
+| Number of lessons covered             |  9 |
+| Number of sentences in spec files     | 77 |
 
 
 ### Roadmap

data/appveyor.yml

@@ -0,0 +1,27 @@
+version: '{build}'
+max_jobs: 5
+environment:
+  matrix:
+  - Ruby_version: 26-x64  
+  - Ruby_version: 25-x64
+  - Ruby_version: 24-x64
+  - Ruby_version: 26  
+  - Ruby_version: 25
+  - Ruby_version: 24
+
+
+install:
+  - set PATH=C:\Ruby%Ruby_version%\bin;%PATH%
+  - gem update --system
+  - gem install bundler
+  - bundle install --retry=3 --clean --force
+
+build: off
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/lib/zenlish/lex/empty_lexicon_factory.rb

@@ -32,6 +32,7 @@ module Zenlish
         aLexicon.add_terminal(WClasses::IndefinitePronoun.new.freeze)
         aLexicon.add_terminal(WClasses::IrregularVerb.new.freeze)
         aLexicon.add_terminal(WClasses::IrregularVerbBe.new.freeze)
+        aLexicon.add_terminal(WClasses::IrregularVerbHave.new.freeze)        
         aLexicon.add_terminal(WClasses::IrregularVerbSay.new.freeze)         
         aLexicon.add_terminal(WClasses::LinkingAdverb.new.freeze)        
         aLexicon.add_terminal(WClasses::Preposition.new.freeze)

data/lib/zenlish/parser/zenlish_grammar.rb

@@ -48,6 +48,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
 
   # <numeral> of this/these...
   rule 'numeral_of' => 'numeral PrepositionOf DemonstrativeDeterminer'
+  rule 'numeral_of' => 'numeral PrepositionOf DefiniteArticle'
   rule 'subset_of' => 'IndefiniteQuantifier PrepositionOf DemonstrativeDeterminer'
   rule 'nominal' => 'CommonNoun'
   rule 'nominal' => 'Adjective CommonNoun'
@@ -76,6 +77,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'lexical_verb' => 'RegularVerb'
   rule 'lexical_verb' => 'IrregularVerb'
   rule 'lexical_verb' => 'IrregularVerbBe'
+  rule 'lexical_verb' => 'IrregularVerbHave'  
   rule 'lexical_verb' => 'IrregularVerbSay'
   rule 'numeral' => 'Cardinal'
   rule 'comparative_clause' => 'comparative_start noun_phrase'

data/lib/zenlish/version.rb

@@ -1,3 +1,3 @@
 module Zenlish
-  VERSION = '0.1.07'
+  VERSION = '0.1.09'
 end

data/lib/zenlish/wclasses/all_word_classes.rb

@@ -15,6 +15,7 @@ require_relative 'pronoun'
 require_relative 'proper_noun'
 require_relative 'irregular_verb'
 require_relative 'irregular_verb_be'
+require_relative 'irregular_verb_have'
 require_relative 'irregular_verb_say'
 require_relative 'definite_article'
 require_relative 'demonstrative_determiner'

data/lib/zenlish/wclasses/irregular_verb_have.rb

@@ -0,0 +1,9 @@
+require_relative 'irregular_verb'
+
+module Zenlish
+  module WClasses
+    # TODO: document
+    class IrregularVerbHave < IrregularVerb
+    end # class
+  end # module
+end # module

data/spec/zenlish/parser/zparser_spec.rb

@@ -44,6 +44,8 @@ module Zenlish
       literal2var('false', 'false', '_')
       literal2var('far', 'far')
       literal2var('from', 'from')
+      literal2var('have', 'has')
+      literal2var('have', 'have')
       literal2var('hear', 'hears')
       literal2var('if', 'if', '_')
       literal2var('in', 'in', '_')
@@ -51,6 +53,7 @@ module Zenlish
       def is ;     Lex::Literal.new('is', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       def is_aux ; Lex::Literal.new('is', get_lexeme('be', WClasses::AuxiliaryBe), 0) ; end
       literal2var('kind', 'kind')
+      literal2var('like', 'like')
       literal2var('Lisa', 'Lisa')
       literal2var('living', 'living')
       literal2var('many', 'many')
@@ -59,8 +62,8 @@ module Zenlish
       literal2var('not', 'not', '_')
       literal2var('on', 'on')
       literal2var('one', 'one')
-      literal2var('two', 'two')
       literal2var('other', 'other')
+      literal2var('part', 'part')
       literal2var('people', 'people')
       literal2var('person', 'person')
       literal2var('place', 'place')
@@ -88,6 +91,7 @@ module Zenlish
       literal2var('Tony', 'Tony')
       literal2var('touch', 'touching')
       literal2var('true', 'true', '_')
+      literal2var('two', 'two')
       literal2var('very', 'very')
       literal2var('what', 'what')
       literal2var('word', 'words')
@@ -418,6 +422,42 @@ module Zenlish
           literals = [what, lisa, says, is, true_, dot]
           expect { subject.parse(literals) }.not_to raise_error
         end
+
+        it 'should parse sample sentences from lesson 2-A' do
+          # Sentence 2-01a: "This thing is like two of the other things."
+          literals = [this, thing, is, like, two, of, the, other, things, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-01b: "One of these things is not like the other things."
+          literals = [one, of, these, things, is, not_, like, the, other, things, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-02a: "Lisa has something."
+          literals = [lisa, has, something, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-02b: "Tony has another thing."
+          literals = [tony, has, another, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-02c: "Lisa does not have the same kind of thing as Tony has."
+          literals = [lisa, does, not_, have, the, same, kind, of, thing, as, tony, has, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-03a: "Lisa is touching part of this thing."
+          literals = [lisa, is_aux, touching, part, of, this, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+          
+          # Sentence 2-03b: "Tony is touching the other part."
+          literals = [tony, is_aux, touching, the, other, part, dot]
+          expect { subject.parse(literals) }.not_to raise_error          
+        end
+=begin
+TODO
+Lesson 2.A
+	Xtra:
+		What Tony has is like what Lisa has.
+=end        
       end # context
     end # describe
   end # module

data/spec/zenlish/support/minimal_lexicon.rb

@@ -21,6 +21,7 @@ preposition_than = $ZenlishLexicon.name2terminal['PrepositionThan']
 regular_verb = $ZenlishLexicon.name2terminal['RegularVerb']
 irregular_verb = $ZenlishLexicon.name2terminal['IrregularVerb']
 irregular_verb_be = $ZenlishLexicon.name2terminal['IrregularVerbBe']
+irregular_verb_have = $ZenlishLexicon.name2terminal['IrregularVerbHave']
 irregular_verb_say = $ZenlishLexicon.name2terminal['IrregularVerbSay']
 indefinite_pronoun = $ZenlishLexicon.name2terminal['IndefinitePronoun']
 conjunctive_pronoun = $ZenlishLexicon.name2terminal['ConjunctivePronoun']
@@ -58,11 +59,13 @@ add_entry('do', auxiliary_do)
 add_entry('false', adjective)
 add_entry('far', adverb)
 add_entry('from', preposition)
-add_entry('hear', irregular_verb)
+add_entry('have', irregular_verb_have) 
+add_entry('hear', irregular_verb) 
 add_entry('if', subordinating_conjunction)
 add_entry('in', preposition)
 add_entry('inside', preposition)
 add_entry('kind', common_noun)
+add_entry('like', preposition)
 add_entry('Lisa', proper_noun)
 add_entry('living', adjective)
 add_entry('many', indefinite_quantifier)
@@ -73,6 +76,7 @@ add_entry('of', preposition_of)
 add_entry('on', preposition)
 add_entry('one', cardinal)
 add_entry('other', adjective)
+add_entry('part', common_noun)
 add_entry('people', common_noun)
 add_entry('person', common_noun)
 add_entry('place', common_noun)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenlish
 version: !ruby/object:Gem::Version
-  version: 0.1.07
+  version: 0.1.09
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -83,6 +83,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - lib/zenlish.rb
 - lib/zenlish/lex/empty_lexicon.rb
 - lib/zenlish/lex/empty_lexicon_factory.rb
@@ -116,6 +117,7 @@ files:
 - lib/zenlish/wclasses/indefinite_quantifier.rb
 - lib/zenlish/wclasses/irregular_verb.rb
 - lib/zenlish/wclasses/irregular_verb_be.rb
+- lib/zenlish/wclasses/irregular_verb_have.rb
 - lib/zenlish/wclasses/irregular_verb_say.rb
 - lib/zenlish/wclasses/lexical_verb.rb
 - lib/zenlish/wclasses/linking_adverb.rb