zenlish 0.1.04 → 0.1.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad99b6c50c66347cb8a6124b9900e658869d55e6cc1d64e389550ca4e7240365
-  data.tar.gz: 64b92c9f5fa2ff10090d0a5d96a026bd2457181f5cb3aae4af320f3298579011
+  metadata.gz: 893bd9e1c08f440d12c832af5341761618ad1eae4f2aad0ef422396fca126212
+  data.tar.gz: 3baa066201d7e7eb5b941c0e1e8c4f231967af2584d52ff90c966044032c6c7a
 SHA512:
-  metadata.gz: d628ab006a5b081d392c3c626cb16312b43a61900a9fc7ecdce97dc2e53810bb3c8fb570bbc446e37b2035440c0eb141def683ef7691aa5b14dd5c4a245d4429
-  data.tar.gz: 34d5fc456d007e78039893e50e5fdabee0edfc687447b07ae159c565a564339d2499cdf27ebf71fa844f42c988fcd7b10554b0b5aa17a6388997f3efb5f6101d
+  metadata.gz: 956d515847ca4d0762c54a485984b81c47544365ae5937bfff3b922766f2cb80c89e9eaab0d64dda525d870f2d51ffe06e6f5662f688a2a3e884709add439558
+  data.tar.gz: 76dd07d10526a8e0eaa0bdc3fc0ee9fd3740aa0d1fe77cf6ac04cf412ec2e4d8327db90b450d4d575621b1d35500c93ae48687c237faeb8dc57aa48ef1bf7c8b

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # CHANGELOG
 
+## [0.1.05] - 2019-10-19
+__Zenlish__ can parse all sentences in lessons 1-A ... 1-F from
+ [Learn These Words First](http://learnthesewordsfirst.com/).
+
+ ### Added
+- Class `Conjunction` to represent conjunctions.
+- Class `LinkingAdverb` to represent adverbs like `then`.
+- Class `PrepositionOf` to represent the preposition `of`.
+- Class `RegularVerb` to represent lexical verbs that have a regular conjugation like `touch`.
+- Class `SubordinatingConjunction` to represent subordinating conjunctions like `if`.
+
+
+### Changed
+- File `zparser_spec.rb`: tests include all sentences from lesson 1-F (37 sentences in total).
+- `ZenlishGrammar`: rule refactoring and enhancements (i.e. conditional_statement, verb_grouping).
+- File `minimal_lexicon.rb`: new entries in lexicon `another`, `be` (as auxiliary verb),
+ `far`, `from`, `if`, `kind`, `near to`, `of`, `then`, `touch`.
+- File `README.md` Updated the metrics table. Added badges for Travis CI and license.
+
+ ### Fixed
+- File `LICENSE.txt` Missing name.
+
 ## [0.1.04] - 2019-10-15
 __Zenlish__ can parse all sentences in lessons 1-A ... 1-E from
  [Learn These Words First](http://learnthesewordsfirst.com/).

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 TODO: Write your name
+Copyright (c) 2019, Dimitri Geshef
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,7 @@
 # Zenlish
+[![Linux build Status](https://travis-ci.org/famished-tiger/Zenlish.svg?branch=master)](https://travis-ci.org/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__ ?  
 
 Zenlish = Zen + English  
@@ -40,18 +41,19 @@ users with a language that is close enough to English.
 
 ### Project status
 
-The project is still in inception. 
-#### Some project metrics (v. 0.1.04)
+The project is still in inception.
+#### Some project metrics (v. 0.1.05)
 |Metric|Value|  
 |:-:|:-:|
-| Number of lemmas in lexicon           | 32 |
-| Number of production rules in grammar | 53 |
-| Number of lessons covered             |  4 |
-| Number of sentences in spec files     | 37 |
+| Number of lemmas in lexicon           | 41 |
+| [Coverage 100 commonest English words](https://en.wikipedia.org/wiki/Most_common_words_in_English)  | 20 |
+| Number of production rules in grammar | 69 |
+| Number of lessons covered             |  6 |
+| Number of sentences in spec files     | 48 |
 
 
 ### Roadmap
- 
+
 Here a tentative roadmap:
 
 #### A) Support vocabulary and sentences from [Learn These Words First](http://learnthesewordsfirst.com/)
@@ -59,8 +61,8 @@ 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
 (Natural Semantic Metalanguage)](https://en.wikipedia.org/wiki/Natural_semantic_metalanguage).  
-The essential words are introduced in twelve lessons. Each lesson put the Words
-in examplar sentences and pictures.
+The essential words are introduced in twelve lessons. Each lesson put the words
+in exemplar sentences and pictures.
 
 The project sub-goals are:
 - To inject the 300 core words into Zenlish lexicon,

data/lib/zenlish/lex/empty_lexicon_factory.rb

@@ -18,8 +18,8 @@ module Zenlish
         aLexicon.add_terminal(WClasses::Adjective.new.freeze)
         aLexicon.add_terminal(WClasses::Adverb.new.freeze)
         aLexicon.add_terminal(WClasses::AdverbNot.new.freeze)
-        aLexicon.add_terminal(WClasses::AdverbThere.new.freeze)        
-        # aLexicon.add_terminal(WClasses::AuxiliaryBe.new.freeze)
+        aLexicon.add_terminal(WClasses::AdverbThere.new.freeze)
+        aLexicon.add_terminal(WClasses::AuxiliaryBe.new.freeze)
         aLexicon.add_terminal(WClasses::AuxiliaryDo.new.freeze)        
         aLexicon.add_terminal(WClasses::Cardinal.new.freeze)
         aLexicon.add_terminal(WClasses::CommonNoun.new.freeze)
@@ -30,14 +30,19 @@ module Zenlish
         aLexicon.add_terminal(WClasses::DemonstrativePronoun.new.freeze)        
         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::IrregularVerbBe.new.freeze)   
+        aLexicon.add_terminal(WClasses::LinkingAdverb.new.freeze)        
         aLexicon.add_terminal(WClasses::Preposition.new.freeze)
-        aLexicon.add_terminal(WClasses::PrepositionThan.new.freeze)        
+        aLexicon.add_terminal(WClasses::PrepositionOf.new.freeze)        
+        aLexicon.add_terminal(WClasses::PrepositionThan.new.freeze) 
+        aLexicon.add_terminal(WClasses::RegularVerb.new.freeze)         
         aLexicon.add_terminal(WClasses::ProperNoun.new.freeze)
         aLexicon.add_terminal(WClasses::IndefiniteQuantifier.new.freeze)
+        aLexicon.add_terminal(WClasses::SubordinatingConjunction.new.freeze)        
       end
 
       def add_punctuation(aLexicon)
+        aLexicon.add_terminal(Rley::Syntax::Terminal.new('Comma'))
         aLexicon.add_terminal(Rley::Syntax::Terminal.new('Period'))
       end
     end # module

data/lib/zenlish/parser/zenlish_grammar.rb

@@ -11,66 +11,85 @@ builder = Rley::Syntax::GrammarBuilder.new do
   # add_terminals('Period')
 
   rule 'language' => 'sentence'
-  rule 'sentence' => 'simple_sentence'
-  rule 'simple_sentence' => 'declarative_simple_sentence Period'
-  rule 'declarative_simple_sentence' => 'affirmative_sentence'  
+  rule 'sentence' => 'simple_sentence Period'
+  rule 'simple_sentence' => 'declarative_simple_sentence'
+  rule 'simple_sentence' => 'conditional_statement'
+  rule 'declarative_simple_sentence' => 'affirmative_sentence'
   rule 'declarative_simple_sentence' => 'negative_sentence'
   rule 'affirmative_sentence' => 'noun_phrase verb_phrase'
-  rule 'affirmative_sentence' => 'AdverbThere IrregularVerbBe verb_complement'  
+  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 'negative_sentence' => 'noun_phrase negative_verb_phrase'
-  rule 'negative_sentence' => 'AdverbThere negative_verb_phrase'  
-  rule 'noun_phrase' => 'nominal'
-  rule 'noun_phrase' => 'determiner nominal'
-  rule 'noun_phrase' => 'numeral nominal'
-  
-  # Case: ... one of these things.
-  rule 'noun_phrase' => 'numeral Preposition DemonstrativeDeterminer noun_phrase'
-  rule 'noun_phrase' => 'numeral Preposition DemonstrativeDeterminer'   
-  rule 'noun_phrase' => 'determiner numeral nominal' 
-  
-  # CGE p.359, 360: of + definite noun phrase
-  rule 'noun_phrase' => 'determiner Preposition DemonstrativeDeterminer noun_phrase' 
-  rule 'noun_phrase' => 'ProperNoun'
-  rule 'noun_phrase' => 'DemonstrativePronoun'  
-  rule 'noun_phrase' => 'IndefinitePronoun'  
+  rule 'negative_sentence' => 'AdverbThere negative_verb_phrase'
+  rule 'negative_sentence' => 'numeral_of negative_verb_phrase'
+  rule 'conditional_statement' => 'condition_subordinate Comma LinkingAdverb declarative_simple_sentence'
+  rule 'condition_subordinate' => 'SubordinatingConjunction declarative_simple_sentence'  
+  rule 'noun_phrase' => 'simple_noun_phrase'
+  rule 'noun_phrase' => 'compound_noun_phrase'
+  rule 'simple_noun_phrase' => 'nominal'
+  rule 'simple_noun_phrase' => 'determiner nominal'
+  rule 'simple_noun_phrase' => 'numeral nominal'
+  rule 'simple_noun_phrase' => 'determiner numeral nominal'
+
+  # Case: (all|many|some) one of (this|these)
+  rule 'simple_noun_phrase' => 'subset_of noun_phrase'
+
+  # CGE p.359, 360: <numeral> of + definite noun phrase
+  rule 'simple_noun_phrase' => 'numeral_of noun_phrase'
+  rule 'simple_noun_phrase' => 'ProperNoun'
+  # rule 'simple_noun_phrase' => 'DemonstrativePronoun'
+  rule 'simple_noun_phrase' => 'IndefinitePronoun'
+
+  rule 'compound_noun_phrase' => 'simple_noun_phrase propositional_phrase'
+  rule 'compound_noun_phrase' => 'simple_noun_phrase comparative_clause'
+
+  # <numeral> of this/these...
+  rule 'numeral_of' => 'numeral PrepositionOf DemonstrativeDeterminer'
+  rule 'subset_of' => 'IndefiniteQuantifier PrepositionOf DemonstrativeDeterminer'
   rule 'nominal' => 'CommonNoun'
   rule 'nominal' => 'Adjective CommonNoun'
-  rule 'nominal' => 'Adjective CommonNoun comparative_clause'
-  rule 'nominal' => 'Adjective comparative_clause'  
   rule 'determiner' => 'determiner single_determiner'
-  rule 'determiner' => 'single_determiner'  
+  rule 'determiner' => 'single_determiner'
   rule 'single_determiner' => 'DemonstrativeDeterminer'
   rule 'single_determiner' => 'DefiniteArticle'
   rule 'single_determiner' => 'IndefiniteQuantifier'
-  rule 'verb_phrase' => 'lexical_verb'
-  rule 'verb_phrase' => 'lexical_verb verb_complement'
+  rule 'verb_phrase' => 'verb_group'
+  rule 'verb_phrase' => 'verb_group verb_complement'
   rule 'verb_phrase' => 'IrregularVerbBe verb_be_complement'
   rule 'verb_complement' => 'noun_phrase'
-  rule 'verb_complement' => 'adverb_phrase'   
-  rule 'verb_complement' => 'propositional_phrase'
+  rule 'verb_complement' => 'adverb_phrase'
   rule 'verb_complement' => 'noun_phrase adverb_phrase'
-  rule 'verb_complement' => 'noun_phrase propositional_phrase'
+  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 'adjective_as_complement' => 'DegreeAdverb Adjective'
   rule 'adjective_as_complement' => 'Adjective'
-  rule 'negative_verb_phrase' => 'IrregularVerbBe AdverbNot verb_complement'
-  rule 'negative_verb_phrase' => 'IrregularVerbBe AdverbNot Adjective'  
+  rule 'adjective_as_complement' => 'Adjective comparative_clause'  
+  rule 'negative_verb_phrase' => 'IrregularVerbBe AdverbNot verb_be_complement'
   rule 'negative_verb_phrase' => 'AuxiliaryDo AdverbNot verb_phrase'
+  rule 'verb_group' => 'lexical_verb'
+  rule 'verb_group' => 'AuxiliaryBe lexical_verb'  
+  rule 'lexical_verb' => 'RegularVerb'  
   rule 'lexical_verb' => 'IrregularVerb'
   rule 'lexical_verb' => 'IrregularVerbBe'
   rule 'numeral' => 'Cardinal'
-  rule 'comparative_clause' => 'comparative_start noun_phrase'  
+  rule 'comparative_clause' => 'comparative_start noun_phrase'
   rule 'comparative_clause' => 'comparative_start affirmative_sentence'
-  rule 'comparative_start' => 'PrepositionThan'  
+  rule 'comparative_clause' => 'comparative_start DefiniteArticle Adjective Cardinal'  
+  rule 'comparative_start' => 'PrepositionThan'
   rule 'comparative_start' => 'ComparativeParticle'
   rule 'adverb_phrase' => 'Adverb'
   rule 'adverb_phrase' => 'Adverb propositional_phrase'
-  rule 'propositional_phrase' => 'Preposition propositional_complement'
+  rule 'propositional_phrase' => 'preposition propositional_complement'
+  rule 'propositional_phrase' => 'preposition'
   rule 'propositional_complement' => 'noun_phrase'
+  rule 'preposition' => 'Preposition'
+  rule 'preposition' => 'PrepositionOf'
 end
 
 
-# CGE p. 354 The order of determiners: quantifier > article or demonstrative 
+# CGE p. 354 The order of determiners: quantifier > article or demonstrative
 # or possessive > numeral > head
 
 # And now build the grammar...

data/lib/zenlish/version.rb

@@ -1,3 +1,3 @@
 module Zenlish
-  VERSION = '0.1.04'
+  VERSION = '0.1.05'
 end

data/lib/zenlish/wclasses/all_word_classes.rb

@@ -20,5 +20,9 @@ require_relative 'demonstrative_determiner'
 require_relative 'demonstrative_pronoun'
 require_relative 'indefinite_pronoun'
 require_relative 'indefinite_quantifier'
+require_relative 'linking_adverb'
 require_relative 'preposition'
-require_relative 'preposition_than'
+require_relative 'preposition_of'
+require_relative 'preposition_than'
+require_relative 'regular_verb'
+require_relative 'subordinating_conjunction'

data/lib/zenlish/wclasses/conjunction.rb

@@ -0,0 +1,9 @@
+require_relative 'word_class'
+
+module Zenlish
+  module WClasses
+    # TODO: document
+    class Conjunction < WordClass
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/linking_adverb.rb

@@ -0,0 +1,9 @@
+require_relative 'adverb'
+
+module Zenlish
+  module WClasses
+    # TODO: e.g. then
+    class LinkingAdverb < Adverb
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/preposition_of.rb

@@ -0,0 +1,9 @@
+require_relative 'preposition'
+
+module Zenlish
+  module WClasses
+    # the 'of' preposition
+    class PrepositionOf < Preposition
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/preposition_than.rb

@@ -1,4 +1,4 @@
-require_relative 'preposition_than'
+require_relative 'preposition'
 
 module Zenlish
   module WClasses

data/lib/zenlish/wclasses/regular_verb.rb

@@ -0,0 +1,9 @@
+require_relative 'lexical_verb'
+
+module Zenlish
+  module WClasses
+    # TODO: document 'touch'
+    class RegularVerb < LexicalVerb
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/subordinating_conjunction.rb

@@ -0,0 +1,9 @@
+require_relative 'conjunction'
+
+module Zenlish
+  module WClasses
+    # TODO: if, 
+    class SubordinatingConjunction < WordClass
+    end # class
+  end # module
+end # module

data/spec/zenlish/parser/zparser_spec.rb

@@ -32,18 +32,25 @@ module Zenlish
       # For instance, next line will create a variable called 'alive'
       literal2var('alive', 'alive')
       literal2var('all', 'all')
-      literal2var('be', 'are')
+      literal2var('another', 'another')
+      def are ;     Lex::Literal.new('are', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
       literal2var('big', 'big')
-      literal2var('big', 'bigger')      
+      literal2var('big', 'bigger')
       literal2var('as', 'as')
       literal2var('of', 'of')
       literal2var('do', 'does')
+      literal2var('far', 'far')
+      literal2var('from', 'from')
+      literal2var('if', 'if', '_')
       literal2var('inside', 'inside')
-      def is ; Lex::Literal.new('is', get_lexeme('be', WClasses::IrregularVerbBe), 0) ; end
+      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('Lisa', 'Lisa')
       literal2var('living', 'living')
       literal2var('many', 'many')
       literal2var('more', 'more')
+      literal2var('near to', 'near_to')      
       literal2var('not', 'not', '_')
       literal2var('one', 'one')
       literal2var('two', 'two')
@@ -52,22 +59,27 @@ module Zenlish
       literal2var('person', 'person')
       literal2var('same', 'same')
       literal2var('small', 'small')
-      literal2var('small', 'smaller')      
+      literal2var('small', 'smaller')
       literal2var('some', 'some')
       literal2var('see', 'see')
       literal2var('see', 'sees')
       literal2var('something', 'something')
       literal2var('the', 'the')
+      literal2var('then', 'then', '_')
       literal2var('than', 'than')
       literal2var('there', 'there')
       literal2var('thing', 'thing')
       literal2var('thing', 'things')
-      literal2var('this', 'these')      
-      literal2var('this', 'this')
+      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
+      def this ; Lex::Literal.new('this', get_lexeme('this', WClasses::DemonstrativeDeterminer), 0) ; end
+      def this_as_pronoun ; Lex::Literal.new('this', get_lexeme('this', WClasses::DemonstrativePronoun), 0) ; end
       literal2var('this one', 'this_one')
       literal2var('Tony', 'Tony')
+      literal2var('touch', 'touching')
       literal2var('very', 'very')
 
+      def comma ;  Lex::Literal.new(',', get_lexeme(','), 0) ; end
       def dot ;  Lex::Literal.new('.', get_lexeme('.'), 0) ; end
 
       class ZProxy
@@ -245,10 +257,57 @@ module Zenlish
           # Sentence: "This thing is bigger than the other thing."
           literals = [this, thing, is, bigger, than, the, other, thing, dot]
           expect { subject.parse(literals) }.not_to raise_error
-          
+
           # Sentence: "This thing is smaller than the other thing."
           literals = [this, thing, is, smaller, than, the, other, thing, dot]
-          expect { subject.parse(literals) }.not_to raise_error          
+          expect { subject.parse(literals) }.not_to raise_error
+        end
+
+        it 'should parse sample sentences from lesson 1-E' do
+          # Sentence 1-20a: "Tony sees some living things."
+          literals = [tony, sees, some, living, things, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-20b: "Two of these are the same kind of living thing."
+          literals = [these_as_pronoun, are, the, same, kind, of, living, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-20c: "One of these is not the same kind as the other two."
+          literals = [one, of, these, is, not_, the, same, kind, as, the, other, two, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-21a: "There is one person inside this thing."
+          literals = [there, is, one, person, inside, this, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-21b: "If Tony is not inside this thing, then another person is inside."
+          literals = [if_, tony, is, not_, inside, this, thing, comma, then_,
+            another, person, is, inside, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-22a: "Tony is touching something."
+          literals = [tony, is_aux, touching, something, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-22b: Lisa is touching Tony."
+          literals = [lisa, is_aux, touching, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-23a: Tony is far from Lisa."
+          literals = [tony, is, far, from, lisa, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+          
+          # Sentence 1-23b: Lisa is far from Tony."
+          literals = [lisa, is, far, from, tony, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-23c: Tony is not far from Lisa."
+          literals = [tony, is, far, from, lisa, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-24: Tony is near to Lisa."
+          literals = [tony, is, near_to, lisa, dot]
+          expect { subject.parse(literals) }.not_to raise_error        
         end
       end # context
     end # describe

data/spec/zenlish/support/minimal_lexicon.rb

@@ -10,12 +10,15 @@ adverb = $ZenlishLexicon.name2terminal['Adverb']
 adverb_not = $ZenlishLexicon.name2terminal['AdverbNot']
 adverb_there = $ZenlishLexicon.name2terminal['AdverbThere']
 degree_adverb = $ZenlishLexicon.name2terminal['DegreeAdverb']
-# auxiliary_be = $ZenlishLexicon.name2terminal['AuxiliaryBe']
+auxiliary_be = $ZenlishLexicon.name2terminal['AuxiliaryBe']
 auxiliary_do = $ZenlishLexicon.name2terminal['AuxiliaryDo']
 common_noun = $ZenlishLexicon.name2terminal['CommonNoun']
+linking_adverb = $ZenlishLexicon.name2terminal['LinkingAdverb']
 proper_noun = $ZenlishLexicon.name2terminal['ProperNoun']
 preposition = $ZenlishLexicon.name2terminal['Preposition']
+preposition_of = $ZenlishLexicon.name2terminal['PrepositionOf']
 preposition_than = $ZenlishLexicon.name2terminal['PrepositionThan']
+regular_verb = $ZenlishLexicon.name2terminal['RegularVerb']
 irregular_verb = $ZenlishLexicon.name2terminal['IrregularVerb']
 irregular_verb_be = $ZenlishLexicon.name2terminal['IrregularVerbBe']
 indefinite_pronoun = $ZenlishLexicon.name2terminal['IndefinitePronoun']
@@ -25,6 +28,8 @@ definite_article = $ZenlishLexicon.name2terminal['DefiniteArticle']
 cardinal = $ZenlishLexicon.name2terminal['Cardinal']
 comparative_particle = $ZenlishLexicon.name2terminal['ComparativeParticle']
 indefinite_quantifier = $ZenlishLexicon.name2terminal['IndefiniteQuantifier']
+subordinating_conjunction = $ZenlishLexicon.name2terminal['SubordinatingConjunction']
+comma = $ZenlishLexicon.name2terminal['Comma']
 dot = $ZenlishLexicon.name2terminal['Period']
 
 def add_entry(aLemma, aWordClass)
@@ -37,18 +42,24 @@ end
 # Our minimalistic lexicon
 add_entry('alive', adjective)
 add_entry('all', indefinite_quantifier)
+add_entry('another', adjective)
 add_entry('as', comparative_particle)
-# add_entry('be', auxiliary_be)
+add_entry('be', auxiliary_be)
 add_entry('be', irregular_verb_be)
 add_entry('big', adjective)
 add_entry('do', auxiliary_do)
+add_entry('far', adverb)
+add_entry('from', preposition)
+add_entry('if', subordinating_conjunction)
 add_entry('inside', preposition)
+add_entry('kind', common_noun)
 add_entry('Lisa', proper_noun)
 add_entry('living', adjective)
 add_entry('many', indefinite_quantifier)
 add_entry('more', adjective)
+add_entry('near to', preposition)
 add_entry('not', adverb_not)
-add_entry('of', preposition)
+add_entry('of', preposition_of)
 add_entry('one', cardinal)
 add_entry('other', adjective)
 add_entry('people', common_noun)
@@ -60,12 +71,16 @@ add_entry('some', indefinite_quantifier)
 add_entry('something', indefinite_pronoun)
 add_entry('than', preposition_than)
 add_entry('the', definite_article)
+add_entry('then', linking_adverb)
 add_entry('there', adverb_there)
 add_entry('thing', common_noun)
 add_entry('this', demonstrative_determiner)
+add_entry('this', demonstrative_pronoun)
 add_entry('this one', demonstrative_pronoun)
 add_entry('Tony', proper_noun)
+add_entry('touch', regular_verb)
 add_entry('two', cardinal)
 add_entry('very', degree_adverb)
 
+add_entry(',', comma)
 add_entry('.', dot)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenlish
 version: !ruby/object:Gem::Version
-  version: 0.1.04
+  version: 0.1.05
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -105,6 +105,7 @@ files:
 - lib/zenlish/wclasses/cardinal.rb
 - lib/zenlish/wclasses/common_noun.rb
 - lib/zenlish/wclasses/comparative_particle.rb
+- lib/zenlish/wclasses/conjunction.rb
 - lib/zenlish/wclasses/definite_article.rb
 - lib/zenlish/wclasses/degree_adverb.rb
 - lib/zenlish/wclasses/demonstrative_determiner.rb
@@ -115,12 +116,16 @@ files:
 - lib/zenlish/wclasses/irregular_verb.rb
 - lib/zenlish/wclasses/irregular_verb_be.rb
 - lib/zenlish/wclasses/lexical_verb.rb
+- lib/zenlish/wclasses/linking_adverb.rb
 - lib/zenlish/wclasses/noun.rb
 - lib/zenlish/wclasses/numeral.rb
 - lib/zenlish/wclasses/preposition.rb
+- lib/zenlish/wclasses/preposition_of.rb
 - lib/zenlish/wclasses/preposition_than.rb
 - lib/zenlish/wclasses/pronoun.rb
 - lib/zenlish/wclasses/proper_noun.rb
+- lib/zenlish/wclasses/regular_verb.rb
+- lib/zenlish/wclasses/subordinating_conjunction.rb
 - lib/zenlish/wclasses/test_hierarchy.rb
 - lib/zenlish/wclasses/verb.rb
 - lib/zenlish/wclasses/word_class.rb