zenlish 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e0c43e4804049c23ed6eca8272d7ad968bd24aa136710317925eef885f3e58
-  data.tar.gz: eb9d2697419c830b2e4598ed4ed050d0413f6577237fd975376d61c9d79d7f1b
+  metadata.gz: bae8e629cfa98ad394a1d883934396b1c4241f53e831387d870d51b84c25d863
+  data.tar.gz: c5b3fdb5fb152967aa9fcaf296734336531ff8e855fd94ffbf9fb49f369df239
 SHA512:
-  metadata.gz: f36e1611d1e208f3d310c0efc82e584e37552764a3ea465b70cfbc69d88f5f952a53b8720f51191f50eb1540f7dd10088fed4111861dfd997c14c8aab0f7d337
-  data.tar.gz: 3801a22a41463933ba58ff4931cee97ffe1d1fc8c34462be16df9e64f2ec6790738d8febacf72c1178adf7bfb7951ebacdb69dc7113a69bbd4f2b259096b9441
+  metadata.gz: 11dce85cc695db9a7a5a374b4a8caa4b022a6914b7133adfe3b1a632e99619712169aed83f4a162331f13a6338505e0bf15462feae1102a2f9db13a0feb0ed85
+  data.tar.gz: 4fddca277e63fd1e022704999b7500c2dcbf8a2d1fb4c45bc721108d84914097e9b42055c3d930f2fa481503274798a5685931e135aa3832e76f72a4f82ccbbb

data/.rspec

@@ -1,3 +1,4 @@
 --format documentation
+--backtrace
 --color
 --require spec_helper

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## [0.1.15] - 2019-11-02
+__Zenlish__ can parse all sentences in lesson 1 and 2-A..2-G from
+ [Learn These Words First](http://learnthesewordsfirst.com/).
+
+ ### Added
+ - Class `RelativePronoun` to represent the relative pronoun `who`.
+
+ ### Changed
+ - Folder structure under `lib` and `spec`.
+ - File `zparser_spec.rb`: tests include all sentences from lesson 2-E (136 sentences in total).
+ - `ZenlishGrammar`: new production rules added.
+ - File `dictionary.rb`: new entries in lexicon `moment`, `much`, `someone`, `when`, `who`.
+ - File `README.md` Updated the metrics table
+
 ## [0.1.14] - 2019-11-01
 __Zenlish__ can parse all sentences in lesson 1 and 2-A..2-F from
  [Learn These Words First](http://learnthesewordsfirst.com/).
@@ -11,7 +25,7 @@ __Zenlish__ can parse all sentences in lesson 1 and 2-A..2-F from
 
  ### Changed
  - Folder structure under `lib` and `spec`.
- - File `zparser_spec.rb`: tests include all sentences from lesson 2-E (136 sentences in total).
+ - File `zparser_spec.rb`: tests include all sentences from lesson 2-E (184 sentences in total).
  - `ZenlishGrammar`: new production rules for multiple sentence parsing, personal pronouns and dependent clauses without conjunctions.
  - File `dictionary.rb`: new entries in lexicon `I`, `me`, `you`, `here`, `now`.
  - File `README.md` Reshuffled sections, added one code snippet, updated the metrics table

data/README.md

@@ -20,7 +20,7 @@ users with a language that is close enough to English.
 ### Project status
 
 The project is still in inception. Currently, zenlish is able to parse all
-sentences of the first lesson.
+sentences from lessons 1-A up to 2-G.
 
 The intent is to deliver gem versions in small increments.
 
@@ -34,14 +34,14 @@ Over time, the zenlish gem will contain:
 - A simplified ontology[TODO]
 
 
-#### Some project metrics (v. 0.1.14)
+#### Some project metrics (v. 0.1.15)
 |Metric|Value|  
 |:-:|:-:|
-| Number of lemmas in dictionary        | 80  |
-| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 43 |
-| Number of production rules in grammar | 116 |
-| Number of lessons covered             | 14  |
-| Number of sentences in spec files     | 136 |
+| Number of lemmas in dictionary        | 89  |
+| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 45 |
+| Number of production rules in grammar | 129 |
+| Number of lessons covered             | 15  |
+| Number of sentences in spec files     | 184 |
 
 
 ## Installation...
@@ -120,7 +120,7 @@ Litmus test: a Zenlish text should be easy to read to a English reading person.
 Here a tentative roadmap:
 
 #### A) Ability to parse sentences from [Learn These Words First](http://learnthesewordsfirst.com/)
-*STARTED*. 14.5% complete  
+*STARTED*. 15.6% complete  
 This website advocates the idea of a multi-layered dictionary.
 At the core, there are about 300 essential words.  
 The choice of these words is inspired by the semantic primitives of [NSM

data/lib/zenlish/lang/dictionary.rb

@@ -21,6 +21,8 @@ unless defined?(Zenlish::Lang::Dictionary)
       add_entry('a', 'IndefiniteArticle')
       add_entry('about', 'Preposition')
       add_entry('above', 'Preposition')
+      add_entry('after', 'Adverb')      
+      add_entry('after', 'SubordinatingConjunction')
       add_entry('alive', 'Adjective')
       add_entry('all', 'IndefiniteQuantifier')
       add_entry('another', 'Adjective')
@@ -57,8 +59,12 @@ unless defined?(Zenlish::Lang::Dictionary)
       add_entry('long', 'Adjective')
       add_entry('many', 'IndefiniteQuantifier')
       add_entry('me', 'PersonalPronoun')
+      add_entry('moment', 'CommonNoun')      
       add_entry('more', 'Adjective')
+      add_entry('more', 'Adverb')      
       add_entry('move', 'RegularVerb')
+      add_entry('much', 'Adverb')      
+      add_entry('near', 'Preposition')      
       add_entry('near to', 'Preposition')
       add_entry('now', 'Adverb')
       add_entry('not', 'AdverbNot')
@@ -77,6 +83,7 @@ unless defined?(Zenlish::Lang::Dictionary)
       add_entry('side', 'CommonNoun')
       add_entry('small', 'Adjective')
       add_entry('some', 'IndefiniteQuantifier')
+      add_entry('someone', 'IndefinitePronoun')      
       add_entry('something', 'IndefinitePronoun')
       add_entry('than', 'PrepositionThan')
       add_entry('the', 'DefiniteArticle')
@@ -94,7 +101,9 @@ unless defined?(Zenlish::Lang::Dictionary)
       add_entry('two', 'Cardinal')
       add_entry('very', 'DegreeAdverb')
       add_entry('want', 'RegularVerbWant')
-      add_entry('what','ConjunctivePronoun')
+      add_entry('what','ConjunctivePronoun')      
+      add_entry('when','SubordinatingConjunction')        
+      add_entry('who','RelativePronoun')      
       add_entry('with','Preposition')
       add_entry('word', 'CommonNoun')
       add_entry('you', 'PersonalPronoun')

data/lib/zenlish/lang/zenlish_grammar.rb

@@ -10,26 +10,24 @@ builder = Rley::Syntax::GrammarBuilder.new do
   add_terminals(*Zenlish::Lang::Dictionary.terminals)
 
   rule 'zenlish' => 'prose'
-
-  # Temporary limitation: from 1 to 3 sentences
   rule 'prose' => 'sentence'
-  rule 'prose' => 'sentence sentence'
-  rule 'prose' => 'sentence sentence sentence'
+  rule 'prose' => 'prose sentence'
 
   rule 'sentence' => 'simple_sentence Period'
   rule 'sentence' => 'complex_sentence Period'
   rule 'simple_sentence' => 'declarative_simple_sentence'
 
   # Case of dropped ´that´ conjunction
-  rule 'complex_sentence' => 'main_clause subordination_marker dependent_clause'
-  rule 'complex_sentence' => 'main_clause Comma subordination_marker dependent_clause'
-  rule 'complex_sentence' => 'subordination_marker dependent_clause Comma main_clause'
-  rule 'complex_sentence' => 'subordination_marker dependent_clause Comma LinkingAdverb main_clause'
+  rule 'complex_sentence' => 'main_clause subordinated_clause'
+  rule 'complex_sentence' => 'main_clause Comma subordinated_clause'
+  rule 'complex_sentence' => 'subordinated_clause Comma main_clause'
+  rule 'complex_sentence' => 'subordinated_clause Comma LinkingAdverb main_clause'
   rule 'subordination_marker' => 'SubordinatingConjunction'
   rule 'subordination_marker' => 'SubordinatingConjunction PrepositionOf'
   rule 'declarative_simple_sentence' => 'affirmative_sentence'
   rule 'declarative_simple_sentence' => 'negative_sentence'
   rule 'main_clause' => 'simple_sentence'
+  rule 'subordinated_clause' => 'subordination_marker dependent_clause'
   rule 'dependent_clause' => 'simple_sentence'
   rule 'dependent_clause' => 'DemonstrativePronoun'
   rule 'affirmative_sentence' => 'noun_phrase verb_phrase'
@@ -50,6 +48,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'conjunctive_prefix' => 'ConjunctivePronoun noun_phrase verb_phrase'
   rule 'noun_phrase' => 'simple_noun_phrase'
   rule 'noun_phrase' => 'compound_noun_phrase'
+  # TODO: improve treatment of 'one very short time'
   rule 'simple_noun_phrase' => 'nominal'
   rule 'simple_noun_phrase' => 'determiner nominal'
   rule 'simple_noun_phrase' => 'numeral nominal'
@@ -58,6 +57,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'simple_noun_phrase' => 'PersonalPronoun'
   rule 'simple_noun_phrase' => 'IndefinitePronoun'
   rule 'simple_noun_phrase' => 'IndefinitePronoun Adjective'
+  rule 'simple_noun_phrase' => 'DemonstrativeDeterminer IndefinitePronoun'  
   rule 'simple_noun_phrase' => 'simple_noun_phrase simple_noun_phrase verb_phrase'
 
   # Case: (all|many|some) one of (this|these)
@@ -75,6 +75,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'subset_of' => 'IndefiniteQuantifier PrepositionOf DemonstrativeDeterminer'
   rule 'nominal' => 'CommonNoun'
   rule 'nominal' => 'Adjective CommonNoun'
+  rule 'nominal' => 'DegreeAdverb Adjective CommonNoun'  
   rule 'determiner' => 'determiner single_determiner'
   rule 'determiner' => 'single_determiner'
   rule 'single_determiner' => 'DemonstrativeDeterminer'
@@ -85,32 +86,41 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'verb_phrase' => 'verb_group verb_complement'
   rule 'verb_phrase' => 'RegularVerb propositional_phrase'
   rule 'verb_phrase' => 'RegularVerbWant Preposition verb_group'
+  rule 'verb_phrase' => 'RegularVerbWant Preposition IrregularVerbKnow identifying_clause'
   rule 'verb_phrase' => 'RegularVerbWant Preposition verb_group noun_phrase'
   rule 'verb_phrase' => 'RegularVerbWant simple_noun_phrase Preposition verb_group noun_phrase'
   rule 'verb_phrase' => 'IrregularVerbDo DemonstrativePronoun'
   rule 'verb_phrase' => 'IrregularVerbDo DemonstrativePronoun propositional_phrase'
   rule 'verb_phrase' => 'ModalVerbCan verb_group DemonstrativePronoun'
   rule 'verb_phrase' => 'IrregularVerbBe verb_be_complement'
+  rule 'verb_phrase' => 'IrregularVerbKnow identifying_clause'  
 
   # Cover case where ´that´ conjunction is dropped.
   rule 'verb_phrase' => 'mental_verb dependent_clause'
+  rule 'verb_phrase' => 'mental_verb noun_phrase Adverb negative_verb_phrase'  
   rule 'verb_phrase' => 'IrregularVerbSay DemonstrativePronoun Preposition noun_phrase'
+  rule 'verb_phrase' => 'IrregularVerbSay DemonstrativePronoun subordinated_clause'  
   rule 'verb_phrase' => 'IrregularVerbSay Colon affirmative_sentence'
   rule 'verb_phrase' => 'IrregularVerbSay Colon Quote affirmative_sentence Period Quote'
   rule 'verb_phrase' => 'IrregularVerbSay Preposition noun_phrase Colon Quote affirmative_sentence Period Quote'
   rule 'mental_verb' => 'IrregularVerbKnow'
   rule 'mental_verb' => 'IrregularVerbThink'
   rule 'verb_complement' => 'noun_phrase'
-  rule 'verb_complement' => 'adverb_phrase'
   rule 'verb_complement' => 'noun_phrase adverb_phrase'
+  rule 'verb_complement' => 'adverb_phrase'  
+  rule 'verb_complement' => 'adverb_phrase nominal'    
 
   # perception verb (hear, see, watch, notice, ...): verb + object + infinitive
   rule 'verb_complement' => 'simple_noun_phrase lexical_verb'
   rule 'verb_complement' => 'Adjective propositional_phrase'
+  rule 'verb_complement' => 'Preposition simple_noun_phrase lexical_verb'
+  rule 'verb_complement' => 'Preposition IndefinitePronoun'  
   rule 'verb_be_complement' => 'noun_phrase'
   rule 'verb_be_complement' => 'adjective_as_complement'  # Specific to be as lexical verb
   rule 'verb_be_complement' => 'propositional_phrase'
   rule 'verb_be_complement' => 'noun_phrase adverb_phrase'
+  rule 'identifying_clause' => 'RelativePronoun verb_phrase'  
+  
   rule 'adjective_as_complement' => 'DegreeAdverb Adjective'
   rule 'adjective_as_complement' => 'Adjective'
   rule 'adjective_as_complement' => 'Adjective comparative_clause'
@@ -136,12 +146,16 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'comparative_clause' => 'comparative_start DefiniteArticle Adjective Cardinal'
   rule 'comparative_start' => 'PrepositionThan'
   rule 'comparative_start' => 'ComparativeParticle'
-  rule 'adverb_phrase' => 'Adverb'
-  rule 'adverb_phrase' => 'Adverb Adverb' # 'here now'
-  rule 'adverb_phrase' => 'Adverb propositional_phrase'
+  rule 'adverb_phrase' => 'adverbial_marker'
+  rule 'adverb_phrase' => 'adverbial_marker propositional_phrase'
+  rule 'adverbial_marker' => 'Adverb'
+  rule 'adverbial_marker' => 'Adverb Adverb'  # 'here now', 'much more'
   rule 'propositional_phrase' => 'preposition propositional_complement'
   rule 'propositional_phrase' => 'preposition'
   rule 'propositional_complement' => 'noun_phrase'
+  # rule 'propositional_complement' => 'simple_noun_phrase lexical_verb propositional_phrase'  
+  rule 'propositional_complement' => 'conjunctive_prefix'  
+  rule 'propositional_complement' => 'DemonstrativePronoun'
   rule 'preposition' => 'Preposition'
   rule 'preposition' => 'PrepositionOf'
 end

data/lib/zenlish/lex/empty_lexicon_factory.rb

@@ -46,6 +46,7 @@ module Zenlish
         aLexicon.add_terminal(WClasses::PrepositionThan.new.freeze)
         aLexicon.add_terminal(WClasses::RegularVerb.new.freeze)
         aLexicon.add_terminal(WClasses::RegularVerbWant.new.freeze)
+        aLexicon.add_terminal(WClasses::RelativePronoun.new.freeze)
         aLexicon.add_terminal(WClasses::ProperNoun.new.freeze)
         aLexicon.add_terminal(WClasses::IndefiniteQuantifier.new.freeze)
         aLexicon.add_terminal(WClasses::SubordinatingConjunction.new.freeze)

data/lib/zenlish/version.rb

@@ -1,3 +1,3 @@
 module Zenlish
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

data/lib/zenlish/wclasses/all_word_classes.rb

@@ -35,4 +35,5 @@ require_relative 'preposition_of'
 require_relative 'preposition_than'
 require_relative 'regular_verb'
 require_relative 'regular_verb_want'
+require_relative 'relative_pronoun'
 require_relative 'subordinating_conjunction'

data/lib/zenlish/wclasses/relative_pronoun.rb

@@ -0,0 +1,12 @@
+require_relative 'pronoun'
+
+module Zenlish
+  module WClasses
+    # A relative pronoun refers to a noun that has already been mentionned,
+    # and gives more information about that noun: who, whom, whose 
+    # (for people) and which, what, that for things (and animals).
+    # A relative pronoun introduces a relative clause.
+    class RelativePronoun < Pronoun
+    end # class
+  end # module
+end # module

data/spec/spec_helper.rb

@@ -5,8 +5,12 @@ require 'rspec' # Use the RSpec framework
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
-
+  
   config.expect_with :rspec do |c|
+    # Disable the `should` syntax
     c.syntax = :expect
   end
+
+  # Display stack trace in case of failure
+  config.full_backtrace = true  
 end

data/spec/zenlish/parser/zparser_spec.rb

@@ -33,13 +33,17 @@ module Zenlish
       literal2var('a', 'a', '_as_art')
       literal2var('about', 'about')
       literal2var('above', 'above')
+      def after_adverb ; Lex::Literal.new('after', get_lexeme('after', WClasses::Adverb), 0) ; end
+      def after_ ; Lex::Literal.new('after', get_lexeme('after', WClasses::SubordinatingConjunction), 0) ; end
       literal2var('alive', 'alive')
       literal2var('all', 'all')
+      def am ; Lex::Literal.new('am', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       literal2var('another', 'another')
       def are ;     Lex::Literal.new('are', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       literal2var('as', 'as')
       literal2var('at', 'at')
       literal2var('bad', 'bad')
+      def be_ ; Lex::Literal.new('be', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       literal2var('because', 'because')
       def before_adverb ; Lex::Literal.new('before', get_lexeme('before', WClasses::Adverb), 0) ; end
       def before ; Lex::Literal.new('before', get_lexeme('before', WClasses::SubordinatingConjunction), 0) ; end
@@ -57,20 +61,24 @@ module Zenlish
       literal2var('for', 'for', '_')
       literal2var('from', 'from')
       literal2var('good', 'good')
+      literal2var('happen', 'happen')
       literal2var('happen', 'happened')
+      literal2var('happen', 'happening')
       literal2var('happen', 'happens')
       literal2var('have', 'has')
       literal2var('have', 'have')
       literal2var('hear', 'hears')
       literal2var('here', 'here')
-      literal2var('I', 'I', '')
-      literal2var('if', 'if', '_')
       def i_pronoun ; Lex::Literal.new('I', get_lexeme('I'), 0) ; end
+      literal2var('if', 'if', '_')
       literal2var('in', 'in', '_')
       literal2var('inside', 'inside')
+      literal2var('J', 'j', '_')
       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('K', 'k', '_')
       literal2var('kind', 'kind')
+      literal2var('know', 'knew')
       literal2var('know', 'know')
       literal2var('know', 'knows')
       literal2var('like', 'like')
@@ -79,10 +87,14 @@ module Zenlish
       literal2var('long', 'long')
       literal2var('many', 'many')
       literal2var('me', 'me')
-      literal2var('more', 'more')
+      literal2var('moment', 'moment')
+      def more ; Lex::Literal.new('more', get_lexeme('more', WClasses::Adjective), 0) ; end
+      def more_as_adverb ; Lex::Literal.new('more', get_lexeme('more', WClasses::Adverb), 0) ; end
       literal2var('move', 'move')
       literal2var('move', 'moved')
       literal2var('move', 'moves')
+      literal2var('much', 'much')
+      literal2var('near', 'near')
       literal2var('near to', 'near_to')
       literal2var('not', 'not', '_')
       literal2var('now', 'now')
@@ -91,6 +103,7 @@ module Zenlish
       literal2var('one', 'one')
       literal2var('other', 'other')
       literal2var('part', 'part')
+      literal2var('part', 'parts')
       literal2var('people', 'people')
       literal2var('person', 'person')
       literal2var('place', 'place')
@@ -100,9 +113,11 @@ module Zenlish
       literal2var('small', 'small')
       literal2var('small', 'smaller')
       literal2var('some', 'some')
+      literal2var('say', 'said')
       literal2var('say', 'says')
       literal2var('see', 'see')
       literal2var('see', 'sees')
+      literal2var('someone', 'someone')
       literal2var('something', 'something')
       literal2var('the', 'the')
       literal2var('then', 'then', '_')
@@ -110,6 +125,7 @@ module Zenlish
       literal2var('there', 'there')
       literal2var('thing', 'thing')
       literal2var('thing', 'things')
+      literal2var('think', 'think')
       literal2var('think', 'thinks')
       def these ; Lex::Literal.new('these', get_lexeme('this', WClasses::DemonstrativeDeterminer), 0) ; end
       def these_as_pronoun ; Lex::Literal.new('these', get_lexeme('this', WClasses::DemonstrativePronoun), 0) ; end
@@ -128,6 +144,8 @@ module Zenlish
       def was ; Lex::Literal.new('was', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       def were ;     Lex::Literal.new('were', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       literal2var('what', 'what')
+      literal2var('when', 'when', '_')
+      literal2var('who', 'who')
       literal2var('with', 'with')
       literal2var('word', 'words')
       def x_as_noun ; Lex::Literal.new('X', get_lexeme('X'), 0) ; end
@@ -488,6 +506,10 @@ module Zenlish
           # 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
+
+          # Sentence 2-Ax: "What Tony has is like what Lisa has."
+          literals = [what, tony, has, is, like, what, lisa, has, dot]
+          expect { subject.parse(literals) }.not_to raise_error
         end
 
         it 'should parse sample sentences from lesson 2-B' do
@@ -607,6 +629,12 @@ module Zenlish
           # 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
+
+          # Sentence 2-Dx: "Lisa thinks about something bad happening to this
+          # living thing. Thinking about this feels bad for Lisa."
+          # literals = [lisa, thinks, about, something, bad, happening, to, this,
+            # living, thing, dot]
+          # expect { subject.parse(literals) }.not_to raise_error
         end
 
         it 'should parse sample sentences from lesson 2-E' do
@@ -732,13 +760,13 @@ module Zenlish
           literals = [lisa, says, colon, quote, x_as_noun, happens, now, dot, quote, dot]
           expect { subject.parse(literals) }.not_to raise_error
 
-          # Sentence 2-21a definiens: 'Lisa says something at a time.
+          # Sentence 2-22a definiens: 'Lisa says something at a time.
           #   Lisa says: X happens at this same time.'
           literals = [lisa, says, something, at, a_as_art, time, dot,
                       lisa, says, colon, x_as_noun, happens, at, this, time, dot]
           expect { subject.parse(literals) }.not_to raise_error
 
-          # Sentence 2-21b: "There are not many people here now."
+          # Sentence 2-22b: "There are not many people here now."
           literals = [there, are, not_, many, people, here, now , dot]
           expect { subject.parse(literals) }.not_to raise_error
 
@@ -747,24 +775,109 @@ module Zenlish
                       can, see, many, living, things, here, dot, quote, dot]
           expect { subject.parse(literals) }.not_to raise_error
         end
+
+        it 'should parse sample sentences from lesson 2-G' do
+          # Sentence 2-23a definiendum: 'Someone does X.'
+          literals = [someone, does, x_as_noun, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-23a definiens: 'Something does X. This something can
+          #   think like people think. This something can be one person.'
+          literals = [something, does, x_as_noun, dot,
+                      this, something, can, think, like, people, think, dot,
+                      this, something, can, be_, a_as_art, person, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-23b: Someone said something to Tony.
+          literals = [someone, said, something, to, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-23c definiendum: 'J knows who did K.'
+          literals = [j_, knows, who, did, k_, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-23c definiens: J thinks about someone.
+          # J knows this someone did K.
+          literals = [j_, thinks, about, someone, dot,
+            j_, knows, this, someone, did, k_, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-23d: Tony knows who said something.
+          literals = [tony, knows, who, said, something, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-24a definiendum: 'J happens after K happens.'
+          literals = [j_, happens, after_, k_, happens, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-24a definiens: K happens before J happens.
+          literals = [k_, happens, before, j_, happens, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-24b: After you do something for a long time,
+          # you can know much more about this.
+          literals = [after_, you, do_, something, for_, a_as_art, long, time,
+            comma, you, can, know, much, more_as_adverb, about, this_as_pronoun, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-25a definiendum: 'X is true for some time.'
+          literals = [x_as_noun, is, true_, for_, some, time, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-25a definiens: X is true at a time.
+          #   Some parts of this one time happen before other parts.
+          #   Some parts of this one time happen after other parts.
+          #   X is true at all parts of this one time.
+          literals = [x_as_noun, is, true_, at, a_as_art, time, dot,
+            some, parts, of, this, one, time, happen, before_adverb, other, parts, dot,
+            some, parts, of, this, one, time, happen, after_adverb, other, parts, dot,
+            x_as_noun, is, true_, at, all, parts, of, this, one, time, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-25b: After I moved for some time,
+          # I was near the other side of this place.
+          literals = [after_, i_pronoun, moved, for_, some, time,
+            comma, i_pronoun, was, near, the, other, side, of, this, place, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-26a definiendum: 'X happens in a moment.'
+          literals = [x_as_noun, happens, in_, a_as_art, moment, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-26a definiens: X happens for one very short time.
+          #   There are not parts of this very short time when one part
+          #   happens before other parts.
+          literals = [x_as_noun, happens, for_, one, very, short, time, dot,
+            there, are, not_, parts, of, this, very, short, time, when_,
+            one, part, happens, before_adverb, other, part, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-26b: In a moment, I knew something here was not good.
+          # 'here' is adverb that modifies the 'knew' verb
+          literals = [in_, a_as_art, moment, comma, i_pronoun, knew, something,
+                      here, was, not_, good, dot ]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-Gx: Tony is inside this thing for some time.
+          # Lisa says: "I want to know who is inside this thing.".
+          # Tony hears Lisa. Because of this, Tony says: "I am inside.".
+          # Tony says this after Tony hears Lisa.
+          literals = [tony, is, inside, this, thing, for_, some, time, dot,
+            lisa, says, colon, quote, i_pronoun, want, to, know, who, is,
+            inside, this, thing, dot, quote, dot,  tony, hears, lisa, dot,
+            because, of, this_as_pronoun, comma, tony, says, colon,
+            quote, i_pronoun, am, inside, dot, quote, dot,
+            tony, says, this_as_pronoun, after_, tony, hears, lisa, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+        end
 =begin
 TODO
 
-Lesson 2.A
-	Xtra:
-		What Tony has is like what Lisa has.
-
 Lesson 2.C
 
 	Xtra:
 		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

@@ -1,7 +1,10 @@
 require_relative '../../../lib/zenlish/lang/dictionary'
 
 # Add a few words to dictionary for testing purposes...
+Zenlish::Lang::add_entry('J', 'ProperNoun')
+Zenlish::Lang::add_entry('K', 'IndefinitePronoun')
 Zenlish::Lang::add_entry('Lisa', 'ProperNoun')
 Zenlish::Lang::add_entry('Tony', 'ProperNoun')
 Zenlish::Lang::add_entry('X', 'CommonNoun')
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenlish
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -136,6 +136,7 @@ files:
 - lib/zenlish/wclasses/proper_noun.rb
 - lib/zenlish/wclasses/regular_verb.rb
 - lib/zenlish/wclasses/regular_verb_want.rb
+- lib/zenlish/wclasses/relative_pronoun.rb
 - lib/zenlish/wclasses/subordinating_conjunction.rb
 - lib/zenlish/wclasses/test_hierarchy.rb
 - lib/zenlish/wclasses/verb.rb