zenlish 0.1.0 → 0.1.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026405b993a2736b1e5c5341308aa1ffab8e77ba07dfc38d2e2344e183c466a7
-  data.tar.gz: 795d56d6e9b9c5204678912833c5817d04fef64e56e2128ac6ad6962b349b676
+  metadata.gz: f528c0f3df40d32748dde807e2ce52554640228b52595f7509b7f00ca0799f7d
+  data.tar.gz: 5845c212c6850e767720bf2eef53e8ff4fc0cebf7eac93c77d6fe30ab70c852c
 SHA512:
-  metadata.gz: 1bc6680bbd7f6da39d795903c4ec9b67061bfbbc409289669f37a3fa97d50f176bc634f0b6c10a6f2de54b81e5595d38fbddad0dffb9a97b555c2bd83eb68d86
-  data.tar.gz: a3772e8100491357a0776a4a83cf039ca17d7ba01792284ad4e92d96c4666b2394815199e9681853f4b796cea6f533cab81da65b6b6756b79a5559183f22d2db
+  metadata.gz: ecb70f4531e577ecbb15772edc118a3fc0c4b9cd06cc7c62dbe404cc4be2cbe576465d92678fadde229414ee55ad40c068d8a5e76a34ae2726616d450211263c
+  data.tar.gz: 21854cf7b004a6def164ee239448a8ef0dc9a93ff4c490f9f1e505b52dc16a6080c3323a8aeeafff5ff8741d3a92eac281e891baf533b7f72531e7787b76445b

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# CHANGELOG
+
+## [0.1.01] - 2019-10-10
+__Zenlish__ can parse all the sentences in lessons 1-A, 1-B from [Learn These Words First](http://learnthesewordsfirst.com/).
+
+### Added
+- Class `Cardinal` to represent the abstract word class for cardinal and ordinal numbers.
+- Class `Cardinal` to represent the word class of cardinal numbers.
+- Class `ComparativeArticle` to represent the word class of the `as` in `same as`.
+- File `empty_lexion_factory.rb`: added the `Cardinal` and `ComparativeArticle` as word classes in lexicon.
+- File `minimal_lexicon.rb`: new entries in lexicon `as` (from same ... as expression),
+`one`, `two`, `person` , `people.`
+
+
+### Changed
+- File `README.md` added Rubygems badge.
+- File `zparser_spec.rb`: tests include all sentences from lesson 1-B.
+- `ZenlishGrammar`: grammar refactoring and extension.
+
+
+### Fixed
+- File `zenlish.gemspec`: fixed typo in a Github hyperlink.
+
+## [0.1.0] - 2019-10-06
+Initial project commit in Github and first gem version released.

data/README.md

@@ -1,4 +1,5 @@
 # Zenlish
+[![Gem Version](https://badge.fury.io/rb/zenlish.svg)](https://badge.fury.io/rb/zenlish)
 
 ### What is __Zenlish__ ?  
 

data/lib/zenlish/lex/empty_lexicon_factory.rb

@@ -15,13 +15,15 @@ module Zenlish
       private
 
       def add_word_classes(aLexicon)
-        aLexicon.add_terminal(WClasses::CommonNoun.new)
-        aLexicon.add_terminal(WClasses::ProperNoun.new)
-        aLexicon.add_terminal(WClasses::IrregularVerb.new)
-        aLexicon.add_terminal(WClasses::Adjective.new)
-        aLexicon.add_terminal(WClasses::DefiniteArticle.new)
-        aLexicon.add_terminal(WClasses::DemonstrativeDeterminer.new)
-        aLexicon.add_terminal(WClasses::IndefinitePronoun.new)
+        aLexicon.add_terminal(WClasses::Adjective.new.freeze)
+        aLexicon.add_terminal(WClasses::Cardinal.new.freeze)
+        aLexicon.add_terminal(WClasses::CommonNoun.new.freeze)
+        aLexicon.add_terminal(WClasses::ComparativeParticle.new.freeze)
+        aLexicon.add_terminal(WClasses::DefiniteArticle.new.freeze)
+        aLexicon.add_terminal(WClasses::DemonstrativeDeterminer.new.freeze)
+        aLexicon.add_terminal(WClasses::IndefinitePronoun.new.freeze)
+        aLexicon.add_terminal(WClasses::IrregularVerb.new.freeze)
+        aLexicon.add_terminal(WClasses::ProperNoun.new.freeze)
       end
 
       def add_punctuation(aLexicon)

data/lib/zenlish/parser/zenlish_grammar.rb

@@ -12,18 +12,29 @@ builder = Rley::Syntax::GrammarBuilder.new do
 
   rule 'language' => 'sentence'
   rule 'sentence' => 'simple_sentence'
-  rule 'simple_sentence' => 'declarative_simple_sentence'
-  rule 'declarative_simple_sentence' => 'noun_phrase verb_phrase Period'
-  rule 'noun_phrase' => 'noun'
-  rule 'noun' => 'ProperNoun'
-  rule 'noun' => 'CommonNoun'
-  rule 'verb_phrase' => 'lexical_verb complement'
+  rule 'simple_sentence' => 'declarative_simple_sentence Period'
+  rule 'declarative_simple_sentence' => 'noun_phrase verb_phrase'
+  rule 'noun_phrase' => 'noun_bar'
+  rule 'noun_phrase' => 'determiner noun_bar'
+  rule 'noun_phrase' => 'numeral noun_bar'  
+  rule 'noun_phrase' => 'determiner numeral noun_bar'
+  rule 'noun_phrase' => 'ProperNoun' 
+  rule 'noun_phrase' => 'IndefinitePronoun'  
+  rule 'noun_bar' => 'CommonNoun'
+  rule 'noun_bar' => 'Adjective CommonNoun'
+  rule 'noun_bar' => 'Adjective CommonNoun comparative_clause'  
+  rule 'determiner' => 'DemonstrativeDeterminer'
+  rule 'determiner' => 'DefiniteArticle'
+  rule 'verb_phrase' => 'lexical_verb'
+  rule 'verb_phrase' => 'lexical_verb noun_phrase'
   rule 'lexical_verb' => 'IrregularVerb'
-  rule 'complement' => 'ProperNoun'
-  rule 'complement' => 'IndefinitePronoun'
-  rule 'complement' => 'DemonstrativeDeterminer noun'
-  rule 'complement' => 'DefiniteArticle Adjective CommonNoun'
+  rule 'numeral' => 'Cardinal'
+  rule 'comparative_clause' => 'comparative_start noun_phrase verb_phrase'
+  rule 'comparative_start' => 'ComparativeParticle'
 end
 
+# CGE p. 354 The order of determiners: quantifier > article or demonstrative 
+# or possessive > numeral > head
+
 # And now build the grammar...
 ZenlishGrammar = builder.grammar

data/lib/zenlish/version.rb

@@ -1,3 +1,3 @@
 module Zenlish
-  VERSION = "0.1.0"
+  VERSION = '0.1.01'
 end

data/lib/zenlish/wclasses/all_word_classes.rb

@@ -2,6 +2,8 @@
 # Algorithm: load the leaf classes from hierarchy
 
 require_relative 'adjective'
+require_relative 'cardinal'
+require_relative 'comparative_particle'
 require_relative 'common_noun'
 require_relative 'pronoun'
 require_relative 'proper_noun'

data/lib/zenlish/wclasses/cardinal.rb

@@ -0,0 +1,9 @@
+require_relative 'numeral'
+
+module Zenlish
+  module WClasses
+    # TODO: document
+    class Cardinal < Numeral
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/comparative_particle.rb

@@ -0,0 +1,10 @@
+require_relative 'word_class'
+
+module Zenlish
+  module WClasses
+    # TODO: document 
+    # Example: 'as' in 'same ... as'
+    class ComparativeParticle < WordClass
+    end # class
+  end # module
+end # module

data/lib/zenlish/wclasses/numeral.rb

@@ -0,0 +1,9 @@
+require_relative 'determiner'
+
+module Zenlish
+  module WClasses
+    # TODO: document
+    class Numeral < Determiner
+    end # class
+  end # module
+end # module

data/spec/zenlish/parser/zparser_spec.rb

@@ -16,69 +16,94 @@ module Zenlish
         end
       end # context
 
-      context 'Provided services:' do
-        def get_lexeme(aLemma)
-          $ZenlishLexicon.get_lexeme(aLemma)
-        end
+      def get_lexeme(aLemma)
+        $ZenlishLexicon.get_lexeme(aLemma)
+      end
 
-        let(:tony) do
-          Lex::Literal.new('Tony', $ZenlishLexicon.get_lexeme('Tony'), 0)
-        end
-        let(:lisa) do
-          Lex::Literal.new('Lisa', $ZenlishLexicon.get_lexeme('Lisa'), 0)
-        end
-        let(:the) do
-          Lex::Literal.new('the', $ZenlishLexicon.get_lexeme('the'), 0)
-        end
-        let(:other) do
-          Lex::Literal.new('other', $ZenlishLexicon.get_lexeme('other'), 0)
-        end
-        let(:sees) do
-          Lex::Literal.new('sees', $ZenlishLexicon.get_lexeme('see'), 0)
-        end
-        let(:dot) do
-          Lex::Literal.new('.', $ZenlishLexicon.get_lexeme('.'), 0)
-        end
-        let(:something) do
-          Lex::Literal.new('something', $ZenlishLexicon.get_lexeme('something'), 0)
-        end
-        let(:thing) do
-          Lex::Literal.new('thing', $ZenlishLexicon.get_lexeme('thing'), 0)
+      def as ; Lex::Literal.new('as', get_lexeme('as'), 0) ; end
+      def lisa ; Lex::Literal.new('Lisa', get_lexeme('Lisa'), 0) ; end
+      def one ;  Lex::Literal.new('one', get_lexeme('one'), 0) ; end
+      def two ;  Lex::Literal.new('two', get_lexeme('two'), 0) ; end
+      def other ;  Lex::Literal.new('other', get_lexeme('other'), 0) ; end
+      def people ;  Lex::Literal.new('people', get_lexeme('people'), 0) ; end
+      def person ;  Lex::Literal.new('person', get_lexeme('person'), 0) ; end
+      def same ;  Lex::Literal.new('same', get_lexeme('same'), 0) ; end
+      def sees ; Lex::Literal.new('sees', get_lexeme('see'), 0) ; end
+      def something ;  Lex::Literal.new('something', get_lexeme('something'), 0) ; end
+      def the ;  Lex::Literal.new('the', get_lexeme('the'), 0) ; end
+      def thing ;  Lex::Literal.new('thing', get_lexeme('thing'), 0) ; end
+      def things ;  Lex::Literal.new('things', get_lexeme('thing'), 0) ; end
+      def this ;  Lex::Literal.new('this', get_lexeme('this'), 0) ; end
+      def tony ;  Lex::Literal.new('Tony', get_lexeme('Tony'), 0) ; end
+      def dot ;  Lex::Literal.new('.', get_lexeme('.'), 0) ; end
+
+      class ZProxy
+        attr_reader :literal
+
+        def initialize(aTarget)
+          @literal = aTarget
         end
-        let(:this) do
-          Lex::Literal.new('this', $ZenlishLexicon.get_lexeme('this'), 0)
+
+        def method_missing(name, *args, &aBlock)
+          puts "#{literal.lexeme} about to receive #{name}"
+          $stdout.flush
+          literal.send(name, *args, &aBlock)
         end
+      end
 
-        it 'should parse sample sentence 1-01' do
-          # Sentence is: "Tony sees Lisa."
+      context 'Parsing lessons:' do
+        it 'should parse sample sentences from lesson 1-A' do
+          # Sentence 1-01: "Tony sees Lisa."
           # in absence of a tokenizer, we create a sequence of literals by hand...
+          # prox_tony = ZProxy.new(tony)
           literals = [tony, sees, lisa, dot]
           expect { subject.parse(literals) }.not_to raise_error
-        end
 
-        it 'should parse sample sentence 1-02a' do
-          # Sentence is: "Tony sees something."
+          # Sentence 1-02a: "Tony sees something."
           sentence_literals = [tony, sees, something, dot]
           expect { subject.parse(sentence_literals) }.not_to raise_error
-        end
 
-        it 'should parse sample sentence 1-02b' do
-          # Sentence is: "Lisa sees something"
+          # Sentence 1-02b: "Lisa sees something."
           sentence_literals = [lisa, sees, something, dot]
           expect { subject.parse(sentence_literals) }.not_to raise_error
-        end
 
-        it 'should parse sample sentence 1-03' do
-          # Sentence is: "Tony sees this thing."
+          # Sentence 1-03: "Tony sees this thing."
           sentence_literals = [tony, sees, this, thing, dot]
           expect { subject.parse(sentence_literals) }.not_to raise_error
-        end
 
-        it 'should parse sample sentence 1-04' do
-          # Sentence is: "Lisa sees the other thing."
+          # Sentence 1-04: "Lisa sees the other thing."
           sentence_literals = [lisa, sees, the, other, thing, dot]
           expect { subject.parse(sentence_literals) }.not_to raise_error
         end
+
+        it 'should parse sample sentences from lesson 1-B' do
+          # Sentence 1-05a: "Lisa sees the same thing."
+          literals = [lisa, sees, the, same, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-05b: "Lisa sees the same thing as Tony sees."
+          literals = [lisa, sees, the, same, thing, as, tony, sees, dot]
+          # same is an adjective of equality comparison
+          # as is part of same ... as combination
+          # it introduces a comparative clause
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-06: "Tony sees one thing."
+          literals = [tony, sees, one, thing, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-07: "Lisa sees two things."
+          literals = [lisa, sees, two, things, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-08a: "Tony sees one person."
+          literals = [tony, sees, one, person, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+
+          # Sentence 1-08b: "Lisa sees two people."
+          literals = [lisa, sees, two, people, dot]
+          expect { subject.parse(literals) }.not_to raise_error
+        end
       end # context
     end # describe
   end # module

data/spec/zenlish/support/minimal_lexicon.rb

@@ -3,11 +3,6 @@ require_relative '../../../lib/zenlish/lex/lexical_entry'
 require_relative '../../../lib/zenlish/lex/lexeme'
 require_relative '../../../lib/zenlish/lex/lexicon'
 
-def add_entry(aLemma, aWordClass)
-  entry = Zenlish::Lex::LexicalEntry.new(aLemma)
-  lexeme = Zenlish::Lex::Lexeme.new(aWordClass, entry)
-  $ZenlishLexicon.add_entry(entry)
-end
 
 common_noun = $ZenlishLexicon.name2terminal['CommonNoun']
 adjective = $ZenlishLexicon.name2terminal['Adjective']
@@ -15,16 +10,32 @@ proper_noun = $ZenlishLexicon.name2terminal['ProperNoun']
 irregular_verb = $ZenlishLexicon.name2terminal['IrregularVerb']
 indefinite_pronoun = $ZenlishLexicon.name2terminal['IndefinitePronoun']
 demonstrative_determiner = $ZenlishLexicon.name2terminal['DemonstrativeDeterminer']
-definite_article =  $ZenlishLexicon.name2terminal['DefiniteArticle']
+definite_article = $ZenlishLexicon.name2terminal['DefiniteArticle']
+cardinal = $ZenlishLexicon.name2terminal['Cardinal']
+comparative_particle = $ZenlishLexicon.name2terminal['ComparativeParticle']
 dot = $ZenlishLexicon.name2terminal['Period']
 
+def add_entry(aLemma, aWordClass)
+  entry = Zenlish::Lex::LexicalEntry.new(aLemma)
+  raise StandardError, 'Unregistered word class' unless aWordClass
+  lexeme = Zenlish::Lex::Lexeme.new(aWordClass, entry).freeze
+  $ZenlishLexicon.add_entry(entry.freeze)
+end
+
+# Our minimalistic lexicon
+add_entry('as', comparative_particle)
 add_entry('Lisa', proper_noun)
+add_entry('one', cardinal)
 add_entry('other', adjective)
+add_entry('people', common_noun)
+add_entry('person', common_noun)
+add_entry('same', adjective)
 add_entry('see', irregular_verb)
 add_entry('something', indefinite_pronoun)
 add_entry('the', definite_article)
 add_entry('thing', common_noun)
 add_entry('this', demonstrative_determiner)
 add_entry('Tony', proper_noun)
+add_entry('two', cardinal)
 
 add_entry('.', dot)

data/zenlish.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A toolkit for the Zenlish language (a simplified English language).}
   spec.description   = %q{A toolkit for the Zenlish language (a simplified English language).}
-  spec.homepage      = "https://github.com/famished-tiger/zenlish."
+  spec.homepage      = "https://github.com/famished-tiger/zenlish"
   spec.license       = 'MIT'
 
   spec.bindir        = 'exe'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenlish
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.01
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -76,6 +76,7 @@ extra_rdoc_files:
 files:
 - ".rspec"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,7 +94,9 @@ files:
 - lib/zenlish/wclasses/adjective.rb
 - lib/zenlish/wclasses/all_word_classes.rb
 - lib/zenlish/wclasses/article.rb
+- lib/zenlish/wclasses/cardinal.rb
 - lib/zenlish/wclasses/common_noun.rb
+- lib/zenlish/wclasses/comparative_particle.rb
 - lib/zenlish/wclasses/definite_article.rb
 - lib/zenlish/wclasses/demonstrative_determiner.rb
 - lib/zenlish/wclasses/determiner.rb
@@ -101,6 +104,7 @@ files:
 - lib/zenlish/wclasses/irregular_verb.rb
 - lib/zenlish/wclasses/lexical_verb.rb
 - lib/zenlish/wclasses/noun.rb
+- lib/zenlish/wclasses/numeral.rb
 - lib/zenlish/wclasses/pronoun.rb
 - lib/zenlish/wclasses/proper_noun.rb
 - lib/zenlish/wclasses/test_hierarchy.rb
@@ -120,7 +124,7 @@ files:
 - spec/zenlish/wclasses/proper_noun_spec.rb
 - spec/zenlish_spec.rb
 - zenlish.gemspec
-homepage: https://github.com/famished-tiger/zenlish.
+homepage: https://github.com/famished-tiger/zenlish
 licenses:
 - MIT
 metadata: {}