zenlish 0.1.09 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750e9535d2fb78ea38521e183fdd583c0d654d9ad4111081b261944d15a44775
-  data.tar.gz: b6daa5ab5b66248bdd91c2c3f26e4cc8f552852409cc2c1f5b0fb4b359b7923b
+  metadata.gz: f22b9d962fc961e2216a043ef79b1deb793dca96ae528256dd785aa77894baa8
+  data.tar.gz: 246147e969e4606805914f4ea8313c19d6ed7a650b1c592cf2c20fac34374181
 SHA512:
-  metadata.gz: ba7ad7bcdf5391c95d4ff846484b6b55d403c4b2ffd1e2501c228471b05a14b687339604e390c5d2337eb95d7f47ee4f104b1b7404455816a7d8afe91ee36e0d
-  data.tar.gz: c313789bc4eba7a8d403942f5f53e543730bba60f707fc7fb195851da3fc97d124d7525e1f04ee7494ddb64f89985e8b5793bee190b2f06a4a96b7bd898a0bc3
+  metadata.gz: 4c3e2adf7b59659b45cea513a990dd9b14334bfe390f9f6bd4076ddcff299ab2dbf57768fade51257d2916e8a642522de9a3fddb1f73facb15629feb3a3a5a1f
+  data.tar.gz: de4bfa611281c709a6ab176d9cf0b50614eae1b9674f28d85a1a3f16c1367ee4e57ea4ca49ba285c7e3ec9c54452c4c62e808afc9d51a12a686bddc48e0d1c28

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # CHANGELOG
 
-## [0.1.08] - 2019-10-22
+## [0.1.10] - 2019-10-23
+__Zenlish__ can parse all sentences in lesson 1 and 2-A..2-B from
+ [Learn These Words First](http://learnthesewordsfirst.com/).
+ 
+### Added
+- Class `ConjunctivePronoun` to represent the conjunctive `what`.
+- Class `IrregularVerbDo` to represent the lexical verb `do`.
+
+### Changed
+- File `zparser_spec.rb`: tests include all sentences from lesson 2-B (87 sentences in total).
+- `ZenlishGrammar`: added support for complex sentence with one dependent clause like: "Something happens to Lisa because Tony does this.".
+- File `minimal_lexicon.rb`: new entries in lexicon `because`, `do`, `happen`, with.
+- File `README.md` Updated the metrics table, added AppVeyor badge
+
+## [0.1.09] - 2019-10-22
 __Zenlish__ can parse all sentences in lesson 1 and 2-A from
  [Learn These Words First](http://learnthesewordsfirst.com/).
  
@@ -10,7 +24,7 @@ __Zenlish__ can parse all sentences in lesson 1 and 2-A from
 - File `.appveyor.yml`
 
 ### Changed
-- File `zparser_spec.rb`: tests include all sentences from lesson 1-H (77 sentences in total).
+- File `zparser_spec.rb`: tests include all sentences from lesson 2-A (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

data/README.md

@@ -47,14 +47,14 @@ sentences of the first lesson.
 
 The intent is to deliver gem versions in small increments.
 
-#### Some project metrics (v. 0.1.08)
+#### Some project metrics (v. 0.1.10)
 |Metric|Value|  
 |:-:|:-:|
-| 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 |
+| Number of lemmas in lexicon           | 61 |
+| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 30 |
+| Number of production rules in grammar | 85 |
+| Number of lessons covered             | 10 |
+| Number of sentences in spec files     | 87 |
 
 
 ### Roadmap

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::IrregularVerbDo.new.freeze)        
         aLexicon.add_terminal(WClasses::IrregularVerbHave.new.freeze)        
         aLexicon.add_terminal(WClasses::IrregularVerbSay.new.freeze)         
         aLexicon.add_terminal(WClasses::LinkingAdverb.new.freeze)        

data/lib/zenlish/parser/zenlish_grammar.rb

@@ -11,10 +11,18 @@ builder = Rley::Syntax::GrammarBuilder.new do
 
   rule 'language' => 'sentence'
   rule 'sentence' => 'simple_sentence Period'
+  rule 'sentence' => 'complex_sentence Period'  
   rule 'simple_sentence' => 'declarative_simple_sentence'
-  rule 'simple_sentence' => 'conditional_statement'
+  rule 'complex_sentence' => 'main_clause 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 '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 'dependent_clause' => 'simple_sentence'
+  rule 'dependent_clause' => 'DemonstrativePronoun'
   rule 'affirmative_sentence' => 'noun_phrase verb_phrase'
   rule 'affirmative_sentence' => 'AdverbThere IrregularVerbBe verb_be_complement'
   rule 'affirmative_sentence' => 'numeral_of IrregularVerbBe verb_be_complement'
@@ -24,8 +32,6 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'negative_sentence' => 'AdverbThere negative_verb_phrase'
   rule 'negative_sentence' => 'numeral_of negative_verb_phrase'
   rule 'negative_sentence' => 'conjunctive_prefix negative_verb_phrase'
-  rule 'conditional_statement' => 'condition_subordinate Comma LinkingAdverb declarative_simple_sentence'
-  rule 'condition_subordinate' => 'SubordinatingConjunction declarative_simple_sentence'
   rule 'conjunctive_prefix' => 'ConjunctivePronoun noun_phrase verb_phrase'
   rule 'noun_phrase' => 'simple_noun_phrase'
   rule 'noun_phrase' => 'compound_noun_phrase'
@@ -59,6 +65,8 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'single_determiner' => 'IndefiniteQuantifier'
   rule 'verb_phrase' => 'verb_group'
   rule 'verb_phrase' => 'verb_group verb_complement'
+  rule 'verb_phrase' => 'RegularVerb propositional_phrase'
+  rule 'verb_phrase' => 'IrregularVerbDo DemonstrativePronoun'
   rule 'verb_phrase' => 'IrregularVerbBe verb_be_complement'
   rule 'verb_phrase' => 'IrregularVerbSay Colon Quote affirmative_sentence Period Quote'
   rule 'verb_complement' => 'noun_phrase'
@@ -77,6 +85,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'lexical_verb' => 'RegularVerb'
   rule 'lexical_verb' => 'IrregularVerb'
   rule 'lexical_verb' => 'IrregularVerbBe'
+  rule 'lexical_verb' => 'IrregularVerbDo'  
   rule 'lexical_verb' => 'IrregularVerbHave'  
   rule 'lexical_verb' => 'IrregularVerbSay'
   rule 'numeral' => 'Cardinal'
@@ -91,7 +100,7 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'propositional_phrase' => 'preposition'
   rule 'propositional_complement' => 'noun_phrase'
   rule 'preposition' => 'Preposition'
-  rule 'preposition' => 'PrepositionOf'
+  rule 'preposition' => 'PrepositionOf'  
 end
 
 

data/lib/zenlish/version.rb

@@ -1,3 +1,3 @@
 module Zenlish
-  VERSION = '0.1.09'
+  VERSION = '0.1.10'
 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_do'
 require_relative 'irregular_verb_have'
 require_relative 'irregular_verb_say'
 require_relative 'definite_article'

data/lib/zenlish/wclasses/irregular_verb_be.rb

@@ -2,7 +2,7 @@ require_relative 'irregular_verb'
 
 module Zenlish
   module WClasses
-    # TODO: document
+    # The `be` verb used as a lexical verb (as opposed auxiliary verb).
     class IrregularVerbBe < IrregularVerb
     end # class
   end # module

data/lib/zenlish/wclasses/irregular_verb_do.rb

@@ -0,0 +1,9 @@
+require_relative 'irregular_verb'
+
+module Zenlish
+  module WClasses
+    # The `do` verb used as a lexical verb (as opposed auxiliary verb).
+    class IrregularVerbDo < IrregularVerb
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/irregular_verb_have.rb

@@ -2,7 +2,7 @@ require_relative 'irregular_verb'
 
 module Zenlish
   module WClasses
-    # TODO: document
+    # The `have` verb used as a lexical verb (as opposed auxiliary verb).
     class IrregularVerbHave < IrregularVerb
     end # class
   end # module

data/lib/zenlish/wclasses/subordinating_conjunction.rb

@@ -2,7 +2,14 @@ require_relative 'conjunction'
 
 module Zenlish
   module WClasses
-    # TODO: if, 
+    # A subordinating conjunction is a word or phrase that connects a dependent
+    # clause to a main clause. The subordinating conjunction indicates how the
+    # dependent clause adds informative value to the main clause. For instance,
+    # by signaling a cause-and-effect relation, a shift in time or place between 
+    # the two clauses. 
+    # Common subordinating conjunctions: after, although, as, because, before, 
+    # how, if, once, since, than, that, though, till, until, when, where, 
+    # whether, while
     class SubordinatingConjunction < WordClass
     end # class
   end # module

data/spec/zenlish/parser/zparser_spec.rb

@@ -36,14 +36,17 @@ module Zenlish
       literal2var('all', 'all')
       literal2var('another', 'another')
       def are ;     Lex::Literal.new('are', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
+      literal2var('because', 'because')
       literal2var('big', 'big')
       literal2var('big', 'bigger')
       literal2var('as', 'as')
       literal2var('of', 'of')
-      literal2var('do', 'does')
+      def does ; Lex::Literal.new('does', get_lexeme('do', WClasses::IrregularVerbDo), 0) ; end
+      def does_aux ; Lex::Literal.new('does', get_lexeme('do', WClasses::AuxiliaryDo), 0) ; end
       literal2var('false', 'false', '_')
       literal2var('far', 'far')
       literal2var('from', 'from')
+      literal2var('happen', 'happens')
       literal2var('have', 'has')
       literal2var('have', 'have')
       literal2var('hear', 'hears')
@@ -94,6 +97,7 @@ module Zenlish
       literal2var('two', 'two')
       literal2var('very', 'very')
       literal2var('what', 'what')
+      literal2var('with', 'with')
       literal2var('word', 'words')
 
       def colon ;  Lex::Literal.new(':', get_lexeme(':'), 0) ; end
@@ -194,7 +198,7 @@ module Zenlish
           expect { subject.parse(literals) }.not_to raise_error
 
           # Sentence: "Lisa does not see people inside the other thing."
-          literals = [lisa, does, not_, see, people, inside, the, other, thing, dot]
+          literals = [lisa, does_aux, not_, see, people, inside, the, other, thing, dot]
           expect { subject.parse(literals) }.not_to raise_error
         end
 
@@ -441,23 +445,63 @@ module Zenlish
           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]
+          literals = [lisa, does_aux, 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
+
+          # Sentence 2-04a: "Lisa does something."
+          literals = [lisa, does, something, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-04b: "Lisa does something with this thing."
+          literals = [lisa, does, something, with, this, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-04c: "Lisa does something to Tony."
+          literals = [lisa, does, something, to, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-04d: "Lisa does something to Tony with this thing."
+          literals = [lisa, does, something, to, tony, with, this, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-05a: "Something happens."
+          literals = [something, happens, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-05b: "Something happens to Lisa."
+          literals = [something, happens, to, lisa, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-06a: "Tony does something."
+          literals = [tony, does, something, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 2-06b: "Something happens to Lisa because of this."
+          literals = [something, happens, to, lisa, because, of, this_as_pronoun, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+          
+          # Sentence 2-06c: "Something happens to Lisa because Tony does this."
+          literals = [something, happens, to, lisa, because, tony, does, this_as_pronoun, dot]
           expect { subject.parse(literals) }.not_to raise_error          
+          
+          # Sentence 2-06: "Something happens to this living thing."
+          literals = [something, happens, to, this, living, thing, 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
       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_do = $ZenlishLexicon.name2terminal['IrregularVerbDo']
 irregular_verb_have = $ZenlishLexicon.name2terminal['IrregularVerbHave']
 irregular_verb_say = $ZenlishLexicon.name2terminal['IrregularVerbSay']
 indefinite_pronoun = $ZenlishLexicon.name2terminal['IndefinitePronoun']
@@ -54,12 +55,15 @@ add_entry('another', adjective)
 add_entry('as', comparative_particle)
 add_entry('be', auxiliary_be)
 add_entry('be', irregular_verb_be)
+add_entry('because', subordinating_conjunction)
 add_entry('big', adjective)
 add_entry('do', auxiliary_do)
+add_entry('do', irregular_verb_do)
 add_entry('false', adjective)
 add_entry('far', adverb)
 add_entry('from', preposition)
-add_entry('have', irregular_verb_have) 
+add_entry('have', irregular_verb_have)
+add_entry('happen', regular_verb)
 add_entry('hear', irregular_verb) 
 add_entry('if', subordinating_conjunction)
 add_entry('in', preposition)
@@ -102,6 +106,7 @@ add_entry('true', adjective)
 add_entry('two', cardinal)
 add_entry('very', degree_adverb)
 add_entry('what',conjunctive_pronoun)
+add_entry('with',preposition)
 add_entry('word', common_noun)
 
 add_entry(':', colon)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenlish
 version: !ruby/object:Gem::Version
-  version: 0.1.09
+  version: 0.1.10
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -117,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_do.rb
 - lib/zenlish/wclasses/irregular_verb_have.rb
 - lib/zenlish/wclasses/irregular_verb_say.rb
 - lib/zenlish/wclasses/lexical_verb.rb