story-gen 0.1.7 → 0.1.8

data/NEWS

@@ -1,3 +1,7 @@
+0.1.8
+  Add "when" keyword
+  Use FFaker
+
 0.1.7
   Bug fixes, extract Parse into separate gem
 
@@ -23,4 +27,4 @@
   Alternate form of compound statement (with "-") is removed
 
 0.0.4:
-  Like, first release
+  Like, first release

data/README.md

@@ -249,6 +249,23 @@ There are other statements you can use:
   
   A random <statement> is chosen and executed.
 
+- "When":
+  
+  <pre><code>
+  When &lt;fact&gt; &lt;statement&gt;
+  </code></pre>
+  
+  When you try to state the &lt;fact&gt; then &lt;statement&gt; is executed.
+  
+  <pre><code>
+  When X loves Y:
+    ""X" marries "Y"!";
+  .
+  "John" loves "Liza";
+  </code></pre>
+  
+  The code above prints "John marries Liza!"
+
 ### Notes ###
 
 `(note: ...)` comment may have nested parentheses:

data/lib/names.rb

@@ -1,237 +1,26 @@
 # encoding: UTF-8
+require 'ffaker'
 
 class Names
   
   # @return [Array<String>]
   def self.russian_male
-    %W{
-      Адам
-      Адриан
-      Александр
-      Алексей
-      Анатолий
-      Андрей
-      Антон
-      Аркадий
-      Арсений
-      Артем
-      Артур
-
-      Богдан
-      Борис
-
-      Вадим
-      Валентин
-      Валерий
-      Василий
-      Виктор
-      Виталий
-      Владимир
-      Владислав
-      Вячеслав
-
-      Геннадий
-      Георгий
-      Герман
-      Глеб
-      Григорий
-
-      Давид
-      Даниил
-      Денис
-      Дмитрий
-
-      Евгений
-      Егор
-      Ефим
-
-      Захар
-
-      Иван
-      Игорь
-      Илья
-
-      Кирилл
-      Константин
-
-      Лев
-      Леонид
-
-      Максим
-      Марк
-      Матвей
-      Мирослав
-      Михаил
-
-      Назар
-      Нестор
-      Никита
-      Николай
-
-      Олег
-      Орест
-      Оскар
-      Остап
-
-      Павел
-      Петр
-      Платон
-
-      Ренат
-      Родион
-      Роман
-      Ростислав
-      Руслан
-
-      Святослав
-      Семен
-      Сергей
-      Станислав
-      Степан
-
-      Тарас
-      Тимофей
-      Тимур
-
-      Федор
-      Филипп
-
-      Эдуард
-
-      Юрий
-
-      Яков
-      Ян
-      Ярослав
-    }
+    FFaker::NameRU::FIRST_NAMES[:male]
   end
   
   # @return [Array<String>]
   def self.russian_female
-    %W{
-      Агата
-      Ада
-      Адель
-      Адриана
-      Алевтина
-      Александра
-      Алина
-      Алиса
-      Алла
-      Альбина
-      Анастасия
-      Ангелина
-      Анжела
-      Анна
-      Антонина
-      Анфиса
-      Арина
-
-      Богдана
-      Борислава
-
-      Валентина
-      Валерия
-      Варвара
-      Василиса
-      Вера
-      Вероника
-      Виктория
-      Виолетта
-
-      Галина
-
-      Дарья
-      Диана
-
-      Ева
-      Евгения
-      Екатерина
-      Елена
-      Елизавета
-
-      Жанна
-
-      Зинаида
-      Зоя
-
-      Илона
-      Инга
-      Инесса
-      Инна
-      Ирина
-
-      Карина
-      Кира
-      Клавдия
-      Клара
-      Кристина
-      Ксения
-
-      Лариса
-      Лидия
-      Лилия
-      Любовь
-      Людмила
-
-      Майя
-      Маргарита
-      Марина
-      Мария
-      Марта
-      Марьяна
-      Мирослава
-
-      Надежда
-      Наталья
-      Нелли
-      Нина
-
-      Оксана
-      Ольга
-
-      Полина
-
-      Раиса
-      Регина
-      Римма
-      Роза
-      Роксана
-      Руслана
-
-      Светлана
-      Снежана
-      София
-
-      Таисия
-      Тамара
-      Татьяна
-
-      Ульяна
-
-      Христина
-
-      Эвелина
-      Элеонора
-      Эльвира
-      Эмма
-
-      Юлиана
-      Юлия
-
-      Яна
-      Ярослава
-    }
+    FFaker::NameRU::FIRST_NAMES[:female]
   end
   
   # @return [Array<String>]
   def self.english_male
-    ["Jack", "Thomas", "Joshua", "Oliver", "Harry", "James", "Charlie", "William", "Daniel", "Samuel", "Alfie", "Benjamin", "Joseph", "George", "Callum", "Jake", "Ethan", "Lewis", "Luke", "Mohammed", "Matthew", "Dylan", "Jacob", "Alexander", "Ryan", "Adam", "Tyler", "Harvey", "Liam", "Max", "Cameron", "Harrison", "Jamie", "Jayden", "Leo", "Owen", "Henry", "Connor", "Archie", "Nathan", "Ben", "Muhammad", "Oscar", "Edward", "Lucas", "Michael", "Isaac", "Aaron", "Kyle", "Noah", "Finley", "Rhys", "Bradley", "Charles", "Toby", "Louis", "Brandon", "Logan", "Mason", "Reece", "Kieran", "Alex", "Riley", "Finlay", "Kai", "Freddie", "David", "Harley", "Kian", "Mohammad", "Bailey", "Sam", "Luca", "Joel", "Theo", "Leon", "John", "Robert", "Ashton", "Ellis", "Joe", "Aidan", "Billy", "Corey", "Hayden", "Evan", "Zachary", "Taylor", "Christopher", "Sebastian", "Elliot", "Morgan", "Jay", "Dominic", "Reuben", "Gabriel", "Sean", "Louie", "Andrew", "Frederick", "Ewan", "Zak"]
+    FFaker::Name::FIRST_NAMES_MALE
   end
   
   # @return [Array<String>]
   def self.english_female
-    ["Olivia", "Grace", "Ruby", "Jessica", "Emily", "Sophie", "Chloe", "Lucy", "Lily", "Ella", "Ellie", "Amelia", "Charlotte", "Katie", "Mia", "Hannah", "Evie", "Megan", "Amy", "Isabella", "Millie", "Isabelle", "Abigail", "Freya", "Molly", "Daisy", "Holly", "Emma", "Erin", "Poppy", "Jasmine", "Phoebe", "Leah", "Keira", "Caitlin", "Imogen", "Madison", "Rebecca", "Elizabeth", "Georgia", "Sophia", "Lauren", "Scarlett", "Amber", "Ava", "Eleanor", "Bethany", "Alice", "Isabel", "Summer", "Paige", "Anna", "Lola", "Libby", "Eva", "Maisie", "Isobel", "Brooke", "Lilly", "Alisha", "Tia", "Sarah", "Amelie", "Gracie", "Faith", "Rosie", "Courtney", "Matilda", "Niamh", "Maddison", "Sienna", "Eve", "Aimee", "Skye", "Zara", "Isla", "Shannon", "Madeleine", "Harriet", "Zoe", "Nicole", "Sofia", "Abbie", "Maya", "Lacey", "Rachel", "Francesca", "Layla", "Lydia", "Alicia", "Hollie", "Martha", "Alexandra", "Julia", "Natasha", "Lexie", "Mollie", "Morgan", "Maria", "Demi", "Rose", "Laura", "Lara", "Victoria", "Tilly", "Sara", "Evelyn", "Eloise"]
+    FFaker::Name::FIRST_NAMES_FEMALE
   end
   
-end
+end

data/lib/story/compile.rb

@@ -28,26 +28,31 @@ class Story
     #
     c = Parse.new.(text, file).to_code
     # 
-    relation_id_to_var_arg_valuesss_var = Hash.new do |h, relation_id|
-      h[relation_id] = "@#{INTERNAL_VAR_PREFIX}var_arg_valuesss#{h.size}"
+    relation_id_to_var_id = Hash.new { |h, relation_id| h[relation_id] = h.size }
+    relation_ids = lambda { relation_id_to_var_id.keys }
+    relation_id_to_var_arg_valuesss_var = lambda do |relation_id|
+      "@#{INTERNAL_VAR_PREFIX}var_arg_valuesss#{relation_id_to_var_id[relation_id]}"
+    end
+    relation_id_to_trigger_var = lambda do |relation_id|
+      "@#{INTERNAL_VAR_PREFIX}trigger#{relation_id_to_var_id[relation_id]}"
     end
     #
     c = c.map_non_code_parts do |part|
-      if part.is_a? VarArgValuesssVar
-        relation_id_to_var_arg_valuesss_var[part.relation_id]
-      else
-        raise "unknown non-code part type: #{part.inspect}"
+      case part
+      when VarArgValuesssVar then relation_id_to_var_arg_valuesss_var[part.relation_id]
+      when TriggerVar then relation_id_to_trigger_var[part.relation_id]
+      else raise "unknown non-code part type: #{part.inspect}"
       end
     end
     #
-    relation_ids_code = relation_id_to_var_arg_valuesss_var.keys.
+    relation_ids_code = relation_ids.().
       map { |relation_id| relation_id.join(" ") }.
       sort.
       to_rb
     #
-    init_var_arg_valuesss_vars = relation_id_to_var_arg_valuesss_var.
-      map do |relation_id, var|
-        "#{var} = Set.new  # #{relation_id}\n"
+    init_var_arg_valuesss_vars = relation_ids.().
+      map do |relation_id|
+        "#{relation_id_to_var_arg_valuesss_var[relation_id]} = Set.new  # #{relation_id}\n"
       end.
       join_code
     #
@@ -118,6 +123,9 @@ class Story
   # @!visibility private
   VarArgValuesssVar = Struct.new :relation_id, :pos
   
+  #@!visibility private
+  TriggerVar = Struct.new :relation_id, :pos
+  
   Var = ASTNode.new :name, :original_name do
     
     alias name_super name
@@ -202,24 +210,24 @@ class Story
           reject
       else
         args = subexpr.args
+        args_code = args.zip(0...args.size).
+          map do |arg, i|
+            case arg
+            when Asterisk then raise Parse::Error.new(arg.pos, "not supported")
+            when Var then at(arg.pos) { arg.name }
+            when Above[Var] then at(arg.pos) { arg.var.name }
+            else arg.to_rb
+            end
+          end.
+          join_code(", ")
+        trigger_var = non_code(TriggerVar[subexpr.relation_id, pos])
         code <<
-          non_code(VarArgValuesssVar[subexpr.relation_id, pos]) <<
-          ".add([" <<
-            args.zip(0...args.size).
-              map do |arg, i|
-                case arg
-                when Asterisk then
-                  raise Parse::Error.new(arg.pos, "not supported")
-                when Var then
-                  at(arg.pos) { arg.name }
-                when Above[Var] then
-                  at(arg.pos) { arg.var.name }
-                else
-                  arg.to_rb
-                end
-              end.
-              join_code(", ") <<
-          "])"
+          "(if " << trigger_var << " then " << "\n"<<
+            trigger_var << ".call(" << args_code << ")" << "\n"<<
+          "else" << "\n" <<
+            non_code(VarArgValuesssVar[subexpr.relation_id, pos]) <<
+            ".add([" << args_code << "])" << "\n"<<
+          "end)"
       end
     end
     
@@ -249,6 +257,34 @@ class Story
     
   end
   
+  Statement::When = ASTNode.new :condition, :action do
+    
+    def to_code
+      case condition
+      when FactExpr::Primary
+        args_code = condition.args.
+          map do |arg|
+            case arg
+            when Asterisk then nil
+            when Var then arg.name
+            when Above[Var] then arg.var.name
+            else raise Parse::Error.new(arg.pos, "not supported")
+            end
+          end.
+          compact.
+          join_code(", ")
+        code << "(" << non_code(TriggerVar[condition.relation_id, pos]) << " = " <<
+          "lambda do |" << args_code << "|\n" <<
+            action.to_code << "\n" <<
+          "end\n" <<
+        ")"
+      else
+        raise Parse::Error.new(condition.pos, "not supported")
+      end
+    end
+    
+  end
+  
   Statement::Compound = ASTNode.new :statements do
     
     def to_code
@@ -616,6 +652,7 @@ class Story
     
     rule :statement do
       _{ statement_if } or
+      _{ statement_when } or
       _{ statement_while } or
       _{ statement_for_all } or
       _{ statement_n_times } or
@@ -669,6 +706,11 @@ class Story
       }
     end
     
+    rule :statement_when do
+      _when_ and f = fact_expr_primary and s = statement and
+      _(Statement::When[f, s])
+    end
+    
     rule :statement_while do
       _while_ and f = fact_expr and s = statement and
       _(Statement::While[f, s])
@@ -845,6 +887,7 @@ class Story
     keyword :all, "`all'", /^(all|всех)$/
     keyword :_while_, "`while'", /^([Ww]hile|[Пп]ока)$/
     keyword :_if_, "`if'", /^([Ii]f|[Ее]сли)$/
+    keyword :_when_, "`when'", /^([Ww]hen|[Кк]огда)$/
     keyword :_then_, "`then'", /^(then|то)$/
     keyword :otherwise, "`otherwise'", /^([Oo]therwise|[Ии]наче)$/
     keyword :_not_, "`not'", /^(not|не)$/

data/sample/fight_club.sdl

@@ -8,7 +8,6 @@ Fight club
 
 ```
 require 'unique_names'
-
 names = UniqueNames.english_male
 ```
 
@@ -33,6 +32,15 @@ names = UniqueNames.english_male
   nl;
 .
 
+When A beats B:
+  if:
+    - ^A uses "hands" then ""A" has beaten "B". ";
+    - ^A uses "feet" then ""A" has kicked "B". ";
+    - ^A uses "hooves" then ""A" has kicked "B" and knocked him out. ";
+    - ^A uses "claws" then ""A" has scratched the whole "B". ";
+  B is not in;
+.
+
 nl
 "Let the tournament begin!" nl
 nl
@@ -40,16 +48,7 @@ nl
 While the tournament not complete:
   If X is in and Y is in and X != Y then:
     (note: fight!)
-    either (X won; Y lost) or (Y won; X lost);
-    if A won and B lost then:
-      if:
-        - ^A uses "hands" then ""A" has beaten "B". ";
-        - ^A uses "feet" then ""A" has kicked "B". ";
-        - ^A uses "hooves" then ""A" has kicked "B" and knocked him out. ";
-        - ^A uses "claws" then ""A" has scratched the whole "B". ";
-      A not won; B not lost;
-      B is not in;
-    .
+    either (X beats Y) or (Y beats X);
   .
   Otherwise the tournament complete;
 .

data/sample//320/261/320/276/320/271/321/206/320/276/320/262/321/201/320/272/320/270/320/271_/320/272/320/273/321/203/320/261.sdl

@@ -33,6 +33,15 @@ names = UniqueNames.russian_male
   nl;
 .
 
+Когда A победил B:
+  если:
+    - ^A использует "руки", то ""A" избил "B". ";
+    - ^A использует "ноги", то ""A" запинал "B". ";
+    - ^A использует "копыта", то ""A" лягнул "B" и вырубил его. ";
+    - ^A использует "когти", то ""A" исцарапал всего "B". ";
+  B не участвует в турнире;
+.
+
 nl
 "Да начнется турнир!" nl
 nl
@@ -40,19 +49,10 @@ nl
 Пока не конец турнира:
   Если X участвует в турнире и Y участвует в турнире и X != Y, то:
     (note: бой!)
-    либо (X победил; Y проиграл), либо (Y победил; X проиграл);
-    если A победил и B проиграл, то:
-      если:
-        - ^A использует "руки", то ""A" избил "B". ";
-        - ^A использует "ноги", то ""A" запинал "B". ";
-        - ^A использует "копыта", то ""A" лягнул "B" и вырубил его. ";
-        - ^A использует "когти", то ""A" исцарапал всего "B". ";
-      A не победил; B не проиграл;
-      B не участвует в турнире;
-    .
+    либо (X победил Y), либо (Y победил X);
   .
   Иначе конец турнира;
 .
 Если X участвует в турнире, то ""X" - победитель!"
 nl
-nl
+nl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story-gen
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parse-framework
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate stories from descriptions based on Facts!
 email: various.furriness@gmail.com
 executables: