lib/zenlish/parser/zenlish_grammar.rb in zenlish-0.1.05 vs lib/zenlish/parser/zenlish_grammar.rb in zenlish-0.1.06

- old
+ new

@@ -6,11 +6,10 @@ ######################################## # Define a grammar for a highly English-like language builder = Rley::Syntax::GrammarBuilder.new do add_terminals(*$ZenlishLexicon.terminals) - # add_terminals('Period') rule 'language' => 'sentence' rule 'sentence' => 'simple_sentence Period' rule 'simple_sentence' => 'declarative_simple_sentence' rule 'simple_sentence' => 'conditional_statement' @@ -22,11 +21,11 @@ rule 'affirmative_sentence' => 'DemonstrativePronoun 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 'conditional_statement' => 'condition_subordinate Comma LinkingAdverb declarative_simple_sentence' - rule 'condition_subordinate' => 'SubordinatingConjunction 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' @@ -60,24 +59,24 @@ rule 'verb_complement' => 'noun_phrase' rule 'verb_complement' => 'adverb_phrase' rule 'verb_complement' => 'noun_phrase adverb_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 'verb_be_complement' => 'propositional_phrase' rule 'adjective_as_complement' => 'DegreeAdverb Adjective' rule 'adjective_as_complement' => 'Adjective' - rule 'adjective_as_complement' => 'Adjective comparative_clause' + 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 '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 affirmative_sentence' - rule 'comparative_clause' => 'comparative_start DefiniteArticle Adjective Cardinal' + 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'