zenlish 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c515fb74b0d6dea385aab166974dbbeb798ab46d444140557d769ee791f3c1
-  data.tar.gz: 17377ced02bf9873315e1d5148d27c6566cc9c9973926f803b691e0496d98ebc
+  metadata.gz: 1e5db95ff9cbd925516f4bec6a4ccf6930b236f3746cef3d166e22825fb605ca
+  data.tar.gz: b73c216e43a15abcc9b387cb4e69d689a07e4cfc8bc5ec708921980f6fd27606
 SHA512:
-  metadata.gz: ce88a49ab39ef1f543b1e7f7744da908aa1cc20681ef4152784abf21aa794a3c99b4c97f76a1977e9a77a2eb6c0fe921c7c0f34b96421581edb74ae1302959bc
-  data.tar.gz: 8bc3d88b037bd6512227e1e5e5bd93f12568adf995e676108e1b96b33f69c788cff266df646f60c3a9b685890aa2b958f9d95d5ea2ba67257916551aa4fa3a57
+  metadata.gz: 5b25c381ba8c04f4fe46e2fb8cd6f1bce5d9bf999312f25a8a410f1c6c217c218dd99aef7881c7d9883dd14cfbbce581c2198b9c05b1c4e8c397cff99c2417a9
+  data.tar.gz: c74ed672568c17bdc824c5afcbb308dfb5f769ac57f004a275c8f78b43b8f69986b059ab3f9bac97183800e98b1dbdf67f3824e8a190f70465fe60f09a3a2a5f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## [0.1.12] - 2019-10-26
+__Zenlish__ can parse all sentences in lesson 1 and 2-A..2-D from
+ [Learn These Words First](http://learnthesewordsfirst.com/).
+
 ## [0.1.11] - 2019-10-24
 __Zenlish__ can parse all sentences in lesson 1 and 2-A..2-C from
  [Learn These Words First](http://learnthesewordsfirst.com/).
@@ -9,9 +13,9 @@ __Zenlish__ can parse all sentences in lesson 1 and 2-A..2-C from
  - Class `RegularVerbWant` to represent the lexical verb `want`.
 
  ### Changed
- - File `zparser_spec.rb`: tests include all sentences from lesson 2-C (98 sentences in total).
- - `ZenlishGrammar`: added support for `want` + `to` + infinitive construct, `can` modal verb".
- - File `minimal_lexicon.rb`: new entries in lexicon `can`, `know`, `think`, `want`.
+ - File `zparser_spec.rb`: tests include all sentences from lesson 2-D (105 sentences in total).
+ - `ZenlishGrammar`: generalized one `negative_sentence` production rule.
+ - File `minimal_lexicon.rb`: new entries in lexicon `bad`, `feel`, `for`, `good`.
  - File `README.md` Updated the metrics table
 
 ## [0.1.10] - 2019-10-23

data/README.md

@@ -50,11 +50,11 @@ The intent is to deliver gem versions in small increments.
 #### Some project metrics (v. 0.1.11)
 |Metric|Value|  
 |:-:|:-:|
-| Number of lemmas in lexicon           | 69 |
-| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 34 |
-| Number of production rules in grammar | 95 |
-| Number of lessons covered             | 11 |
-| Number of sentences in spec files     | 98 |
+| Number of lemmas in lexicon           | 73  |
+| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 36 |
+| Number of production rules in grammar | 98  |
+| Number of lessons covered             | 12  |
+| Number of sentences in spec files     | 105 |
 
 
 ### Roadmap

data/lib/zenlish/parser/zenlish_grammar.rb

@@ -28,11 +28,12 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'affirmative_sentence' => 'AdverbThere IrregularVerbBe verb_be_complement'
   rule 'affirmative_sentence' => 'numeral_of IrregularVerbBe verb_be_complement'
   rule 'affirmative_sentence' => 'DemonstrativePronoun IrregularVerbBe verb_be_complement'
+  rule 'affirmative_sentence' => 'DemonstrativePronoun IrregularVerb verb_complement'
   rule 'affirmative_sentence' => 'conjunctive_prefix IrregularVerbBe verb_be_complement'
   rule 'negative_sentence' => 'noun_phrase negative_verb_phrase'
   rule 'negative_sentence' => 'AdverbThere negative_verb_phrase'
   rule 'negative_sentence' => 'numeral_of negative_verb_phrase'
-  rule 'negative_sentence' => 'DemonstrativePronoun IrregularVerbBe AdverbNot verb_be_complement'
+  rule 'negative_sentence' => 'DemonstrativePronoun negative_verb_phrase'
   rule 'negative_sentence' => 'conjunctive_prefix negative_verb_phrase'
   rule 'conjunctive_prefix' => 'ConjunctivePronoun noun_phrase verb_phrase'
   rule 'noun_phrase' => 'simple_noun_phrase'
@@ -41,7 +42,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'simple_noun_phrase' => 'determiner nominal'
   rule 'simple_noun_phrase' => 'numeral nominal'
   rule 'simple_noun_phrase' => 'determiner numeral nominal'
-  rule 'simple_noun_phrase' => 'simple_noun_phrase noun_phrase verb_phrase'
+  rule 'simple_noun_phrase' => 'simple_noun_phrase simple_noun_phrase verb_phrase'
 
   # Case: (all|many|some) one of (this|these)
   rule 'simple_noun_phrase' => 'subset_of noun_phrase'
@@ -51,6 +52,8 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'simple_noun_phrase' => 'ProperNoun'
   # rule 'simple_noun_phrase' => 'DemonstrativePronoun'
   rule 'simple_noun_phrase' => 'IndefinitePronoun'
+  rule 'simple_noun_phrase' => 'IndefinitePronoun Adjective'
+
 
   rule 'compound_noun_phrase' => 'simple_noun_phrase propositional_phrase'
   rule 'compound_noun_phrase' => 'simple_noun_phrase comparative_clause'
@@ -76,6 +79,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'verb_phrase' => 'IrregularVerbBe verb_be_complement'
   rule 'verb_phrase' => 'IrregularVerbSay Colon Quote affirmative_sentence Period Quote'
   rule 'verb_complement' => 'noun_phrase'
+  rule 'verb_complement' => 'Adjective propositional_phrase'
   rule 'verb_complement' => 'noun_phrase IrregularVerbBe verb_be_complement'
   rule 'verb_complement' => 'adverb_phrase'
   rule 'verb_complement' => 'noun_phrase adverb_phrase'

data/lib/zenlish/version.rb

@@ -1,3 +1,3 @@
 module Zenlish
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/spec/zenlish/parser/zparser_spec.rb

@@ -37,6 +37,7 @@ module Zenlish
       literal2var('another', 'another')
       def are ;     Lex::Literal.new('are', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       literal2var('as', 'as')
+      literal2var('bad', 'bad')
       literal2var('because', 'because')
       literal2var('big', 'big')
       literal2var('big', 'bigger')
@@ -47,7 +48,11 @@ module Zenlish
       def does_aux ; Lex::Literal.new('does', get_lexeme('do', WClasses::AuxiliaryDo), 0) ; end
       literal2var('false', 'false', '_')
       literal2var('far', 'far')
+      literal2var('feel', 'feel')
+      literal2var('feel', 'feels')
+      literal2var('for', 'for', '_')
       literal2var('from', 'from')
+      literal2var('good', 'good')
       literal2var('happen', 'happens')
       literal2var('have', 'has')
       literal2var('have', 'have')
@@ -550,6 +555,36 @@ module Zenlish
           literals = [lisa, can, not_, do_, this_as_pronoun, dot]
           expect { subject.parse(literals) }.not_to raise_error
         end
+
+        it 'should parse sample sentences from lesson 2-D' do
+          # Sentence 2-11a: "This person does something bad."
+          literals = [this, person, does, something, bad, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-11b: "This person does something bad for Tony."
+          literals = [this, person, does, something, bad, for_, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-12a: "Tony does something good."
+          literals = [tony, does, something, good, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-12b: "Tony does something good for Lisa."
+          literals = [tony, does, something, good, for_, lisa, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-13a: "Tony feels something."
+          literals = [tony, feels, something, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-13b: "This does not feel good for Tony."
+          literals = [this_as_pronoun, does_aux, not_, feel, good, for_, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-13b: "This feels bad for Tony."
+          literals = [this_as_pronoun, feels, bad, for_, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+        end
 =begin
 TODO
 Lesson 2.A
@@ -562,6 +597,11 @@ Lesson 2.C
 		Tony knows Lisa has something, because Tony sees what Lisa has.
 		Tony thinks about what Lisa has, because Tony want to have the same kind of thing.
 
+Lesson 2.D
+
+	extra
+		Lisa thinks about something bad happening to this living thing.
+		Thinking about this feels bad for Lisa
 =end
       end # context
     end # describe

data/spec/zenlish/support/minimal_lexicon.rb

@@ -55,6 +55,7 @@ add_entry('alive', adjective)
 add_entry('all', indefinite_quantifier)
 add_entry('another', adjective)
 add_entry('as', comparative_particle)
+add_entry('bad', adjective)
 add_entry('be', auxiliary_be)
 add_entry('be', irregular_verb_be)
 add_entry('because', subordinating_conjunction)
@@ -64,7 +65,10 @@ add_entry('do', auxiliary_do)
 add_entry('do', irregular_verb_do)
 add_entry('false', adjective)
 add_entry('far', adverb)
+add_entry('feel', irregular_verb)
+add_entry('for', preposition)
 add_entry('from', preposition)
+add_entry('good', adjective)
 add_entry('have', irregular_verb_have)
 add_entry('happen', regular_verb)
 add_entry('hear', irregular_verb)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenlish
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley