story-gen 0.0.1 → 0.0.2

data/.yardopts

@@ -0,0 +1,2 @@
+--protected
+--hide-api private

data/README.md

@@ -30,7 +30,12 @@ A simple story:
 
     "Hello, world!"
     
-It just prints "Hello, world!". No escape sequences for you, thus, for example, to start a new chapter you need to write something like this:
+It just prints "Hello, world!". To print newline just write `newline` or `nl`:
+    
+    "Hello, world!" newline
+    "Another line of helloness!" nl
+
+Or you may insert newline inside the quotes:
 
     "
     Chapter I
@@ -50,7 +55,7 @@ A story is based on Facts. To state a Fact just write it:
 
     "John" loves "Liza"
 
-In the Fact expression you may use english and russian words (except keywords, see below), characters from "#№@$%^/-", integer numbers (e.g., `18`) and arbitrary double- or single-quoted strings (`"..."` or `'...'`). Trailing commas are ignored (`xxx yyy zzz,` is the same as `xxx yyy zzz`). The words are case-insensitive (so `loves` and `Loves` mean the same), quoted strings are case-sensitive (so `"John"`≠`"JOHN"`).
+In the Fact expression you may use english and russian words (except keywords, see below), characters from "#№@$%/-", integer numbers (e.g., `18`) and arbitrary double- or single-quoted strings (`"..."` or `'...'`). Trailing commas are ignored (`xxx yyy zzz,` is the same as `xxx yyy zzz`). The words are case-insensitive (so `loves` and `Loves` mean the same), quoted strings are case-sensitive (so `"John"`≠`"JOHN"`).
 
 Let's state some Facts:
 
@@ -78,9 +83,9 @@ Here `X` is a variable. Variable names consist of underscores ("_") and capital
 
 You may use the captured variables in the statement after `then` keyword.
 
-To print the captured variable you just write it along with some quoted string: 
+To print the captured variable you just write it along with some quoted strings and newlines:
 
-    "Let's meet " X;
+    "Let's meet " X "." nl;
 
 But wait... We have two boys! What does `if` choose as `X` then? The answer is: random. If there are several combinations of variables which fit the condition then a random combination is chosen.
 
@@ -134,6 +139,16 @@ Or combine `if`-s with some statement:
 
 This is like a classical `if ... else if ... else ...` but if multiple conditions are true then random one is chosen (instead of the first one, like in the classical `if-else`). The last `or` is the same as `else` in the classical `if-else` - it is chosen if all conditions are false.
 
+The full form of `if`:
+
+    If <condition> [,] then <statement> [,]
+    or if <condition> [,] then <statement> [,]
+    or if <condition> [,] then <statement> [,]
+    ...
+    or <statement>
+
+Here `[,]` means "optional comma".
+
 You may use captured variables to state a Fact:
 
     If X is a boy and Y is a girl then
@@ -148,7 +163,13 @@ Set multiple Facts false:
 
     If X is a boy then
       X not loves *
-    
+
+You may use the captured variables in another conditions (by prefixing them with hat "^"):
+
+    If X is a boy then
+      if ^X loves * then "We found "X" which is in love!"
+      or "We found "X" which is stll single."
+
 To combine several statements into one use a colon (":") with the final dot ("."):
 
     If X is a boy then:
@@ -257,3 +278,7 @@ Examples
 --------
 
 See them in "sample" directory!
+
+You may find the "sample" directory with
+
+    story --samples

data/bin/story

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'story/compile'
 require 'optparse'
+require 'story/samples_dir'
 
 $output_file = nil
 $input_file = nil
@@ -40,6 +41,10 @@ OptionParser.new do |opts|
       story.relations.each { |relation| output.puts relation }
     end
   end
+  opts.on "--samples", "Show directory with samples and exit" do
+    puts Story::SAMPLES_DIR
+    exit
+  end
   opts.on "-h", "--help", "Show this message and exit" do
     puts opts
     exit

data/lib/story/compile.rb

@@ -158,6 +158,8 @@ class Story
     
   end
   
+  Above = ASTNode.new :var
+  
   Asterisk = ASTNode.new
   
   # @!visibility private
@@ -173,6 +175,7 @@ class Story
             case part
             when String then part.to_rb
             when Var then at(part.pos) { part.name }
+            when Above[Var] then at(part.pos) { part.var.name }
             end <<
           ")"
         end.join_code("\n") << "\n" <<
@@ -197,6 +200,8 @@ class Story
               nil
             when Var then
               "#{at(arg.pos) { arg.name }} == #{var_arg_valuess}[#{i}]"
+            when Above[Var] then
+              "#{at(arg.pos) { arg.var.name }} == #{var_arg_valuess}[#{i}]"
             else
               "#{arg.to_rb} == #{var_arg_valuess}[#{i}]"
             end
@@ -222,6 +227,8 @@ class Story
                   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
@@ -311,9 +318,14 @@ class Story
     private
     
     def to_code_(range_part)
+      to_code = lambda do |var, pos|
+        at(pos) { code << "(must_be(" << var.name << ", Integer); " << var.name << ")" }
+      end
+      #
       case range_part
       when Integer then range_part.to_rb
-      when Var then at(range_part.pos) { code << "(must_be(" << range_part.name << ", Integer); " << range_part.name << ")" }
+      when Var then to_code.(range_part, range_part.pos)
+      when Above[Var] then to_code.(range_part.var, range_part.pos)
       else raise Parse::Error.new(pos, "what?")
       end
     end
@@ -401,6 +413,8 @@ class Story
               map << "#{var_arg_valuess}[#{i}]"
               known_var_index[var] = i
             end
+          when Above[Var] then
+            select << "#{at(arg.pos) { arg.var.name }} == #{var_arg_valuess}[#{i}]"
           else
             select << "#{arg.to_rb} == #{var_arg_valuess}[#{i}]"
           end
@@ -485,6 +499,7 @@ class Story
         to_code = lambda do |operand|
           case operand
           when Var then "#{var_arg_valuess}[#{e1.var_args_indexes[operand]}]"
+          when Above[Var] then at(operand.pos) { operand.var.name }
           else operand.to_rb
           end
         end
@@ -605,7 +620,7 @@ class Story
     
     rule :statement_tell do
       parts = many1 {
-        _{ string } or _{ var }
+        _{ string } or _{ newline } or _{ var }
       } and
       _(Statement::Tell[parts])
     end
@@ -619,7 +634,7 @@ class Story
         _if_ and c = fact_expr and opt { comma } and _then_ and s = statement and [c, s]
       }
       or_delimiter = lambda {
-        opt { _{ comma } or _{ semicolon } or _{ dot } } and _or_
+        opt { comma } and _or_
       }
       #
       c_and_s1 = if_then.() and
@@ -727,6 +742,7 @@ class Story
         _{ _not_ and act { negated = !negated } } or
         _{ v = value and act { args << v; relation_id << :* } } or
         _{ v = var and act { args << v; relation_id << :* } } or
+        _{ v = above_var and act { args << v; relation_id << :* } } or
         _{ w = word and act { relation_id << w.ru_downcase } }
       } and
 #       act { relation_id.chomp!(",") } and
@@ -784,8 +800,8 @@ class Story
       scan("*") and _(Asterisk.new)
     end
     
-    token :other_char, "any of `#№@$%^/'" do
-      scan(/[\#\№\@\$\%\^\/]/)
+    token :other_char, "any of `#№@$%/'" do
+      scan(/[\#\№\@\$\%\/]/)
     end
     
     token :_for_, "`for'" do
@@ -824,6 +840,10 @@ class Story
       t = word_ and /^(times|раза?)$/ === t
     end
     
+    token :newline, "`newline'" do
+      t = word_ and /^(newline|nl)$/ === t and "\n"
+    end
+    
     token :number, "number" do
       n = scan(/\d+/) and n.to_i
     end
@@ -855,10 +875,14 @@ class Story
       _(Var[n.ru_downcase, n])
     end
     
+    token :above_var, "^variable" do
+      scan("^") and v = var and _(Above[v])
+    end
+    
     token :word, "word" do
       not_follows(
         :_not_, :_and_, :_or_, :_if_, :_then_, :var, :_while_, :_for_, :all,
-        :times
+        :times, :newline
       ) and
       word_
     end
@@ -913,11 +937,11 @@ class Story
 end
 
 # begin
-#   puts Story.compile(<<-STORY)
+#   eval(Story.compile(<<-STORY)).new.write
 #     
-#     ```puts(a)```
+#     "Hello, world!" newline
 #     Either "John" loves "Liza",
-#     or ("Hello, world, again!"; "John" kisses "Liza";).
+#     or ("Hello, world, again!" nl; "John" kisses "Liza";).
 #   STORY
 # rescue Parse::Error => e
 #   puts "error: #{e.pos.file}:#{e.pos.line}:#{e.pos.column}: #{e.message}"

data/lib/story/samples_dir.rb

@@ -0,0 +1,6 @@
+
+class Story
+  
+  SAMPLES_DIR = "#{File.dirname __FILE__}/../../sample"
+  
+end

data/sample/fight_club.sdl

@@ -10,49 +10,46 @@ require 'unique_names'
 names = UniqueNames.english_male
 ```
 
-"Today in the fight club the tournament is being held! Meet the participants:"
+"Today in the fight club the tournament is being held! Meet the participants:" nl;
 
-10 раз:
+10 times:
   ```n = names.pop```;
-  N is the current participant;
   N is in;
-  "
-  - "N", the ";
-  either "tiger", or "fox", or "bear", or ("horse"; N has hooves);
+  "- "N", the ";
+    either "tiger", or "fox", or "bear", or ("horse"; N has hooves);
   " ";
   either ("with powerful hands"; N uses "hands"),
   or ("with powerful feet"; N uses "feet"),
   or:
-    if X is the current participant and X has hooves then (
-      "with powerful hooves"; X uses "hooves"
+    if ^N has hooves then (
+      "with powerful hooves"; N uses "hooves"
     )
     or (
       "with sharp claws"; N uses "claws"
     )
   .
-  N is not the current participant;
+  nl;
 .
-"
 
-Let the tournament begin!
+nl
+"Let the tournament begin!" nl
+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);
-    (note: yup, it should be made that existing variables can be used in
-           conditions rather than capturing new ones only)
-    if A won and B lost and A uses "hands" then ""A" has beaten "B". "
-    or if A won and B lost and A uses "feet" then ""A" has kicked "B". "
-    or if A won and B lost and A uses "hooves" then ""A" has kicked "B" and knocked him out. "
-    or if A won and B lost and A uses "claws" then ""A" has scratched the whole "B". ";
-    if A lost then (A not lost; A is not in);
-    if A won then A not won;
+    if A won and B lost then:
+      if ^A uses "hands" then ""A" has beaten "B". "
+      or if ^A uses "feet" then ""A" has kicked "B". "
+      or if ^A uses "hooves" then ""A" has kicked "B" and knocked him out. "
+      or if ^A uses "claws" then ""A" has scratched the whole "B". ";
+      A not won; B not lost;
+      B is not in;
+    .
   .
   Or the tournament complete;
 .
-If X is in then ""X" is the winner!".
-
-"
-"
+If X is in then ""X" is the winner!"
+nl
+nl

data/sample/university.sdl

@@ -41,13 +41,14 @@ While X is a boy and X not loves *:
       either
         "After the lectures they went home and did their home tasks. "
       or:
-        "After the lectures "X" caught "Y" and told her that he loves her! "
+        "After the lectures "X" caught "Y" and told her that he loves her! ";
         X loves Y.
     .
   .
 .
 
-"
-
-Then they all lived long and happy!
-"
+nl
+nl
+"Then they all lived long and happy!"
+nl
+nl

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

@@ -10,49 +10,46 @@ require 'unique_names'
 names = UniqueNames.russian_male
 ```
 
-"Сегодня в бойцовском клубе проводится турнир! Поприветствуйте участников:"
+"Сегодня в бойцовском клубе проводится турнир! Поприветствуйте участников:" nl;
 
 10 раз:
   ```n = names.pop```;
-  N - текущий участник;
   N участвует в турнире;
-  "
-  - "N", ";
+  "- "N", ";
   либо "тигр", либо "лис", либо "медведь", либо ("конь"; N имеет копыта);
-  " ";
+  " " ;
   либо ("с сильными руками"; N использует "руки"),
   либо ("с сильными ногами"; N использует "ноги"),
   либо:
-    если X - текущий участник и X имеет копыта, то (
-      "с мощными копытами"; X использует "копыта"
+    если ^N имеет копыта, то (
+      "с мощными копытами"; N использует "копыта"
     )
     или (
       "с острыми когтями"; N использует "когти"
     )
   .
-  N - не текущий участник;
+  nl;
 .
-"
 
-Да начнется турнир!
+nl
+"Да начнется турнир!" nl
+nl
 
-"
 Пока не конец турнира:
   Если X участвует в турнире и Y участвует в турнире и X != Y, то:
     (note: бой!)
     либо (X победил; Y проиграл), либо (Y победил; X проиграл);
-    (note: дя, надо сделать, чтобы в условиях можно было существующие
-           переменные использовать, а не только захватывать новые)
-    если A победил и B проиграл и A использует "руки", то ""A" избил "B". "
-    или если A победил и B проиграл и A использует "ноги", то ""A" запинал "B". "
-    или если A победил и B проиграл и A использует "копыта", то ""A" лягнул "B" и вырубил его. "
-    или если A победил и B проиграл и A использует "когти", то ""A" исцарапал всего "B". ";
-    если A проиграл, то (A не проиграл; A не участвует в турнире);
-    если A победил, то A не победил;
+    если A победил и B проиграл, то:
+      если ^A использует "руки", то ""A" избил "B". "
+      или если ^A использует "ноги", то ""A" запинал "B". "
+      или если ^A использует "копыта", то ""A" лягнул "B" и вырубил его. "
+      или если ^A использует "когти", то ""A" исцарапал всего "B". ";
+      A не победил; B не проиграл;
+      A не участвует в турнире;
+    .
   .
   Или конец турнира;
 .
-Если X участвует в турнире, то ""X" - победитель!".
-
-"
-"
+Если X участвует в турнире, то ""X" - победитель!"
+nl
+nl

data/sample//321/203/320/275/320/270/320/262/320/265/321/200/321/201/320/270/321/202/320/265/321/202.sdl

@@ -42,13 +42,14 @@
       либо
         "После лекций они пошли домой и делали уроки. "
       либо:
-        "После лекций "X" поймал "Y" и сказал ей, что любит её! "
+        "После лекций "X" поймал "Y" и сказал ей, что любит её! ";
         X любит Y.
     .
   .
 .
 
-"
-
-И жили они долго и счастливо!
-"
+nl
+nl
+"И жили они долго и счастливо!"
+nl
+nl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story-gen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies: []
 description: Generate stories from descriptions based on Facts!
 email: various.furriness@gmail.com
@@ -22,6 +22,7 @@ files:
 - lib/any.rb
 - lib/fact.rb
 - lib/story/compile.rb
+- lib/story/samples_dir.rb
 - lib/array/case_equal_fixed.rb
 - lib/array/separate.rb
 - lib/array/to_h.rb
@@ -40,7 +41,7 @@ files:
 - lib/object/map_.rb
 - lib/object/to_rb.rb
 - README.md
-- gem.gemspec
+- .yardopts
 - sample/fight_club.sdl
 - sample/университет.sdl
 - sample/бойцовский_клуб.sdl

data/gem.gemspec

@@ -1,13 +0,0 @@
-
-Gem::Specification.new do |s|
-  s.name        = 'story-gen'
-  s.version     = '0.0.1'
-  s.date        = '2016-01-10'
-  s.summary     = "Story generator"
-  s.description = "Generate stories from descriptions based on Facts!"
-  s.authors     = ["Various Furriness"]
-  s.email       = 'various.furriness@gmail.com'
-  s.files       = Dir["lib/**/*.rb"] + ["README.md", "gem.gemspec"] + Dir["sample/*"]
-  s.executables = Dir["bin/*"].map { |f| File.basename(f) }
-  s.license     = 'MIT'
-end